From 4a23c8efa5cd0af46cef4a602b5897f9b8e14636 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 22 Apr 2019 20:44:04 +0000 Subject: [PATCH] Introduced tt_work_currencies table for remote work plugin. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/work_add.tpl | 2 +- dbinstall.php | 16 +++++++++++++--- mysql.sql | 18 +++++++++++++++++- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 2f30bd7c..b54e2baa 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- + + + +
 Anuko Time Tracker 1.19.1.4972 | Copyright © Anuko | +  Anuko Time Tracker 1.19.2.4973 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl index 74209f48..3992fa15 100644 --- a/WEB-INF/templates/work_add.tpl +++ b/WEB-INF/templates/work_add.tpl @@ -5,7 +5,7 @@ - + diff --git a/dbinstall.php b/dbinstall.php index 53d04110..e979e1b6 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -1149,7 +1149,7 @@ if ($_POST) { ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.54', modified = now() where param_name = 'version_db' and param_value = '1.18.51'"); ttExecute("ALTER TABLE `tt_templates` ADD `description` varchar(255) default NULL AFTER `name`"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.55', modified = now() where param_name = 'version_db' and param_value = '1.18.54'"); - ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY (`id`))"); + ttExecute("CREATE TABLE `tt_files` (`id` int(10) unsigned NOT NULL auto_increment,`group_id` int(10) unsigned,`org_id` int(10) unsigned,`remote_id` bigint(20) unsigned,`entity_type` varchar(32),`entity_id` int(10) unsigned,`file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL,`description` varchar(255) default NULL,`created` datetime default NULL,`created_ip` varchar(45) default NULL,`created_by` int(10) unsigned,`modified` datetime default NULL,`modified_ip` varchar(45) default NULL,`modified_by` int(10) unsigned,`status` tinyint(1) default 1,PRIMARY KEY (`id`))"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.59', modified = now() where param_name = 'version_db' and param_value = '1.18.55'"); ttExecute("ALTER TABLE `tt_files` ADD `file_key` varchar(32) AFTER `remote_id`"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.60', modified = now() where param_name = 'version_db' and param_value = '1.18.59'"); @@ -1159,7 +1159,13 @@ if ($_POST) { ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'swap_roles', 'swap_roles,update_work') where rank >= 12"); ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.61') set rights = replace(rights, 'view_all_reports', 'view_all_reports,manage_work,bid_on_work') where rank >= 68"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.19.0', modified = now() where param_name = 'version_db' and param_value = '1.18.61'"); -} + } + + if ($_POST["convert11900to11902"]) { + ttExecute("CREATE TABLE `tt_work_currencies` (`id` int(10) unsigned NOT NULL,`name` varchar(10) NOT NULL,PRIMARY KEY (`id`))"); + ttExecute("create unique index currency_idx on tt_work_currencies(`name`)"); + ttExecute("INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD')"); + } if ($_POST["cleanup"]) { $mdb2 = getConnection(); @@ -1208,7 +1214,7 @@ if ($_POST) {

DB Install

{$i18n.label.thing_name} (*):{$forms.workForm.project_name.control}{$forms.workForm.work_name.control}
{$i18n.label.description}:
-
Create database structure (v1.19.0) + Create database structure (v1.19.2)
(applies only to new installations, do not execute when updating)
@@ -1256,6 +1262,10 @@ if ($_POST) { 		Update database structure (v1.17.97 to v1.19)
Update database structure (v1.19 to v1.19.2)

DB Maintenance

diff --git a/mysql.sql b/mysql.sql index 0cd73262..56c217a3 100644 --- a/mysql.sql +++ b/mysql.sql @@ -560,6 +560,22 @@ CREATE TABLE `tt_files` ( ); +# +# Structure for table tt_work_currencies. +# This table keeps currencies supported by remote work plugin. +# +CREATE TABLE `tt_work_currencies` ( + `id` int(10) unsigned NOT NULL, # currency id + `name` varchar(10) NOT NULL, # currency name (USD, CAD, etc.) + PRIMARY KEY (`id`) +); + +# Create an index that guarantees unique work currencies. +create unique index currency_idx on tt_work_currencies(`name`); + +INSERT INTO `tt_work_currencies` (`id`, `name`) VALUES ('1', 'USD'), ('2', 'CAD'), ('3', 'AUD'), ('4', 'EUR'), ('5', 'NZD'); + + # # Structure for table tt_site_config. This table stores configuration data # for Time Tracker site as a whole. @@ -573,4 +589,4 @@ CREATE TABLE `tt_site_config` ( PRIMARY KEY (`param_name`) ); -INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.0', now()); # TODO: change when structure changes. +INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.2', now()); # TODO: change when structure changes. -- 2.20.1