Version change for PR#24, work in progress renaming things.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 7b1fc24..6e43310 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -703,7 +703,7 @@ class ttTeamHelper {
 
     $uncompleted_entries = $fields['uncompleted_entries'];
     if ($uncompleted_entries !== null) {
-      $uncompleted_entries_f = ', uncompleted_entries';
+      $uncompleted_entries_f = ', uncompleted_indicators';
       $uncompleted_entries_v = ', ' . (int)$uncompleted_entries;
     } else {
       $uncompleted_entries_f = '';
@@ -765,7 +765,7 @@ class ttTeamHelper {
     if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']);
     if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
-    if (isset($fields['uncompleted_entries'])) $uncompleted_entries_part = ', uncompleted_entries = '.intval($fields['uncompleted_entries']);
+    if (isset($fields['uncompleted_entries'])) $uncompleted_entries_part = ', uncompleted_indicators = '.intval($fields['uncompleted_entries']);
     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['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0d64826..51e844b 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -64,7 +64,7 @@ class ttUser {
 
     $sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name, 
       t.address, t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
-      t.tracking_mode, t.record_type, t.uncompleted_entries, t.plugins, t.lock_spec, t.workday_hours, t.custom_logo
+      t.tracking_mode, t.record_type, t.uncompleted_indicators, t.plugins, t.lock_spec, t.workday_hours, t.custom_logo
       FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
     if ($id)
       $sql .= "u.id = $id";
@@ -93,7 +93,7 @@ class ttUser {
       $this->week_start = $val['week_start'];
       $this->tracking_mode = $val['tracking_mode'];
       $this->record_type = $val['record_type'];
-      $this->uncompleted_entries = $val['uncompleted_entries'];
+      $this->uncompleted_entries = $val['uncompleted_indicators'];
       $this->team = $val['team_name'];
       $this->address = $val['address'];
       $this->currency = $val['currency'];

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 33cf326..0386535 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.33.3543 | 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.34.3544 | 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/dbinstall.php b/dbinstall.php
index 9361cda..49cfe5f 100755 (executable)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -634,7 +634,7 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
     setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
     setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
-    setChange("ALTER TABLE `tt_teams` ADD `uncompleted_entries` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
+    setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
   }
   
   // The update_clients function updates projects field in tt_clients table.

diff --git a/mysql.sql b/mysql.sql
index 0ca6fea..7a24c76 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -13,26 +13,25 @@
 # This table stores settings common to all team members such as language, week start day, etc.
 #
 CREATE TABLE `tt_teams` (
-  `id` int(11) NOT NULL auto_increment,                   # team id
-  `timestamp` timestamp NOT NULL,                         # modification timestamp
-  `name` varchar(80) default NULL,                        # team name
-  `address` varchar(255) default NULL,                    # team address, used in invoices
-  `currency` varchar(7) default NULL,                     # team currency symbol
-  `decimal_mark` char(1) NOT NULL default '.',            # separator in decimals
-  `lang` varchar(10) NOT NULL default 'en',               # language
-  `date_format` varchar(20) NOT NULL default '%Y-%m-%d',  # date format
-  `time_format` varchar(20) NOT NULL default '%H:%M',     # time format
-  `week_start` smallint(2) NOT NULL DEFAULT '0',          # Week start day, 0 == Sunday.
-  `tracking_mode` smallint(2) NOT NULL DEFAULT '1',       # tracking mode ("projects" or "projects and tasks")
-  `record_type` smallint(2) NOT NULL DEFAULT '0',         # time record type ("start and finish", "duration", or both)
-  `uncompleted_entries` smallint(2) NOT NULL DEFAULT '0', # show indicator next to users with uncompleted time entries
-                                                          # ("dont show", "on users page")
-  `plugins` varchar(255) default NULL,                    # a list of enabled plugins for team
-  `lock_spec` varchar(255) default NULL,                  # Cron specification for record locking,
-                                                          # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
-  `workday_hours` smallint(6) DEFAULT '8',                # number of work hours in a regular day
-  `custom_logo` tinyint(4) default '0',                   # whether to use a custom logo or not
-  `status` tinyint(4) default '1',                        # team status
+  `id` int(11) NOT NULL auto_increment,                      # team id
+  `timestamp` timestamp NOT NULL,                            # modification timestamp
+  `name` varchar(80) default NULL,                           # team name
+  `address` varchar(255) default NULL,                       # team address, used in invoices
+  `currency` varchar(7) default NULL,                        # team currency symbol
+  `decimal_mark` char(1) NOT NULL default '.',               # separator in decimals
+  `lang` varchar(10) NOT NULL default 'en',                  # language
+  `date_format` varchar(20) NOT NULL default '%Y-%m-%d',     # date format
+  `time_format` varchar(20) NOT NULL default '%H:%M',        # time format
+  `week_start` smallint(2) NOT NULL DEFAULT '0',             # Week start day, 0 == Sunday.
+  `tracking_mode` smallint(2) NOT NULL DEFAULT '1',          # tracking mode ("projects" or "projects and tasks")
+  `record_type` smallint(2) NOT NULL DEFAULT '0',            # time record type ("start and finish", "duration", or both)
+  `uncompleted_indicators` smallint(2) NOT NULL DEFAULT '0', # show indicator for users with uncompleted time entries
+  `plugins` varchar(255) default NULL,                       # a list of enabled plugins for team
+  `lock_spec` varchar(255) default NULL,                     # Cron specification for record locking,
+                                                             # for example: "0 10 * * 1" for "weekly on Mon at 10:00".
+  `workday_hours` smallint(6) DEFAULT '8',                   # number of work hours in a regular day
+  `custom_logo` tinyint(4) default '0',                      # whether to use a custom logo or not
+  `status` tinyint(4) default '1',                           # team status
   PRIMARY KEY (`id`)
 );