Work in progress on week view. Fixed the links.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index dd0b2ddefb072b2cdee2e190b105fb7c8c2a730e..be7b43fec41193242b1b29763578b08ae6b10ab9 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.3686 | 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.3687 | 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/time.tpl b/WEB-INF/templates/time.tpl
index 8f3629fa45df52f5492737b11cad129c5f11158b..d5db36a0cfbefd933a957fc4ead1923c8236c669 100644 (file)
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -11,7 +11,7 @@
 {if defined(WEEK_VIEW_DEBUG)}
   <tr>
     <td align="center" colspan=2">
 {if defined(WEEK_VIEW_DEBUG)}
   <tr>
     <td align="center" colspan=2">

-      <a href="week.php">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="time.php">{$i18n.label.week_view}</a>
+      <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>

     </td>
   </tr>
 {/if}
     </td>
   </tr>
 {/if}

diff --git a/time.php b/time.php
index b808aaf90378ea79fafb1f53073400df7c4ce4b3..fe3a8e3d0c72472f787b905d58dbf7cae56c2bdd 100644 (file)
--- a/time.php
+++ b/time.php
@@ -357,6 +357,7 @@ if ($request->isPost()) {
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
 
 
 $week_total = ttTimeHelper::getTimeForWeek($user->getActiveUser(), $selected_date);
 

+$smarty->assign('selected_date', $selected_date);

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