From: Nik Okuntseff <support@anuko.com>
Date: Tue, 13 Feb 2018 19:11:42 +0000 (+0000)
Subject: Replaced uncompleted indicators dropdown with a checkbox.
X-Git-Tag: timetracker_1.19-1~1129
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e053d82d1b49537463875f7e68510d5afabe5b12;p=timetracker.git

Replaced uncompleted indicators dropdown with a checkbox.
---

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index b433e6ef..f2fa1cba 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -46,6 +46,7 @@ class ttUser {
   var $project_required = 0;    // Whether project selection is required on time entires.
   var $task_required = 0;       // Whether task selection is required on time entires.
   var $record_type = 0;         // Record type (duration vs start and finish, or both).
+  var $allow_overlap = 0;       // Whether to allow overlapping time entries.
   var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
   var $bcc_email = null;        // Bcc email.
   var $currency = null;         // Currency.
@@ -100,7 +101,7 @@ class ttUser {
       $this->project_required = $val['project_required'];
       $this->task_required = $val['task_required'];
       $this->record_type = $val['record_type'];
-      $this->uncompleted_indicators = $val['uncompleted_indicators'];
+      // $this->uncompleted_indicators = $val['uncompleted_indicators']; // TODO: remove the field from query and drop the field.
       $this->bcc_email = $val['bcc_email'];
       $this->team = $val['team_name'];
       $this->currency = $val['currency'];
@@ -109,9 +110,13 @@ class ttUser {
       $this->workday_minutes = $val['workday_minutes'];
       $this->custom_logo = $val['custom_logo'];
 
-      // Set user config options.
       $this->config = $val['config'];
-      $this->show_holidays = in_array('show_holidays', explode(',', $this->config));
+      $config_array = explode(',', $this->config);
+
+      // Set user config options.
+      $this->show_holidays = in_array('show_holidays', $config_array);
+      $this->allow_overlap = in_array('allow_overlap', $config_array);
+      $this->uncompleted_indicators = in_array('uncompleted_indicators', $config_array);
 
       // Set "on behalf" id and name.
       if (isset($_SESSION['behalf_id'])) {
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index f877ab05..45b1d7d4 100644
--- 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.16.3985 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.17.3986 | 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>
diff --git a/WEB-INF/templates/profile_edit.tpl b/WEB-INF/templates/profile_edit.tpl
index 089ecead..bb73a69e 100644
--- a/WEB-INF/templates/profile_edit.tpl
+++ b/WEB-INF/templates/profile_edit.tpl
@@ -174,7 +174,7 @@ function handlePluginCheckboxes() {
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.profile.uncompleted_indicators}:</td>
-            <td>{$forms.profileForm.uncompleted_indicators.control}</td>
+            <td>{$forms.profileForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
 {if $user->isManager()}
           <tr>
diff --git a/profile_edit.php b/profile_edit.php
index eaa9b2ae..6abcce1a 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -190,10 +190,14 @@ if ($user->canManageTeam()) {
   $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
   // Prepare uncompleted indicators choices.
+  /*
   $uncompleted_indicators_options = array();
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS_NONE] = $i18n->getKey('form.profile.uncompleted_indicators_none');
   $uncompleted_indicators_options[UNCOMPLETED_INDICATORS] = $i18n->getKey('form.profile.uncompleted_indicators_show');
   $form->addInput(array('type'=>'combobox','name'=>'uncompleted_indicators','style'=>'width: 150px;','data'=>$uncompleted_indicators_options,'value'=>$cl_uncompleted_indicators));
+  */
+  // Uncompleted indicators checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
 
   // Add bcc email control, for manager only.
   if ($user->isManager()) {
@@ -283,9 +287,11 @@ if ($request->isPost()) {
 
       $plugins = trim($plugins, ',');
 
-      // Prepare config string. At this time we only handle show_holidays here.
+      // Prepare config string.
       if ($cl_show_holidays)
         $config .= ',show_holidays';
+      if ($cl_uncompleted_indicators)
+        $config .= ',uncompleted_indicators';
       $config = trim($config, ',');
 
       $update_result = ttTeamHelper::update($user->team_id, array(