Skip to content

Commit dc4cbd3

Browse files
anukoanuko
committed
Version change for PR#24, work in progress renaming things.
1 parent 139889a commit dc4cbd3

5 files changed

Lines changed: 25 additions & 26 deletions

File tree

‎WEB-INF/lib/ttTeamHelper.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ static function insert($fields) {
703703

704704
$uncompleted_entries = $fields['uncompleted_entries'];
705705
if ($uncompleted_entries !== null) {
706-
$uncompleted_entries_f = ', uncompleted_entries';
706+
$uncompleted_entries_f = ', uncompleted_indicators';
707707
$uncompleted_entries_v = ', ' . (int)$uncompleted_entries;
708708
} else {
709709
$uncompleted_entries_f = '';
@@ -765,7 +765,7 @@ static function update($team_id, $fields)
765765
if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']);
766766
if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
767767
if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
768-
if (isset($fields['uncompleted_entries'])) $uncompleted_entries_part = ', uncompleted_entries = '.intval($fields['uncompleted_entries']);
768+
if (isset($fields['uncompleted_entries'])) $uncompleted_entries_part = ', uncompleted_indicators = '.intval($fields['uncompleted_entries']);
769769
if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
770770
if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
771771
if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);

‎WEB-INF/lib/ttUser.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function ttUser($login, $id = null) {
6464

6565
$sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name,
6666
t.address, t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
67-
t.tracking_mode, t.record_type, t.uncompleted_entries, t.plugins, t.lock_spec, t.workday_hours, t.custom_logo
67+
t.tracking_mode, t.record_type, t.uncompleted_indicators, t.plugins, t.lock_spec, t.workday_hours, t.custom_logo
6868
FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
6969
if ($id)
7070
$sql .= "u.id = $id";
@@ -93,7 +93,7 @@ function ttUser($login, $id = null) {
9393
$this->week_start = $val['week_start'];
9494
$this->tracking_mode = $val['tracking_mode'];
9595
$this->record_type = $val['record_type'];
96-
$this->uncompleted_entries = $val['uncompleted_entries'];
96+
$this->uncompleted_entries = $val['uncompleted_indicators'];
9797
$this->team = $val['team_name'];
9898
$this->address = $val['address'];
9999
$this->currency = $val['currency'];

‎WEB-INF/templates/footer.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<br>
1313
<table cellspacing="0" cellpadding="4" width="100%" border="0">
1414
<tr>
15-
<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> |
15+
<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> |
1616
<a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
1717
<a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
1818
<a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

‎dbinstall.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ function setChange($sql) {
634634
setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`");
635635
setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas");
636636
setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL");
637-
setChange("ALTER TABLE `tt_teams` ADD `uncompleted_entries` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
637+
setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`");
638638
}
639639

640640
// The update_clients function updates projects field in tt_clients table.

‎mysql.sql‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313
# This table stores settings common to all team members such as language, week start day, etc.
1414
#
1515
CREATE TABLE `tt_teams` (
16-
`id` int(11) NOT NULL auto_increment, # team id
17-
`timestamp` timestamp NOT NULL, # modification timestamp
18-
`name` varchar(80) default NULL, # team name
19-
`address` varchar(255) default NULL, # team address, used in invoices
20-
`currency` varchar(7) default NULL, # team currency symbol
21-
`decimal_mark` char(1) NOT NULL default '.', # separator in decimals
22-
`lang` varchar(10) NOT NULL default 'en', # language
23-
`date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
24-
`time_format` varchar(20) NOT NULL default '%H:%M', # time format
25-
`week_start` smallint(2) NOT NULL DEFAULT '0', # Week start day, 0 == Sunday.
26-
`tracking_mode` smallint(2) NOT NULL DEFAULT '1', # tracking mode ("projects" or "projects and tasks")
27-
`record_type` smallint(2) NOT NULL DEFAULT '0', # time record type ("start and finish", "duration", or both)
28-
`uncompleted_entries` smallint(2) NOT NULL DEFAULT '0', # show indicator next to users with uncompleted time entries
29-
# ("dont show", "on users page")
30-
`plugins` varchar(255) default NULL, # a list of enabled plugins for team
31-
`lock_spec` varchar(255) default NULL, # Cron specification for record locking,
32-
# for example: "0 10 * * 1" for "weekly on Mon at 10:00".
33-
`workday_hours` smallint(6) DEFAULT '8', # number of work hours in a regular day
34-
`custom_logo` tinyint(4) default '0', # whether to use a custom logo or not
35-
`status` tinyint(4) default '1', # team status
16+
`id` int(11) NOT NULL auto_increment, # team id
17+
`timestamp` timestamp NOT NULL, # modification timestamp
18+
`name` varchar(80) default NULL, # team name
19+
`address` varchar(255) default NULL, # team address, used in invoices
20+
`currency` varchar(7) default NULL, # team currency symbol
21+
`decimal_mark` char(1) NOT NULL default '.', # separator in decimals
22+
`lang` varchar(10) NOT NULL default 'en', # language
23+
`date_format` varchar(20) NOT NULL default '%Y-%m-%d', # date format
24+
`time_format` varchar(20) NOT NULL default '%H:%M', # time format
25+
`week_start` smallint(2) NOT NULL DEFAULT '0', # Week start day, 0 == Sunday.
26+
`tracking_mode` smallint(2) NOT NULL DEFAULT '1', # tracking mode ("projects" or "projects and tasks")
27+
`record_type` smallint(2) NOT NULL DEFAULT '0', # time record type ("start and finish", "duration", or both)
28+
`uncompleted_indicators` smallint(2) NOT NULL DEFAULT '0', # show indicator for users with uncompleted time entries
29+
`plugins` varchar(255) default NULL, # a list of enabled plugins for team
30+
`lock_spec` varchar(255) default NULL, # Cron specification for record locking,
31+
# for example: "0 10 * * 1" for "weekly on Mon at 10:00".
32+
`workday_hours` smallint(6) DEFAULT '8', # number of work hours in a regular day
33+
`custom_logo` tinyint(4) default '0', # whether to use a custom logo or not
34+
`status` tinyint(4) default '1', # team status
3635
PRIMARY KEY (`id`)
3736
);
3837

0 commit comments

Comments
 (0)