X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mysql.sql;h=79e2b3ff342b80a9d69fb958824cb894a1edb999;hb=207eb3b5bf14dcfeefead3a894c4056d06a102ea;hp=37ad65e760237da0276e6033540b748875c75c9b;hpb=83987222fbafb8d6dbbbd9578ed2f949f65004d3;p=timetracker.git

diff --git a/mysql.sql b/mysql.sql
index 37ad65e7..79e2b3ff 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -53,6 +53,7 @@ CREATE TABLE `tt_groups` (
 CREATE TABLE `tt_roles` (
   `id` int(11) NOT NULL auto_increment,    # Role id. Identifies roles for all groups on the server.
   `group_id` int(11) NOT NULL,             # Group id the role is defined for.
+  `org_id` int(11) default NULL,           # Organization id.
   `name` varchar(80) default NULL,         # Role name - custom role name. In case we are editing a
                                            # predefined role (USER, etc.), we can rename the role here.
   `description` varchar(255) default NULL, # Role description.
@@ -85,6 +86,7 @@ CREATE TABLE `tt_users` (
   `password` varchar(50) default NULL,             # password hash
   `name` varchar(100) default NULL,                # user name
   `group_id` int(11) NOT NULL,                     # group id
+  `org_id` int(11) default NULL,                   # organization id
   `role_id` int(11) default NULL,                  # role id
   `client_id` int(11) default NULL,                # client id for "client" user role
   `rate` float(6,2) NOT NULL default '0.00',       # default hourly rate
@@ -104,7 +106,7 @@ CREATE TABLE `tt_users` (
 # Create an index that guarantees unique active and inactive logins.
 create unique index login_idx on tt_users(login, status);
 
-# Create admin account with password 'secret'. Admin is a superuser, who can create groupd.
+# Create admin account with password 'secret'. Admin is a superuser who can create groups.
 DELETE from `tt_users` WHERE login = 'admin';
 INSERT INTO `tt_users` (`login`, `password`, `name`, `group_id`, `role_id`) VALUES ('admin', md5('secret'), 'Admin', '0', (select id from tt_roles where rank = 1024));
 
@@ -178,6 +180,7 @@ create index task_idx on tt_project_task_binds(task_id);
 CREATE TABLE `tt_log` (
   `id` bigint NOT NULL auto_increment,             # time record id
   `user_id` int(11) NOT NULL,                      # user id
+  `group_id` int(11) default NULL,                 # group id
   `date` date NOT NULL,                            # date the record is for
   `start` time default NULL,                       # record start time (for example, 09:00)
   `duration` time default NULL,                    # record duration (for example, 1 hour)
@@ -201,6 +204,7 @@ CREATE TABLE `tt_log` (
 # Create indexes on tt_log for performance.
 create index date_idx on tt_log(date);
 create index user_idx on tt_log(user_id);
+create index group_idx on tt_log(group_id);
 create index client_idx on tt_log(client_id);
 create index invoice_idx on tt_log(invoice_id);
 create index project_idx on tt_log(project_id);
@@ -265,8 +269,11 @@ CREATE TABLE `tt_fav_reports` (
   `show_end` tinyint(4) NOT NULL default 0,              # whether to show end field
   `show_note` tinyint(4) NOT NULL default 0,             # whether to show note column
   `show_custom_field_1` tinyint(4) NOT NULL default 0,   # whether to show custom field 1
+  `show_work_units` tinyint(4) NOT NULL default 0,       # whether to show work units
   `show_totals_only` tinyint(4) NOT NULL default 0,      # whether to show totals only
-  `group_by` varchar(20) default NULL,                   # group by field
+  `group_by1` varchar(20) default NULL,                  # group by field 1
+  `group_by2` varchar(20) default NULL,                  # group by field 2
+  `group_by3` varchar(20) default NULL,                  # group by field 3
   `status` tinyint(4) default 1,                         # favorite report status
   PRIMARY KEY (`id`)
 );
@@ -377,6 +384,8 @@ CREATE TABLE `tt_custom_field_log` (
   PRIMARY KEY  (`id`)
 );
 
+create index log_idx on tt_custom_field_log(log_id);
+
 
 #
 # Structure for table tt_expense_items.
@@ -386,6 +395,7 @@ CREATE TABLE `tt_expense_items` (
   `id` bigint NOT NULL auto_increment,    # expense item id
   `date` date NOT NULL,                   # date the record is for
   `user_id` int(11) NOT NULL,             # user id the expense item is reported by
+  `group_id` int(11) default NULL,        # group id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
@@ -405,6 +415,7 @@ CREATE TABLE `tt_expense_items` (
 # Create indexes on tt_expense_items for performance.
 create index date_idx on tt_expense_items(date);
 create index user_idx on tt_expense_items(user_id);
+create index group_idx on tt_expense_items(group_id);
 create index client_idx on tt_expense_items(client_id);
 create index project_idx on tt_expense_items(project_id);
 create index invoice_idx on tt_expense_items(invoice_id);
@@ -449,4 +460,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.17.88', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.08', now()); # TODO: change when structure changes.