some modifications

thevikas · May 28, 2013 · c4ce6b0 · c4ce6b0
1 parent 4a24cfe
commit c4ce6b0
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 7 deletions.
diff --git a/css/main.css b/css/main.css
@@ -235,4 +235,23 @@ div.scorebox h2
 {
     color: blue;
     font-weight: bold;
+}
+div.linkbox a
+{
+    text-align: center;
+     width: 50px;
+     float:right;
+     display: block;
+     padding: 2px;
+     background-color: yellow;
+     border: solid 1px black;
+}
+div.linkbox a.active
+{
+    background-color: blue;
+    color: white; 
+}
+div.linkbox > a
+{
+    f3loat: none; 
 }
diff --git a/docs/PeerTask - Flow - v2.odg b/docs/PeerTask - Flow - v2.odg
diff --git a/protected/controllers/ObjectivesController.php b/protected/controllers/ObjectivesController.php
@@ -36,10 +36,23 @@ public function actionUpdate($id)
         ));
     }
 
-    public function actionIndex()
+    public function actionIndex($show = 'all')
     {
+        $allactive =  $mineactive = $sharedactive = '';
+        switch($show)
+        {
+            case 'all':
+                $allactive = 'active';
+                break;
+            case 'mine':
+                $mineactive = 'active';
+                break;
+            case 'shared':
+                $sharedactive = 'active';
+                break;
+        }
         $obs = self::$dic->get('Objective')->bytaskuser(Yii::app()->user->id)->findAll();
-        $this->render('index',array('objectives' => $obs));
+        $this->render('index',array('objectives' => $obs,'allactive' => $allactive,'sharedactive' =>$sharedactive,'mineactive' => $mineactive));
     }
 
     public function actionNew()

diff --git a/protected/controllers/SiteController.php b/protected/controllers/SiteController.php
@@ -302,7 +302,6 @@ public function actionCron()
         }
 
         print_r($userscore); 
-        //die;
 
         foreach($userscore as $uid => $s)
         {
@@ -313,6 +312,7 @@ public function actionCron()
             $person = $user->person;
             $person->score = $s;
             $person->update(array('score'));
+            Log::model()->logUpdateScore($person);
         }
     }
 }
diff --git a/protected/models/Log.php b/protected/models/Log.php
@@ -25,6 +25,7 @@ class Log extends CActiveRecord
     const L_FAILTASKWEEKLY   = 11;
     const L_FAILTASKMONTHLY  = 12;
     const L_FAILTASKFRIEND   = 13;      
+    const L_UPDATEDSCORE     = 14;
 
 
     var $logtypes = array(
@@ -41,6 +42,7 @@ class Log extends CActiveRecord
                 self::L_FAILTASKWEEKLY,
                 self::L_FAILTASKMONTHLY,
                 self::L_FAILTASKFRIEND,
+                self::L_UPDATEDSCORE,
             );
 
 
@@ -61,6 +63,12 @@ public function logthis($logtype,$id_user,$params)
         return $rt;
     }
 
+    public function logUpdateScore(Person $person)
+    {
+        $params = array('score' => $person->score);
+        $this->logthis(self::L_UPDATEDSCORE,$person->user->id_user,$params);                
+    }
+
     public function logAddFriend($friend)
     {
         $params = array('id_friend' => $friend->id_friend);

diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
@@ -39,13 +39,11 @@
 				array('label'=>'Logout ('.Yii::app()->user->name.')', 'url'=>array('/site/logout'), 'visible'=>!Yii::app()->user->isGuest),
 		array('label'=>'Objectives', 'url'=>array('/objectives/'), 'visible'=>!Yii::app()->user->isGuest),
 		array('label'=>'Friends', 'url'=>array('/friends/'), 'visible'=>!Yii::app()->user->isGuest),
-                array('label'=>'Add my New Task', 'url'=>array('/tasks/new'), 'visible'=>!Yii::app()->user->isGuest),
-                array('label'=>'Update Task Logbook', 'url'=>array('/tasks/logbook'), 'visible'=>!Yii::app()->user->isGuest),
+                array('label'=>'Add my New Task', 'url'=>array('/tasks/new'), 'visible'=>!Yii::app()->user->isGuest),                
                 array('label'=>'New Objective', 'url'=>array('/objectives/new'), 'visible'=>!Yii::app()->user->isGuest),
                 array('label'=>'New Friend', 'url'=>array('/friends/new'), 'visible'=>!Yii::app()->user->isGuest),
                 array('label'=>'Scoreboard', 'url'=>array('/scores'), 'visible'=>!Yii::app()->user->isGuest),
-		        //array('label'=>'Github', 'url'=>'https://github.com/thevikas/peertask'),
-
+		        //array('label'=>'Github', 'url'=>'https://github.com/thevikas/peertask'),			        
 			),
 		)); ?>
 	</div><!-- mainmenu -->

diff --git a/protected/views/objectives/index.php b/protected/views/objectives/index.php
@@ -7,6 +7,12 @@
 ?>
 <h1><?php echo $this->id . '/' . $this->action->id; ?></h1>
 
+<div class="linkbox">
+<?php echo CHtml::link('Shared',array('/objectives/index','show' => 'shared'),array('class' => $sharedactive)); ?>
+<?php echo CHtml::link('Mine',array('/objectives/index','show' => 'mine'),array('class' => $mineactive)); ?>
+<?php echo CHtml::link('All',array('/objectives/index','show' => 'all'),array('class' => $allactive)); ?>
+</div>
+
 <ol>
 <?php
 foreach($objectives as $obj)