From: Nik Okuntseff Date: Fri, 19 Jan 2018 15:03:34 +0000 (+0000) Subject: Dropped no longer used address field from the database. X-Git-Tag: timetracker_1.19-1~1362 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d5d78055d87535ec75bcde0c10260882b9839b8c;p=timetracker.git Dropped no longer used address field from the database. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 400209c3..6828544e 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- + + + +
 Anuko Time Tracker 1.14.0.3757 | Copyright © Anuko | +  Anuko Time Tracker 1.15.0.3758 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 49c9747e..bf8c958e 100755 --- a/dbinstall.php +++ b/dbinstall.php @@ -600,54 +600,6 @@ if ($_POST) { setChange("ALTER TABLE tt_invoices DROP end_date"); } - if ($_POST["convert1600to11400"]) { - setChange("DROP TABLE IF EXISTS tt_invoice_headers"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL"); - setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY (`id`))"); - setChange("create index date_idx on tt_expense_items(date)"); - setChange("create index user_idx on tt_expense_items(user_id)"); - setChange("create index client_idx on tt_expense_items(client_id)"); - setChange("create index project_idx on tt_expense_items(project_id)"); - setChange("create index invoice_idx on tt_expense_items(invoice_id)"); - setChange("ALTER TABLE tt_fav_reports DROP sort_by"); - setChange("ALTER TABLE tt_fav_reports DROP show_empty_days"); - setChange("ALTER TABLE tt_invoices DROP discount"); - setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL"); - setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'"); - setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL"); - setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))"); - setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL"); - setChange("create index client_idx on tt_client_project_binds(client_id)"); - setChange("create index project_idx on tt_client_project_binds(project_id)"); - setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'"); - setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'"); - setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'"); - setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'"); - setChange("DROP INDEX name_idx on tt_invoices"); - setChange("create unique index name_idx on tt_invoices(team_id, name, status)"); - setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL"); - setChange("ALTER TABLE tt_teams DROP locktime"); - setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))"); - setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE"); - setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`"); - setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas"); - setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL"); - setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`"); - setChange("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY (`id`))"); - setChange("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`"); - setChange("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`"); - setChange("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`"); - setChange("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'"); - setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`"); - setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`"); - setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`"); - setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`"); - } - // The update_clients function updates projects field in tt_clients table. if ($_POST["update_clients"]) { $mdb2 = getConnection(); @@ -709,6 +661,58 @@ if ($_POST) { print "Updated $affected teams...
