From: Anže Videnič <anze.videnic@gmail.com>
Date: Mon, 4 Jul 2016 13:54:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: timetracker_1.19-1~1702^2^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/61d8edb3db70bd197ed6b988727394633b0cecf9?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

61d8edb3db70bd197ed6b988727394633b0cecf9
diff --combined WEB-INF/lib/ttTeamHelper.class.php
index 186f7a1e,e76482d0..e91a794d
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@@ -703,7 -703,7 +703,7 @@@ class ttTeamHelper 
    static function update($team_id, $fields)
    {
      // We'll require team name to be always set.
 -    if (!isset($fields['name'])) return false;
 +    if (!isset($fields['name']) || $fields['name'] == "") return false;
  
      $mdb2 = getConnection();
      $name_part = 'name = '.$mdb2->quote($fields['name']);
@@@ -718,7 -718,6 +718,7 @@@
      $record_type_part = '';
      $plugins_part = '';
      $lock_spec_part = '';
 +    $working_hours_part = '';
  
      if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
      if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
@@@ -731,11 -730,10 +731,11 @@@
      if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
      if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
      if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
 +    if (isset($fields['working_hours'])) $working_hours_part = ', daily_working_hours = '.$mdb2->quote($fields['working_hours']);
  
      $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
        $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
 -      $plugins_part $lock_spec_part where id = $team_id";
 +      $plugins_part $lock_spec_part $working_hours_part where id = $team_id";
      $affected = $mdb2->exec($sql);
      if (is_a($affected, 'PEAR_Error')) return false;
  
@@@ -760,7 -758,7 +760,7 @@@
            $count++;
            $inactive_teams[] = $team_id;
            // Limit the array size for perfomance by allowing this operation on small chunks only.
-           if ($count >= 25) break;
+           if ($count >= 100) break;
          }
        }
        return $inactive_teams;
diff --combined WEB-INF/templates/footer.tpl
index 5da4e2a6,f9a7eddc..6ff01ef6
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@@ -12,7 -12,7 +12,7 @@@
        <br>
        <table cellspacing="0" cellpadding="4" width="100%" border="0">
          <tr>
-           <td align="center">&nbsp;Anuko Time Tracker 1.9.25.3498 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
 -          <td align="center">&nbsp;Anuko Time Tracker 1.9.25.3499 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
++          <td align="center">&nbsp;Anuko Time Tracker 1.9.30.0000 | 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 --combined WEB-INF/templates/time.tpl
index da044102,80b111ba..d526c46f
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@@ -41,7 -41,7 +41,7 @@@ task_names = new Array()
  empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}';
  empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}';
  
- // The populateDropdowns function populates the "project" and "task" dropdown controls
+ // The fillDropdowns function populates the "project" and "task" dropdown controls
  // with relevant values.
  function fillDropdowns() {
    if(document.body.contains(document.timeRecordForm.client))
@@@ -354,16 -354,6 +354,16 @@@ function get_time() 
      <td align="left">{$i18n.label.week_total}: {$week_total}</td>
      <td align="right">{$i18n.label.day_total}: {$day_total}</td>
    </tr>
 +  {if $month_total}
 +  <tr>
 +    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
 +    {if $month_left|strpos:'-' === 0}
 +    <td align="right">{$i18n.label.month_over}: <span style="color: green;">{$month_left|substr:1}</span></td>
 +    {else}
 +    <td align="right">{$i18n.label.month_left}: <span style="color: red;">{$month_left}</span></td>
 +    {/if}
 +  </tr>
 +  {/if}
  </table>
  {/if}
  {$forms.timeRecordForm.close}