From 265754c2f6e9d016e7f58591f08fe4e97f96b05d Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Thu, 7 Mar 2019 19:21:27 +0000 Subject: [PATCH] Introduced tt_templates database table. --- WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 10 ++++++---- mysql.sql | 23 ++++++++++++++++++++++- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 16f1bea8..7d6e2200 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.18.53.4836 | Copyright © Anuko | +  Anuko Time Tracker 1.18.54.4837 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 65a6776d..c4eb1bec 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -972,7 +972,7 @@ if ($_POST) { print "Updated $tt_expense_items_updated tt_expense_items records...
\n"; } - if ($_POST["convert11797to11851"]) { + if ($_POST["convert11797to11854"]) { ttExecute("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL"); ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`"); ttExecute("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`"); @@ -1123,6 +1123,8 @@ if ($_POST) { ttExecute("drop index timesheet_idx on tt_expense_items"); ttExecute("ALTER TABLE `tt_expense_items` DROP `timesheet_id`"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.51', modified = now() where param_name = 'version_db' and param_value = '1.18.50'"); + ttExecute("CREATE TABLE `tt_templates` (`id` int(11) NOT NULL auto_increment,`group_id` int(11) default NULL,`org_id` int(11) default NULL,`name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`content` text,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(11) default NULL,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(11) default NULL,`status` tinyint(4) default 1,PRIMARY KEY (`id`))"); + ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'"); } if ($_POST["cleanup"]) { @@ -1171,7 +1173,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.18.51) + Create database structure (v1.18.54)
(applies only to new installations, do not execute when updating)
@@ -1216,8 +1218,8 @@ if ($_POST) {
Update database structure (v1.17.97 to v1.18.51)Update database structure (v1.17.97 to v1.18.54)
diff --git a/mysql.sql b/mysql.sql index bec26520..8c38425c 100644 --- a/mysql.sql +++ b/mysql.sql @@ -512,6 +512,27 @@ CREATE TABLE `tt_timesheets` ( ); +# +# Structure for table tt_templates. +# This table keeps templates used in groups. +# +CREATE TABLE `tt_templates` ( + `id` int(11) NOT NULL auto_increment, # template id + `group_id` int(11) default NULL, # group id + `org_id` int(11) default NULL, # organization id + `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # template name + `content` text, # template content + `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, # template status + PRIMARY KEY (`id`) +); + + # # Structure for table tt_site_config. This table stores configuration data # for Time Tracker site as a whole. @@ -525,4 +546,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.51', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.54', now()); # TODO: change when structure changes. -- 2.20.1