diff options
author | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
---|---|---|
committer | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
commit | 7af09433def2fda9ec47b12823b16e3392b5f6cf (patch) | |
tree | 5ee8e0fdf80cd92609263d28e9ae6e6bc3efeea7 /db/update.sql | |
parent | 7f722314e4fc21419552ec27eb91e6f7e6347b71 (diff) | |
parent | ddadaada9dc1bd288c82da840a4c4f02767d3e43 (diff) |
Merge branch 'master' of https://github.com/engelsystem/engelsystem
Diffstat (limited to 'db/update.sql')
-rw-r--r-- | db/update.sql | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/db/update.sql b/db/update.sql index 212cd97e..56663071 100644 --- a/db/update.sql +++ b/db/update.sql @@ -49,3 +49,11 @@ ALTER TABLE `Room` ADD `description` TEXT NULL AFTER `map_url`; -- Dashboard ALTER TABLE `AngelTypes` ADD `show_on_dashboard` BOOLEAN NOT NULL AFTER `contact_email`; UPDATE `AngelTypes` SET `show_on_dashboard` = TRUE; + +-- Work Log +CREATE TABLE `UserWorkLog` ( `id` INT NOT NULL AUTO_INCREMENT , `user_id` INT NOT NULL , `work_hours` DECIMAL NOT NULL , `comment` VARCHAR(200) NOT NULL , `created_user_id` INT NOT NULL , `created_timestamp` INT NOT NULL , PRIMARY KEY (`id`), INDEX (`user_id`), INDEX (`created_user_id`)) ENGINE = InnoDB; +ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`created_user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `UserWorkLog` ADD FOREIGN KEY (`user_id`) REFERENCES `User`(`UID`) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE `UserWorkLog` ADD INDEX(`created_timestamp`); +INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (NULL, 'admin_user_worklog', 'Manage user work log entries.'); +ALTER TABLE `UserWorkLog` CHANGE `work_hours` `work_hours` DECIMAL(10,2) NOT NULL; +ALTER TABLE `UserWorkLog` ADD `work_timestamp` INT NOT NULL AFTER `user_id`; |