From: Nik Okuntseff Date: Wed, 7 Nov 2018 13:16:41 +0000 (+0000) Subject: Introduced org_id field in tt_projects and tt_tasks tables. X-Git-Tag: timetracker_1.19-1~692 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=264ed2176f4d55449f4a329d6b85fcb48fd50fb4;p=timetracker.git Introduced org_id field in tt_projects and tt_tasks tables. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index c94ea858..f36602e5 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.18.09.4381 | Copyright © Anuko | +  Anuko Time Tracker 1.18.10.4382 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 9ba804fd..a4a6eba7 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["convert11797to11809"]) { + if ($_POST["convert11797to11810"]) { 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`"); @@ -973,6 +973,10 @@ if ($_POST) { setChange("UPDATE `tt_site_config` SET param_value = '1.18.08', modified = now() where param_name = 'version_db' and param_value = '1.18.07'"); setChange("ALTER TABLE `tt_clients` ADD `org_id` int(11) default NULL AFTER `group_id`"); setChange("UPDATE `tt_site_config` SET param_value = '1.18.09', modified = now() where param_name = 'version_db' and param_value = '1.18.08'"); + setChange("UPDATE `tt_clients` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.09') set org_id = group_id where org_id is null"); + setChange("ALTER TABLE `tt_projects` ADD `org_id` int(11) default NULL AFTER `group_id`"); + setChange("ALTER TABLE `tt_tasks` ADD `org_id` int(11) default NULL AFTER `group_id`"); + setChange("UPDATE `tt_site_config` SET param_value = '1.18.10', modified = now() where param_name = 'version_db' and param_value = '1.18.09'"); } if ($_POST["cleanup"]) { @@ -1018,7 +1022,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.18.09) + Create database structure (v1.18.10)
(applies only to new installations, do not execute when updating)
@@ -1063,8 +1067,8 @@ if ($_POST) {
Update database structure (v1.17.97 to v1.18.09)Update database structure (v1.17.97 to v1.18.10)
diff --git a/mysql.sql b/mysql.sql index b29d08dc..32ba202e 100644 --- a/mysql.sql +++ b/mysql.sql @@ -117,6 +117,7 @@ INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALU CREATE TABLE `tt_projects` ( `id` int(11) NOT NULL auto_increment, # project id `group_id` int(11) NOT NULL, # group id + `org_id` int(11) default NULL, # organization id `name` varchar(80) COLLATE utf8_bin NOT NULL, # project name `description` varchar(255) default NULL, # project description `tasks` text default NULL, # comma-separated list of task ids associated with this project @@ -134,6 +135,7 @@ create unique index project_idx on tt_projects(group_id, name, status); CREATE TABLE `tt_tasks` ( `id` int(11) NOT NULL auto_increment, # task id `group_id` int(11) NOT NULL, # group id + `org_id` int(11) default NULL, # organization id `name` varchar(80) COLLATE utf8_bin NOT NULL, # task name `description` varchar(255) default NULL, # task description `status` tinyint(4) default 1, # task status @@ -461,4 +463,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.09', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.10', now()); # TODO: change when structure changes.