From ce36d3475dd1ad6e38f95ac410e27c7c19d03ca1 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 24 Feb 2019 15:52:47 +0000 Subject: [PATCH] Added approved field to tt_log and tt_expense_items tables. --- WEB-INF/templates/footer.tpl | 2 +- dbinstall.php | 11 +++++++---- mysql.sql | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index c99fe708..3594a9f4 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- - - + +
 Anuko Time Tracker 1.18.41.4767 | Copyright © Anuko | +  Anuko Time Tracker 1.18.41.4768 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index f700d99e..8babd31e 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["convert11797to11841"]) { + if ($_POST["convert11797to11842"]) { 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`"); @@ -1085,6 +1085,9 @@ if ($_POST) { ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.40', modified = now() where param_name = 'version_db' and param_value = '1.18.39'"); ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.40') set rights = replace(rights, 'view_client_timesheets,view_client_invoices', 'view_client_timesheets,view_client_unapproved,view_client_invoices') where rank = 16"); ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.41', modified = now() where param_name = 'version_db' and param_value = '1.18.40'"); + ttExecute("ALTER TABLE `tt_log` ADD `approved` tinyint(4) default 0 AFTER `billable`"); + ttExecute("ALTER TABLE `tt_expense_items` ADD `approved` tinyint(4) default 0 AFTER `invoice_id`"); + ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.42', modified = now() where param_name = 'version_db' and param_value = '1.18.41'"); } if ($_POST["cleanup"]) { @@ -1133,7 +1136,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.18.41) + Create database structure (v1.18.42)
(applies only to new installations, do not execute when updating)
@@ -1178,8 +1181,8 @@ if ($_POST) {
Update database structure (v1.17.97 to v1.18.41)Update database structure (v1.17.97 to v1.18.42)
diff --git a/mysql.sql b/mysql.sql index 2a507ee2..d79e9d7b 100644 --- a/mysql.sql +++ b/mysql.sql @@ -201,6 +201,7 @@ CREATE TABLE `tt_log` ( `invoice_id` int(11) default NULL, # invoice id `comment` text, # user provided comment for time record `billable` tinyint(4) default 0, # whether the record is billable or not + `approved` tinyint(4) default 0, # whether the record is approved `paid` tinyint(4) default 0, # whether the record is paid `created` datetime default NULL, # creation timestamp `created_ip` varchar(45) default NULL, # creator ip @@ -431,6 +432,7 @@ CREATE TABLE `tt_expense_items` ( `name` text NOT NULL, # expense item name (what is an expense for) `cost` decimal(10,2) default '0.00', # item cost (including taxes, etc.) `invoice_id` int(11) default NULL, # invoice id + `approved` tinyint(4) default 0, # whether the item is approved `paid` tinyint(4) default 0, # whether the item is paid `created` datetime default NULL, # creation timestamp `created_ip` varchar(45) default NULL, # creator ip -- 2.20.1