From eae8b284cbee2b8e78b311bfa3a94f731f5056ee Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Thu, 8 Nov 2018 08:55:16 +0000 Subject: [PATCH] A bit more progress with introducing org_id in tables. --- WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 13 +++++++++---- mysql.sql | 10 +++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 98b2ad53..f807fe1c 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.18.11.4386 | Copyright © Anuko | +  Anuko Time Tracker 1.18.12.4387 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 1c5fa900..26f1a33a 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -956,7 +956,7 @@ if ($_POST) { print "Updated $tt_expense_items_updated tt_expense_items records...
\n"; } - if ($_POST["convert11797to11811"]) { + if ($_POST["convert11797to11812"]) { setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL"); setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`"); setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`"); @@ -984,6 +984,11 @@ if ($_POST) { setChange("UPDATE `tt_site_config` SET param_value = '1.18.11', modified = now() where param_name = 'version_db' and param_value = '1.18.10'"); setChange("UPDATE `tt_log` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null"); setChange("UPDATE `tt_invoices` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.11') set org_id = group_id where org_id is null"); + setChange("ALTER TABLE `tt_user_project_binds` ADD `group_id` int(11) default NULL AFTER `project_id`"); + setChange("ALTER TABLE `tt_user_project_binds` ADD `org_id` int(11) default NULL AFTER `group_id`"); + setChange("ALTER TABLE `tt_project_task_binds` ADD `group_id` int(11) default NULL AFTER `task_id`"); + setChange("ALTER TABLE `tt_project_task_binds` ADD `org_id` int(11) default NULL AFTER `group_id`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.18.12', modified = now() where param_name = 'version_db' and param_value = '1.18.11'"); } if ($_POST["cleanup"]) { @@ -1029,7 +1034,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.18.11) + Create database structure (v1.18.12)
(applies only to new installations, do not execute when updating)
@@ -1074,8 +1079,8 @@ if ($_POST) {
Update database structure (v1.17.97 to v1.18.11)Update database structure (v1.17.97 to v1.18.12)
diff --git a/mysql.sql b/mysql.sql index 396fd2d2..00abb462 100644 --- a/mysql.sql +++ b/mysql.sql @@ -153,6 +153,8 @@ CREATE TABLE `tt_user_project_binds` ( `id` int(11) NOT NULL auto_increment, # bind id `user_id` int(11) NOT NULL, # user id `project_id` int(11) NOT NULL, # project id + `group_id` int(11) default NULL, # group id + `org_id` int(11) default NULL, # organization id `rate` float(6,2) default '0.00', # rate for this user when working on this project `status` tinyint(4) default 1, # bind status PRIMARY KEY (`id`) @@ -166,8 +168,10 @@ create unique index bind_idx on tt_user_project_binds(user_id, project_id); # Structure for table tt_project_task_binds. This table maps projects to assigned tasks. # CREATE TABLE `tt_project_task_binds` ( - `project_id` int(11) NOT NULL, # project id - `task_id` int(11) NOT NULL # task id + `project_id` int(11) NOT NULL, # project id + `task_id` int(11) NOT NULL # task id + `group_id` int(11) default NULL, # group id + `org_id` int(11) default NULL, # organization id ); # Indexes for tt_project_task_binds. @@ -465,4 +469,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.11', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.12', now()); # TODO: change when structure changes. -- 2.20.1