Checking in work in progress on week view for safe keep.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7f933a0952615b51e5f382f2995304247bd13043..d94d66249830489fe08731040f5663aa2895bf1d 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.12.3.3692 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.12.3.3693 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index b120c49b4fd316bbdcb82db7a8b604c0b7efdda8..0d279ec6b7de5edad94988621007afa2aa7cf854 100644 (file)
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -6,7 +6,7 @@
 }
 </style>
 
 }
 </style>
 

-{$forms.timeRecordForm.open}
+{$forms.weekTimeForm.open}

 <table cellspacing="4" cellpadding="0" border="0">
 {if defined(WEEK_VIEW_DEBUG)}
   <tr>
 <table cellspacing="4" cellpadding="0" border="0">
 {if defined(WEEK_VIEW_DEBUG)}
   <tr>


@@ -21,18 +21,23 @@
 {if $on_behalf_control}
         <tr>
           <td align="right">{$i18n.label.user}:</td>
 {if $on_behalf_control}
         <tr>
           <td align="right">{$i18n.label.user}:</td>

-          <td>{$forms.timeRecordForm.onBehalfUser.control}</td>
+          <td>{$forms.weekTimeForm.onBehalfUser.control}</td>

         </tr>
 {/if}
       </table>
     </td>
     <td valign="top">
       <table>
         </tr>
 {/if}
       </table>
     </td>
     <td valign="top">
       <table>

-        <tr><td>{$forms.timeRecordForm.date.control}</td></tr>
+        <tr><td>{$forms.weekTimeForm.date.control}</td></tr>

       </table>
     </td>
   </tr>
 </table>
       </table>
     </td>
   </tr>
 </table>

+<table width="720">
+  <tr valign="top">
+    <td>{$forms.weekTimeForm.week_durations.control}</td>
+  </tr>
+</table>

 
 <table width="720">
 <tr>
 
 <table width="720">
 <tr>


@@ -113,7 +118,7 @@
 -->
 <table>
   <tr>
 -->
 <table>
   <tr>

-    <td align="center" colspan="2">{$forms.timeRecordForm.btn_submit.control}</td>
+    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>

   </tr>
 </table>
   </tr>
 </table>

-{$forms.timeRecordForm.close}
+{$forms.weekTimeForm.close}

diff --git a/week.php b/week.php
index fd7af524c447d60e2d3c02433433be8181fbf53a..9e1d5180516798971d824c27995339539e3d1f41 100644 (file)
--- a/week.php
+++ b/week.php
@@ -28,6 +28,8 @@
 
 require_once('initialize.php');
 import('form.Form');
 
 require_once('initialize.php');
 import('form.Form');

+import('form.DefaultCellRenderer');
+import('form.Table');

 import('ttUserHelper');
 import('ttTeamHelper');
 import('ttClientHelper');
 import('ttUserHelper');
 import('ttTeamHelper');
 import('ttClientHelper');


@@ -40,7 +42,6 @@ if (!ttAccessCheck(right_data_entry)) {
   exit();
 }
 
   exit();
 }
 

-// TODO: redo this block to use week start date instead.

 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);
 // Initialize and store date in session.
 $cl_date = $request->getParameter('date', @$_SESSION['date']);
 $selected_date = new DateAndTime(DB_DATEFORMAT, $cl_date);


@@ -50,6 +51,92 @@ if(!$cl_date)
   $cl_date = $selected_date->toString(DB_DATEFORMAT);
 $_SESSION['date'] = $cl_date;
 
   $cl_date = $selected_date->toString(DB_DATEFORMAT);
 $_SESSION['date'] = $cl_date;
 

+// Determine selected week start and end dates.
+$weekStartDay = $user->week_start;
+$t_arr = localtime($selected_date->getTimestamp());
+$t_arr[5] = $t_arr[5] + 1900;
+if ($t_arr[6] < $weekStartDay)
+  $startWeekBias = $weekStartDay - 7;
+else
+  $startWeekBias = $weekStartDay;
+$startDate = new DateAndTime();
+$startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
+$endDate = new DateAndTime();
+$endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
+// The above is needed to set date range (timestring) in page title.
+
+// Get column headers.
+$dayHeaders = ttTimeHelper::getDayHeadersForWeek($startDate->toString(DB_DATEFORMAT));
+
+// TODO: replace these two sample arrays with real data.
+$durations_with_labels = array(
+  array( // Row 0.
+    'id' => 'something goes here too', // Row identifier.
+    'label' => 'This is a label for row 0',
+    'day_0' => array('id' => '0_0', 'duration' => '00:00'),
+    'day_1' => array('id' => '0_1', 'duration' => '01:00'),
+    'day_2' => array('id' => '0_2', 'duration' => '02:00'),
+    'day_3' => array('id' => '0_3', 'duration' => null),
+    'day_4' => array('id' => '0_4', 'duration' => '04:00')
+  ),
+  array( // Row 1.
+    'label' => 'This is a label for row 1',
+    'day_0' => array('id' => '1_0', 'duration' => '00:30'),
+    'day_1' => array('id' => '1_1', 'duration' => '01:30'),
+    'day_2' => array('id' => '1_2', 'duration' => '02:30'),
+  )
+);
+
+$totals = array(
+    'label' => 'Total:',
+    'day_0' => '00:30',
+    'day_1' => '02:30',
+    'day_2' => '04:30',
+    'day_3' => null,
+    'day_4' => '04:00',
+    'day_5' => null,
+    'day_6' => null
+);
+
+// Define rendering class for a label field to the left of durations.
+class LabelCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    $this->setOptions(array('width'=>200,'valign'=>'middle'));
+    $this->setValue(htmlspecialchars($value));
+    return $this->toString();
+  }
+}
+
+// Define rendering class for a single cell for time entry in week view table.
+class TimeCellRenderer extends DefaultCellRenderer {
+  function render(&$table, $value, $row, $column, $selected = false) {
+    $field_name = $table->getValueAtName($row,$column)['id']; // Our text field names (and ids) are like x_y (row_column).
+    $field = new TextField($field_name);
+    $field->setFormName($table->getFormName());
+    $field->setSize(2);
+    $field->setValue($table->getValueAt($row,$column)['duration']);
+    $this->setValue($field->getHtml());
+    return $this->toString();
+  }
+}
+
+
+
+
+
+
+//$durations = ttTimeHelper::getDurationsForWeek($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
+
+
+
+$groupedRecords = ttTimeHelper::getGroupedRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
+
+
+
+
+
+$dayTotals = ttTimeHelper::getGroupedRecordsTotals($groupedRecords);
+

 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');


