X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/086b93bd5a71b4c68ae3fa3e37d97182ee2a5b73..fa647157935f37f999ae81377b19f5ea72e7bbbb:/dbinstall.php

diff --git a/dbinstall.php b/dbinstall.php
index 09d55292..c6a72415 100644
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -972,7 +972,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11846"]) {
+  if ($_POST["convert11797to11847"]) {
     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`");
@@ -1102,6 +1102,13 @@ if ($_POST) {
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.45', modified = now() where param_name = 'version_db' and param_value = '1.18.44'");
     ttExecute("update `tt_roles` inner join `tt_site_config` sc on (sc.param_name = 'version_db' and sc.param_value = '1.18.45') set rights = replace(rights, 'view_client_timesheets,', '')");
     ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.46', modified = now() where param_name = 'version_db' and param_value = '1.18.45'");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `comment` text AFTER `name`");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `start_date` date NOT NULL AFTER `comment`");
+    ttExecute("ALTER TABLE `tt_timesheets` ADD `end_date` date NOT NULL AFTER `start_date`");
+    ttExecute("ALTER TABLE `tt_timesheets` DROP `submitter_comment`");
+    ttExecute("ALTER TABLE `tt_timesheets` CHANGE `approval_status` `approve_status` tinyint(4) default NULL");
+    ttExecute("ALTER TABLE `tt_timesheets` CHANGE `manager_comment` `approve_comment` text");
+    ttExecute("UPDATE `tt_site_config` SET param_value = '1.18.47', modified = now() where param_name = 'version_db' and param_value = '1.18.46'");
 }
 
   if ($_POST["cleanup"]) {
@@ -1150,7 +1157,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.46)</b>
+    <td width="80%"><b>Create database structure (v1.18.47)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1195,8 +1202,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.46)</td>
-    <td><input type="submit" name="convert11797to11846" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.47)</td>
+    <td><input type="submit" name="convert11797to11847" value="Update"></td>
   </tr>
 </table>