X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mysql.sql;h=0cd7326292297c36c4e074db5316a6df0ca909c7;hb=4ebe6fd29283633e5ae7cdb399cc144c38af25fb;hp=d6cb375ff050bf4afa766c7a504b93b760cebc46;hpb=14a6ab5e563acb66d090c6c291b5d51b1a31fae7;p=timetracker.git

diff --git a/mysql.sql b/mysql.sql
index d6cb375f..0cd73262 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -16,6 +16,7 @@ CREATE TABLE `tt_groups` (
   `id` int(11) NOT NULL auto_increment,                  # group id
   `parent_id` int(11) default NULL,                      # parent group id
   `org_id` int(11) default NULL,                         # organization id (id of top group)
+  `group_key` varchar(32) default NULL,                  # group key
   `name` varchar(80) default NULL,                       # group name
   `description` varchar(255) default NULL,               # group description
   `currency` varchar(7) default NULL,                    # currency symbol
@@ -75,7 +76,7 @@ create unique index role_idx on tt_roles(group_id, rank, status);
 
 # Insert site-wide roles - site administrator and top manager.
 INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Site administrator', 1024, 'administer_site');
-INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_timesheets,manage_own_timesheets,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,view_timesheets,manage_timesheets,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,view_all_timesheets,manage_all_timesheets,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_all_timesheets,manage_subgroups,view_client_unapproved,delete_group');
+INSERT INTO `tt_roles` (`group_id`, `name`, `rank`, `rights`) VALUES (0, 'Top manager', 512, 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,view_own_projects,view_own_tasks,manage_own_settings,view_users,view_client_reports,view_client_invoices,track_time,track_expenses,view_reports,approve_reports,approve_timesheets,view_charts,view_own_clients,override_punch_mode,override_own_punch_mode,override_date_lock,override_own_date_lock,swap_roles,update_work,manage_own_account,manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices,override_allow_ip,manage_basic_settings,view_all_reports,manage_work,bid_on_work,manage_features,manage_advanced_settings,manage_roles,export_data,approve_all_reports,approve_own_timesheets,manage_subgroups,view_client_unapproved,delete_group');
 
 
 #
@@ -432,7 +433,6 @@ CREATE TABLE `tt_expense_items` (
   `org_id` int(11) default NULL,          # organization id
   `client_id` int(11) default NULL,       # client id
   `project_id` int(11) default NULL,      # project id
-  `timesheet_id` int(11) default NULL,    # timesheet id
   `name` text NOT NULL,                   # expense item name (what is an expense for)
   `cost` decimal(10,2) default '0.00',    # item cost (including taxes, etc.)
   `invoice_id` int(11) default NULL,      # invoice id
@@ -454,7 +454,6 @@ 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 timesheet_idx on tt_expense_items(timesheet_id);
 create index invoice_idx on tt_expense_items(invoice_id);
 
 
@@ -495,11 +494,14 @@ CREATE TABLE `tt_timesheets` (
   `group_id` int(11) default NULL,                 # group id
   `org_id` int(11) default NULL,                   # organization id
   `client_id` int(11) default NULL,                # client id
+  `project_id` int(11) default NULL,               # project id
   `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # timesheet name
+  `comment` text,                                  # timesheet comment
+  `start_date` date NOT NULL,                      # timesheet start date
+  `end_date` date NOT NULL,                        # timesheet end date
   `submit_status` tinyint(4) default NULL,         # submit status
-  `submitter_comment` text,                        # submitter comment
-  `approval_status` tinyint(4) default NULL,       # approval status
-  `manager_comment` text,                          # manager comment
+  `approve_status` tinyint(4) default NULL,        # approve status
+  `approve_comment` text,                          # approve comment
   `created` datetime default NULL,                 # creation timestamp
   `created_ip` varchar(45) default NULL,           # creator ip
   `created_by` int(11) default NULL,               # creator user_id
@@ -511,6 +513,53 @@ CREATE TABLE `tt_timesheets` (
 );
 
 
+#
+# Structure for table tt_templates.
+# This table keeps templates used in groups.
+#
+CREATE TABLE `tt_templates` (
+  `id` int(11) NOT NULL auto_increment,   # template id
+  `group_id` int(11) default NULL,        # group id
+  `org_id` int(11) default NULL,          # organization id
+  `name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # template name
+  `description` varchar(255) default NULL,         # template description
+  `content` text,                         # template content
+  `created` datetime default NULL,        # creation timestamp
+  `created_ip` varchar(45) default NULL,  # creator ip
+  `created_by` int(11) default NULL,      # creator user_id
+  `modified` datetime default NULL,       # modification timestamp
+  `modified_ip` varchar(45) default NULL, # modifier ip
+  `modified_by` int(11) default NULL,     # modifier user_id
+  `status` tinyint(4) default 1,          # template status
+  PRIMARY KEY  (`id`)
+);
+
+
+#
+# Structure for table tt_files.
+# This table keeps file attachment information.
+#
+CREATE TABLE `tt_files` (
+  `id` int(10) unsigned NOT NULL auto_increment, # file id
+  `group_id` int(10) unsigned,                   # group id
+  `org_id` int(10) unsigned,                     # organization id
+  `remote_id` bigint(20) unsigned,               # file id in storage facility
+  `file_key` varchar(32),                        # file key
+  `entity_type` varchar(32),                     # type of entity file is associated with (project, task, etc.)
+  `entity_id` int(10) unsigned,                  # entity id
+  `file_name` varchar(80) COLLATE utf8mb4_bin NOT NULL, # file name
+  `description` varchar(255) default NULL,       # file description
+  `created` datetime default NULL,               # creation timestamp
+  `created_ip` varchar(45) default NULL,         # creator ip
+  `created_by` int(10) unsigned,                 # creator user_id
+  `modified` datetime default NULL,              # modification timestamp
+  `modified_ip` varchar(45) default NULL,        # modifier ip
+  `modified_by` int(10) unsigned,                # modifier user_id
+  `status` tinyint(1) default 1,                 # file status
+  PRIMARY KEY  (`id`)
+);
+
+
 #
 # Structure for table tt_site_config. This table stores configuration data
 # for Time Tracker site as a whole.
@@ -524,4 +573,4 @@ CREATE TABLE `tt_site_config` (
   PRIMARY KEY  (`param_name`)
 );
 
-INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.18.46', now()); # TODO: change when structure changes.
+INSERT INTO `tt_site_config` (`param_name`, `param_value`, `created`) VALUES ('version_db', '1.19.0', now()); # TODO: change when structure changes.