Skip to content

Commit f9be822

Browse files
authored
Merge pull request #494 from dbarzin/dev
Dev
2 parents 6768d2f + df82a6e commit f9be822

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

database/schema/mysql-schema.sql

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ CREATE TABLE `actions` (
3636
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
3737
`reference` varchar(32) DEFAULT NULL,
3838
`type` int(11) NOT NULL,
39+
`progress` int(11) DEFAULT NULL,
3940
`criticity` int(11) NOT NULL,
4041
`status` int(11) NOT NULL,
4142
`scope` varchar(32) DEFAULT NULL,
@@ -135,7 +136,7 @@ CREATE TABLE `controls` (
135136
`realisation_date` date DEFAULT NULL,
136137
`observations` longtext DEFAULT NULL,
137138
`score` int(11) DEFAULT NULL,
138-
`note` int(11) DEFAULT NULL,
139+
`note` decimal(5,2) DEFAULT NULL,
139140
`created_at` timestamp NULL DEFAULT NULL,
140141
`updated_at` timestamp NULL DEFAULT NULL,
141142
`next_id` int(10) unsigned DEFAULT NULL,
@@ -396,7 +397,8 @@ INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (54,'2016_06_01_000
396397
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (55,'2016_06_01_000004_create_oauth_clients_table',2);
397398
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (56,'2016_06_01_000005_create_oauth_personal_access_clients_table',2);
398399
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (61,'2024_11_06_123808_add_actions',3);
399-
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (62,'2025_02_04_064646_create_audit_logs_table',4);
400-
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (63,'2025_02_05_121035_cleanup',4);
401-
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (64,'2025_04_29_123908_add_user_group',4);
402-
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (65,'2025_05_27_152856_change_actions',4);
400+
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (70,'2025_02_04_064646_create_audit_logs_table',4);
401+
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (71,'2025_02_05_121035_cleanup',4);
402+
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (72,'2025_04_29_123908_add_user_group',4);
403+
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (76,'2025_05_27_152856_change_actions',5);
404+
INSERT INTO `migrations` (`id`, `migration`, `batch`) VALUES (77,'2025_07_31_090259_alter_note_on_controls_table',5);
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resources/css/app.css": {
3-
"file": "assets/app-DA_77Gar.css",
3+
"file": "assets/app-BsomWjRp.css",
44
"src": "resources/css/app.css",
55
"isEntry": true
66
},

resources/css/calendar.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@
8484
border-left: 1px solid #e6e9ea;
8585
}
8686
.MyCalendar .days .day_num:hover {
87-
background-color: #fdfdfd;
87+
/* background-color: #dddddd;*/
8888
}
8989
.MyCalendar .days .day_num.ignore {
90-
background-color: #fdfdfd;
9190
color: #ced2d4;
9291
cursor: inherit;
9392
}

0 commit comments

Comments
 (0)