@@ -95,8 +182,8 @@ $_SESSION['project'] = $cl_project;
 $cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 
 $cl_task = $request->getParameter('task', ($request->getMethod()=='POST'? null : @$_SESSION['task']));
 $_SESSION['task'] = $cl_task;
 

-// Elements of timeRecordForm.
-$form = new Form('timeRecordForm');
+// Elements of weekTimeForm.
+$form = new Form('weekTimeForm');

 
 if ($user->canManageTeam()) {
   $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));
 
 if ($user->canManageTeam()) {
   $user_list = ttTeamHelper::getActiveUsers(array('putSelfFirst'=>true));


@@ -112,6 +199,25 @@ if ($user->canManageTeam()) {
   }
 }
 
   }
 }
 

+// Create week_durations table.
+$table = new Table('week_durations');
+// $table->setIAScript('markModified'); // TODO: write a script to mark table or particular cells as modified.
+$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
+$table->setData($durations_with_labels);
+// Add columns to table.
+$table->addColumn(new TableColumn('label', '', new LabelCellRenderer(), $totals['label']));
+$table->addColumn(new TableColumn('day_0', $dayHeaders['day_header_0'], new TimeCellRenderer(), $totals['day_0']));
+$table->addColumn(new TableColumn('day_1', $dayHeaders['day_header_1'], new TimeCellRenderer(), $totals['day_1']));
+$table->addColumn(new TableColumn('day_2', $dayHeaders['day_header_2'], new TimeCellRenderer(), $totals['day_2']));
+$table->addColumn(new TableColumn('day_3', $dayHeaders['day_header_3'], new TimeCellRenderer(), $totals['day_3']));
+$table->addColumn(new TableColumn('day_4', $dayHeaders['day_header_4'], new TimeCellRenderer(), $totals['day_4']));
+$table->addColumn(new TableColumn('day_5', $dayHeaders['day_header_5'], new TimeCellRenderer()));
+$table->addColumn(new TableColumn('day_6', $dayHeaders['day_header_6'], new TimeCellRenderer()));
+$table->setInteractive(false);
+$form->addInputElement($table);
+
+

 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
   $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
   $active_clients = ttTeamHelper::getActiveClients($user->team_id, true);


@@ -352,24 +458,12 @@ if ($request->isPost()) {
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
 
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
 

-// Determine selected week start and end dates.
-$weekStartDay = $user->week_start;
-$t_arr = localtime($selected_date->getTimestamp());
-$t_arr[5] = $t_arr[5] + 1900;
-if ($t_arr[6] < $weekStartDay)
-  $startWeekBias = $weekStartDay - 7;
-else
-  $startWeekBias = $weekStartDay;
-$startDate = new DateAndTime();
-$startDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+$startWeekBias,$t_arr[5]));
-$endDate = new DateAndTime();
-$endDate->setTimestamp(mktime(0,0,0,$t_arr[4]+1,$t_arr[3]-$t_arr[6]+6+$startWeekBias,$t_arr[5]));
-// The above is needed to set date range (timestring) in page title. Consider refactoring, possibly moving into a function.
+

 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));
 
 $smarty->assign('selected_date', $selected_date);
 $smarty->assign('week_total', $week_total);
 $smarty->assign('day_total', ttTimeHelper::getTimeForDay($user->getActiveUser(), $cl_date));

-$groupedRecords = ttTimeHelper::getGroupedRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));
+//$groupedRecords = ttTimeHelper::getGroupedRecordsForInterval($user->getActiveUser(), $startDate->toString(DB_DATEFORMAT), $endDate->toString(DB_DATEFORMAT));

 $smarty->assign('grouped_records', $groupedRecords);
 $smarty->assign('grouped_records_totals', ttTimeHelper::getGroupedRecordsTotals($groupedRecords));
 
 $smarty->assign('grouped_records', $groupedRecords);
 $smarty->assign('grouped_records_totals', ttTimeHelper::getGroupedRecordsTotals($groupedRecords));