From: anuko Date: Sun, 9 Jul 2017 21:57:02 +0000 (+0000) Subject: Work in progress on mking project selection for some teams optional and this mode... X-Git-Tag: timetracker_1.19-1~1511 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/9fe9642cc985b52302d93bde5a65aacb5158890f?ds=sidebyside Work in progress on mking project selection for some teams optional and this mode configurable. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index e053ebce..aaf7f18e 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.11.44.3637 | Copyright © Anuko | +  Anuko Time Tracker 1.11.44.3638 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index b5bff5e8..aea76e80 100755 --- a/dbinstall.php +++ b/dbinstall.php @@ -637,6 +637,7 @@ if ($_POST) { 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`"); } // The update_clients function updates projects field in tt_clients table. diff --git a/mysql.sql b/mysql.sql index 54bd90d3..a9a88f64 100644 --- a/mysql.sql +++ b/mysql.sql @@ -24,6 +24,7 @@ CREATE TABLE `tt_teams` ( `time_format` varchar(20) NOT NULL default '%H:%M', # time format `week_start` smallint(2) NOT NULL DEFAULT '0', # Week start day, 0 == Sunday. `tracking_mode` smallint(2) NOT NULL DEFAULT '1', # tracking mode ("time", "projects" or "projects and tasks") + `project_required` smallint(2) NOT NULL DEFAULT '0', # whether a project selection is required or optional `task_required` smallint(2) NOT NULL DEFAULT '0', # whether a task selection is required or optional `record_type` smallint(2) NOT NULL DEFAULT '0', # time record type ("start and finish", "duration", or both) `uncompleted_indicators` smallint(2) NOT NULL DEFAULT '0', # whether to show indicators for users with uncompleted time entries