added task history box in the logupdate form

thevikas · Jun 9, 2013 · b2c105a · b2c105a
1 parent b8674c4
commit b2c105a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/css/main.css b/css/main.css
@@ -338,4 +338,16 @@ strong.update
 ol#objlist ol li.task
 {
  background-color: skyblue;
+}
+table.tasklog
+{
+ background-color: pink;
+ float:right;
+ width: 500px;
+}
+
+table.tasklog tr
+{
+ border-top: solid 1px blue;
+ padding: 2px;
 }
diff --git a/protected/controllers/TasksController.php b/protected/controllers/TasksController.php
@@ -112,7 +112,7 @@ public function actionLogbook($id)
                 $this->redirect(array('/objectives/index'));
             }
         }
-        $this->render('logbook',array('model'=>$model));
+        $this->render('logbook',array('model'=>$model,'task' => $task));
     }
 
     public function actionNew($id_objective = 0)

diff --git a/protected/views/tasks/_taskhistory.php b/protected/views/tasks/_taskhistory.php
@@ -0,0 +1,13 @@
+<table class="tasklog">
+<?php
+foreach($task->tasklogs as $log)
+{
+      ?>
+      <tr>
+          <td><?php echo $log->dated; ?></td>
+          <td><?php echo $log->comment; ?></td>
+      </tr>
+      <?php   
+}
+?>
+</table>
diff --git a/protected/views/tasks/logbook.php b/protected/views/tasks/logbook.php
@@ -4,6 +4,10 @@
 /* @var $form CActiveForm */
 ?>
 
+<?php
+echo $this->renderPartial('_taskhistory',array('task' => $task)); 
+?>
+
 <div class="form">
 
 <?php $form=$this->beginWidget('CActiveForm', array(