Introduced role_id for users, also tt_site_config table vor version.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 4a799d98311e8441fc0622459b2c615a3edae680..a5f4bd527115b462cc85350cbeb807991dc90097 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.17.33.4032 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.34.4033 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/dbinstall.php b/dbinstall.php
index 6dc831aeafdb39d85585ea3aa9250fadb893cc79..d84cf4f3fe750a3e45acb57f2931701666e6d7a3 100755 (executable)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -709,7 +709,7 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
   }
 
     setChange("ALTER TABLE `tt_log` ADD `paid` tinyint(4) NULL default '0' AFTER `billable`");
   }
 

-  if ($_POST["convert11400to11730"]) {
+  if ($_POST["convert11400to11734"]) {

     setChange("ALTER TABLE `tt_teams` DROP `address`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");
     setChange("ALTER TABLE `tt_teams` DROP `address`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `report_spec` text default NULL AFTER `user_id`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `paid_status` tinyint(4) default NULL AFTER `invoice`");


@@ -729,9 +729,12 @@ if ($_POST) {
     setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     setChange("ALTER TABLE `tt_teams` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     setChange("ALTER TABLE `tt_log` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");
     setChange("ALTER TABLE `tt_tmp_refs` MODIFY `timestamp` timestamp default CURRENT_TIMESTAMP");

-    setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY  (`id`))");
+    setChange("CREATE TABLE `tt_roles` (`id` int(11) NOT NULL auto_increment, `team_id` int(11) NOT NULL, `name` varchar(80) default NULL, `rank` int(11) default 0, `rights` text default NULL, `status` tinyint(4) default 1, PRIMARY KEY (`id`))");

     setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
     setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");
     setChange("create unique index role_idx on tt_roles(team_id, rank, status)");
     setChange("ALTER TABLE `tt_roles` ADD `description` varchar(255) default NULL AFTER `name`");

+    setChange("ALTER TABLE `tt_users` ADD `role_id` int(11) default NULL AFTER `role`");
+    setChange("CREATE TABLE `tt_site_config` (`param_name` varchar(32) NOT NULL, `param_value` text default NULL, `created` datetime default CURRENT_TIMESTAMP, `updated` datetime ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`param_name`))");
+    setChange("INSERT INTO `tt_site_config` (`param_name`, `param_value`) VALUES ('version_db', '1.17.34')");

   }
 
   if ($_POST["cleanup"]) {
   }
 
   if ($_POST["cleanup"]) {


@@ -777,7 +780,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>

-    <td width="80%"><b>Create database structure (v1.17.30)</b>
+    <td width="80%"><b>Create database structure (v1.17.34)</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>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>


@@ -813,8 +816,8 @@ if ($_POST) {
     <td><input type="submit" name="convert1600to11400" value="Update"><br></td>
   </tr>
   <tr valign="top">
     <td><input type="submit" name="convert1600to11400" value="Update"><br></td>
   </tr>
   <tr valign="top">

-    <td>Update database structure (v1.14 to v1.17.30)</td>
-    <td><input type="submit" name="convert11400to11730" value="Update"><br></td>
+    <td>Update database structure (v1.14 to v1.17.34)</td>
+    <td><input type="submit" name="convert11400to11734" value="Update"><br></td>

   </tr>
 </table>
 
   </tr>
 </table>
 

diff --git a/mysql.sql b/mysql.sql
index a69387b384c487758539321d6aed43c77a4b7262..c37a32c4773ea582dfa071e828a244f809cf3bf2 100644 (file)
--- a/mysql.sql
+++ b/mysql.sql
@@ -49,6 +49,7 @@ CREATE TABLE `tt_users` (
   `name` varchar(100) default NULL,                # user name
   `team_id` int(11) NOT NULL,                      # team id
   `role` int(11) default 4,                        # user role ("manager", "co-manager", "client", or "user")
   `name` varchar(100) default NULL,                # user name
   `team_id` int(11) NOT NULL,                      # team id
   `role` int(11) default 4,                        # user role ("manager", "co-manager", "client", or "user")

+  `role_id` int(11) default NULL,                  # future replacement of role

   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
   `email` varchar(100) default NULL,               # user email
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
   `email` varchar(100) default NULL,               # user email


@@ -407,3 +408,19 @@ CREATE TABLE `tt_roles` (
 
 # Create an index that guarantees unique active and inactive role ranks in each group.
 create unique index role_idx on tt_roles(team_id, rank, status);
 
 # Create an index that guarantees unique active and inactive role ranks in each group.
 create unique index role_idx on tt_roles(team_id, rank, status);

+
+
+#
+# Structure for table tt_site_config. This table stores configuration data
+# for Time Tracker site as a whole.
+# For example, database version, code version, site language, etc.
+#
+CREATE TABLE `tt_site_config` (
+  `param_name` varchar(32) NOT NULL,              # parameter name
+  `param_value` text default NULL,                # parameter value
+  `created` datetime default CURRENT_TIMESTAMP,   # creation time
+  `updated` datetime ON UPDATE CURRENT_TIMESTAMP, # modification time
+  PRIMARY KEY  (`param_name`)
+);
+
+INSERT INTO `tt_site_config` (`param_name`, `param_value`) VALUES ('version_db', '1.17.34'); # TODO: change when structure changes.