\n"; } + if ($_POST["convert1600to11400"]) { + setChange("DROP TABLE IF EXISTS tt_invoice_headers"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `client_id` int(11) default NULL"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `cf_1_option_id` int(11) default NULL"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_client` tinyint(4) NOT NULL default '0'"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `show_invoice` tinyint(4) NOT NULL default '0'"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `group_by` varchar(20) default NULL"); + setChange("CREATE TABLE `tt_expense_items` (`id` bigint NOT NULL auto_increment, `date` date NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) default NULL, `project_id` int(11) default NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', `invoice_id` int(11) default NULL, PRIMARY KEY (`id`))"); + setChange("create index date_idx on tt_expense_items(date)"); + setChange("create index user_idx on tt_expense_items(user_id)"); + setChange("create index client_idx on tt_expense_items(client_id)"); + setChange("create index project_idx on tt_expense_items(project_id)"); + setChange("create index invoice_idx on tt_expense_items(invoice_id)"); + setChange("ALTER TABLE tt_fav_reports DROP sort_by"); + setChange("ALTER TABLE tt_fav_reports DROP show_empty_days"); + setChange("ALTER TABLE tt_invoices DROP discount"); + setChange("ALTER TABLE tt_users ADD COLUMN `client_id` int(11) default NULL"); + setChange("ALTER TABLE tt_teams ADD COLUMN `decimal_mark` char(1) NOT NULL default '.'"); + setChange("ALTER TABLE tt_fav_reports ADD COLUMN `invoice` tinyint(4) default NULL"); + setChange("CREATE TABLE `tt_cron` (`id` int(11) NOT NULL auto_increment, `cron_spec` varchar(255) NOT NULL, `last` int(11) default NULL, `next` int(11) default NULL, `report_id` int(11) default NULL, `email` varchar(100) default NULL, `status` tinyint(4) default '1', PRIMARY KEY (`id`))"); + setChange("ALTER TABLE tt_cron ADD COLUMN `team_id` int(11) NOT NULL"); + setChange("create index client_idx on tt_client_project_binds(client_id)"); + setChange("create index project_idx on tt_client_project_binds(project_id)"); + setChange("ALTER TABLE tt_log ADD COLUMN status tinyint(4) default '1'"); + setChange("ALTER TABLE tt_custom_field_log ADD COLUMN status tinyint(4) default '1'"); + setChange("ALTER TABLE tt_expense_items ADD COLUMN status tinyint(4) default '1'"); + setChange("ALTER TABLE tt_invoices ADD COLUMN status tinyint(4) default '1'"); + setChange("DROP INDEX name_idx on tt_invoices"); + setChange("create unique index name_idx on tt_invoices(team_id, name, status)"); + setChange("ALTER TABLE tt_teams ADD COLUMN lock_spec varchar(255) default NULL"); + setChange("ALTER TABLE tt_teams DROP locktime"); + setChange("CREATE TABLE `tt_monthly_quota` (`team_id` int(11) NOT NULL, `year` smallint(5) UNSIGNED NOT NULL, `month` tinyint(3) UNSIGNED NOT NULL, `quota` smallint(5) UNSIGNED NOT NULL, PRIMARY KEY (`year`,`month`,`team_id`))"); + setChange("ALTER TABLE `tt_monthly_quota` ADD CONSTRAINT `FK_TT_TEAM_CONSTRAING` FOREIGN KEY (`team_id`) REFERENCES `tt_teams` (`id`) ON DELETE CASCADE ON UPDATE CASCADE"); + setChange("ALTER TABLE `tt_teams` ADD `workday_hours` SMALLINT NULL DEFAULT '8' AFTER `lock_spec`"); + setChange("RENAME TABLE tt_monthly_quota TO tt_monthly_quotas"); + setChange("ALTER TABLE tt_expense_items modify `name` text NOT NULL"); + setChange("ALTER TABLE `tt_teams` ADD `uncompleted_indicators` SMALLINT(2) NOT NULL DEFAULT '0' AFTER `record_type`"); + setChange("CREATE TABLE `tt_predefined_expenses` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(255) NOT NULL, `cost` decimal(10,2) default '0.00', PRIMARY KEY (`id`))"); + setChange("ALTER TABLE `tt_teams` ADD `task_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`"); + setChange("ALTER TABLE `tt_teams` ADD `project_required` smallint(2) NOT NULL DEFAULT '0' AFTER `tracking_mode`"); + setChange("ALTER TABLE `tt_cron` ADD `report_condition` varchar(255) default NULL AFTER `email`"); + setChange("ALTER TABLE `tt_fav_reports` ADD `status` tinyint(4) default '1'"); + setChange("ALTER TABLE `tt_teams` ADD `bcc_email` varchar(100) default NULL AFTER `uncompleted_indicators`"); + setChange("ALTER TABLE `tt_cron` ADD `cc` varchar(100) default NULL AFTER `email`"); + setChange("ALTER TABLE `tt_cron` ADD `subject` varchar(100) default NULL AFTER `cc`"); + setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`"); + } + + if ($_POST["convert11400to11500"]) { + setChange("ALTER TABLE `tt_teams` DROP `address`"); + } + if ($_POST["cleanup"]) { $mdb2 = getConnection(); @@ -751,7 +755,7 @@ if ($_POST) {

DB Install

-
Create database structure (v1.14.0) + Create database structure (v1.15.0)
(applies only to new installations, do not execute when updating)
@@ -786,6 +790,10 @@ if ($_POST) { 		Update database structure (v1.6 to v1.14)
Update database structure (v1.14 to v1.15)

DB Maintenance

diff --git a/mysql.sql b/mysql.sql index 9a971bec..72701be8 100644 --- a/mysql.sql +++ b/mysql.sql @@ -16,7 +16,6 @@ CREATE TABLE `tt_teams` ( `id` int(11) NOT NULL auto_increment, # team id `timestamp` timestamp NOT NULL, # modification timestamp `name` varchar(80) default NULL, # team name - `address` varchar(255) default NULL, # team address, used in invoices `currency` varchar(7) default NULL, # team currency symbol `decimal_mark` char(1) NOT NULL default '.', # separator in decimals `lang` varchar(10) NOT NULL default 'en', # language