From f39d6bdcde7c4de3f38dc63e500824d28aa1939c Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Tue, 27 Mar 2018 01:32:29 +0000 Subject: [PATCH] Introduced parent_id and org_id fields in tt_teams. --- WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 11 +++++++---- mysql.sql | 16 +++++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 95bed59a..ceaf9982 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.17.75.4183 | Copyright © Anuko | +  Anuko Time Tracker 1.17.76.4184 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 4d7feeb2..1f876470 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -805,7 +805,7 @@ if ($_POST) { print "Updated $users_updated users...
\n"; } - if ($_POST["convert11744to11767"]) { + if ($_POST["convert11744to11776"]) { setChange("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.44') set rights = replace(rights, 'override_punch_mode,override_date_lock', 'override_punch_mode,override_own_punch_mode,override_date_lock')"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.48' where param_name = 'version_db' and param_value = '1.17.44'"); setChange("update `tt_users` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.17.48') set role_id = (select id from tt_roles where team_id = 0 and rank = 512) where role = 324"); @@ -860,6 +860,9 @@ if ($_POST) { setChange("ALTER TABLE `tt_tmp_refs` drop `timestamp`"); setChange("delete from `tt_tmp_refs`"); setChange("UPDATE `tt_site_config` SET param_value = '1.17.67', modified = now() where param_name = 'version_db' and param_value = '1.17.66'"); + setChange("ALTER TABLE `tt_teams` ADD `parent_id` int(11) default NULL AFTER `id`"); + setChange("ALTER TABLE `tt_teams` ADD `org_id` int(11) default NULL AFTER `parent_id`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.17.76', modified = now() where param_name = 'version_db' and param_value = '1.17.67'"); } if ($_POST["cleanup"]) { @@ -905,7 +908,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.17.67) + Create database structure (v1.17.76)
(applies only to new installations, do not execute when updating)
@@ -945,8 +948,8 @@ if ($_POST) {
Update database structure (v1.17.44 to v1.17.67)Update database structure (v1.17.44 to v1.17.76)
diff --git a/mysql.sql b/mysql.sql index ebe59936..3e4805fe 100644 --- a/mysql.sql +++ b/mysql.sql @@ -10,12 +10,14 @@ # # Structure for table tt_teams. A team is a group of users for whom we are tracking work time. -# This table stores settings common to all team members such as language, week start day, etc. +# This table stores settings common to all group members such as language, week start day, etc. # CREATE TABLE `tt_teams` ( - `id` int(11) NOT NULL auto_increment, # team id - `name` varchar(80) default NULL, # team name - `currency` varchar(7) default NULL, # team currency symbol + `id` int(11) NOT NULL auto_increment, # group id + `parent_id` int(11) default NULL, # parent group id + `org_id` int(11) default NULL, # organization id (id of top group) + `name` varchar(80) default NULL, # group name + `currency` varchar(7) default NULL, # 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 @@ -31,14 +33,14 @@ CREATE TABLE `tt_teams` ( # for example: "0 10 * * 1" for "weekly on Mon at 10:00". `workday_minutes` smallint(4) default 480, # number of work minutes in a regular working day `custom_logo` tinyint(4) default 0, # whether to use a custom logo or not - `config` text default NULL, # miscellaneous team configuration settings + `config` text default NULL, # miscellaneous group configuration settings `created` datetime default NULL, # creation timestamp `created_ip` varchar(45) default NULL, # creator ip `created_by` int(11) default NULL, # creator user_id `modified` datetime default NULL, # modification timestamp `modified_ip` varchar(45) default NULL, # modifier ip `modified_by` int(11) default NULL, # modifier user_id - `status` tinyint(4) default 1, # team status + `status` tinyint(4) default 1, # group status PRIMARY KEY (`id`) ); @@ -450,4 +452,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.67', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.76', now()); # TODO: change when structure changes. -- 2.20.1