Changeset 1664

Timestamp:

03/02/10 14:06:22 (5 months ago)

Author:

thomas

Message:

ullTime: display current working time

Location:

trunk

Files:

• plugins/ullTimePlugin/lib/model/doctrine/PluginUllTimeReporting.class.php (modified) (3 diffs)
• plugins/ullTimePlugin/modules/ullTime/lib/BaseUllTimeActions.class.php (modified) (1 diff)
• plugins/ullTimePlugin/modules/ullTime/templates/editSuccess.php (modified) (9 diffs)
• plugins/ullTimeThemeNGPlugin/web/css/main.css (modified) (1 diff)
• test/unit/ullTimePlugin/UllTimeReportingTest.php (modified) (2 diffs)

trunk/plugins/ullTimePlugin/lib/model/doctrine/PluginUllTimeReporting.class.php

@@ -6 +6 @@
 abstract class PluginUllTimeReporting extends BaseUllTimeReporting
 {
-  
+
   /**
    * pre save hook
-   * 
+   *
    * auto calculate totals
    *
@@ -17 +17 @@
   {
     $this->total_break_seconds = 0;
-    
+
     if ($this->begin_break1_at && $this->end_break1_at)
     {
       $this->total_break_seconds += strtotime($this->end_break1_at) - strtotime($this->begin_break1_at);
     }
-    
+
     if ($this->begin_break2_at && $this->end_break2_at)
     {
       $this->total_break_seconds += strtotime($this->end_break2_at) - strtotime($this->begin_break2_at);
-    }    
-    
+    }
+
     if ($this->begin_break3_at && $this->end_break3_at)
     {
@@ -36 +36 @@
     {
       $this->total_work_seconds = strtotime($this->end_work_at) - strtotime($this->begin_work_at) - $this->total_break_seconds;
-    }   
-  }  
+    }
+  }
+
+  public function getBreakDuration($breakNum)
+  {
+    $beginField = 'begin_break' . $breakNum . '_at';
+    $endField = 'end_break' . $breakNum . '_at';
+    if ($this[$beginField] && $this[$endField])
+    {
+      return strtotime($this[$endField]) - strtotime($this[$beginField]);
+    }
+    else
+    {
+      return 0;
+    }
+  }
 
 }

trunk/plugins/ullTimePlugin/modules/ullTime/lib/BaseUllTimeActions.class.php

@@ -163 +163 @@
     $this->addGlobalValidators();
     
-    $this->sum_time = UllTimeReportingTable::findTotalWorkSecondsByDateAndUserId($request->getParameter('date'), $this->user_id);
-    $this->is_today = ($request->getParameter('date') == date("Y-m-d",time()));
+    //$this->sum_time = UllTimeReportingTable::findTotalWorkSecondsByDateAndUserId($request->getParameter('date'), $this->user_id);
+    //$this->is_today = ($request->getParameter('date') == date("Y-m-d",time()));
+    $this->break_1_duration = $this->doc->getBreakDuration(1);
+    $this->break_2_duration = $this->doc->getBreakDuration(2);
+    $this->break_3_duration = $this->doc->getBreakDuration(3);
     $this->up_to_now = strtotime(date("H:i",time())) - strtotime($this->doc->begin_work_at) - $this->doc->total_break_seconds;
+    
+    $sumTime = UllTimeReportingTable::findTotalWorkSecondsByDateAndUserId($request->getParameter('date'), $this->user_id);
+    if (($request->getParameter('date') != date("Y-m-d",time())) || !$this->doc->begin_work_at)
+    {
+      $this->up_to_now = 0;
+    }
+    
+    if($sumTime > 0)
+    {
+      $this->up_to_now = $sumTime;
+    }
     
     $this->breadcrumbForEdit();

trunk/plugins/ullTimePlugin/modules/ullTime/templates/editSuccess.php

@@ -2 +2 @@
 
 <?php include_partial('ullTableTool/flash', array('name' => 'message')) ?>
+<?php $timeDurationWidget = new ullWidgetTimeDurationRead(); ?>
 
 <h3>
@@ -15 +16 @@
 <div class="edit_container">
 <table class="edit_table ull_time_edit_table_worktime">
+
+        <col class="col_edit_list_name"/>
+        <col class="col_edit_list_begin"/>
+        <col class="col_edit_list_end"/>
+        <col class="col_edit_list_sum"/>
+        
   <thead>
     <tr class="color_dark_bg">
@@ -20 +27 @@
       <th class="color_dark_bg"><?php echo __('Begin', null, 'common') ?></th>
       <th class="color_dark_bg"><?php echo __('End', null, 'common') ?></th>
+      <th class="color_dark_bg"><?php echo __('Total', null, 'common') ?></th>
     </tr>
   </thead>
@@ -34 +42 @@
         <?php echo $generator->getForm()->offsetGet('end_work_at')->renderError() ?>
       </td>
+      <td>
+        <?php echo $timeDurationWidget->render(null, $up_to_now); ?>
+      </td>
     </tr>
     
@@ -39 +50 @@
 </table>
 
+
 <table class="edit_table">
+        
+        <col class="col_edit_list_name"/>
+        <col class="col_edit_list_begin"/>
+        <col class="col_edit_list_end"/>
+        <col class="col_edit_list_sum"/>
+        
   <thead>
     <tr class="color_dark_bg">
@@ -45 +63 @@
       <th class="color_dark_bg"><?php echo __('Begin', null, 'common') ?></th>
       <th class="color_dark_bg"><?php echo __('End', null, 'common') ?></th>
+      <th class="color_dark_bg"><?php echo __('Total', null, 'common') ?></th>
     </tr>
   </thead>
@@ -59 +78 @@
         <?php echo $generator->getForm()->offsetGet('end_break1_at')->renderError() ?>
       </td>
+      <td>
+        <?php echo $timeDurationWidget->render(null, $break_1_duration); ?>
+      </td>
     </tr>   
     <tr>
@@ -70 +92 @@
         <?php echo $generator->getForm()->offsetGet('end_break2_at')->renderError() ?>
       </td>
+      <td>
+        <?php echo $timeDurationWidget->render(null, $break_2_duration); ?>
+      </td>
     </tr>       
     <tr>
@@ -80 +105 @@
         <?php echo $generator->getForm()->offsetGet('end_break3_at')->render() ?>
         <?php echo $generator->getForm()->offsetGet('end_break3_at')->renderError() ?>
+      </td>
+      <td>
+        <?php echo $timeDurationWidget->render(null, $break_3_duration); ?>
       </td>
     </tr>      

trunk/plugins/ullTimeThemeNGPlugin/web/css/main.css

@@ -81 +81 @@
 
 /* Make the time duration columns as thin as possible to make alignment to the right looking good */
-.col_duration_seconds_header, .col_period_list_time_total, .col_period_list_project_total, .col_period_list_delta {
+.col_duration_seconds_header, .col_period_list_time_total, .col_period_list_project_total, .col_period_list_delta, .col_edit_list_sum {
         width: 1em;
 }

trunk/test/unit/ullTimePlugin/UllTimeReportingTest.php

@@ -10 +10 @@
 sfContext::createInstance($configuration);
 
-$t = new myTestCase(2, new lime_output_color, $configuration);
+$t = new myTestCase(5, new lime_output_color, $configuration);
 $path = dirname(__FILE__);
 $t->setFixturesPath($path);
@@ -32 +32 @@
   $t->is($report->total_work_seconds, 28800, 'Generates the correct work total');
   $t->is($report->total_break_seconds, 1800, 'Generates the correct break total');
+
+$t->diag('getBreakSum()');
+  $report = new UllTimeReporting;
+  $report->UllUser        = $user;
+  $report->date           = '2009-09-18';
+  $report->begin_work_at  = '08:30:00';
+  $report->end_work_at    = '17:00:00';
+  $report->begin_break1_at = '10:00:00';
+  $report->end_break1_at  = '10:10:00';
+  $report->begin_break2_at = '12:40:00';
   
+  $report->save();
+  $t->is($report->getBreakDuration(1), 600, 'Returns the correct break1 seconds');
+  $t->is($report->getBreakDuration(2), 0, 'Returns zero for empty end time');
+  $t->is($report->getBreakDuration(3), 0, 'Returns zero for empty begin and end time');
+  
+