1
0
Fork 0
Commit graph

45 commits

Author SHA1 Message Date
Ethanell ad82361755 Fix GUI compilation 2021-01-19 17:53:47 +01:00
Ethanell c506e9860b Add movieMax constraint check on date selection 2021-01-18 11:35:15 +01:00
Tergel TSAGAAN 6f94624e89 Notice in which competition we are and eventually call an error dialog when there is an exception but it doesn't work for some case infortunaly so todo: handle more case of this 2021-01-15 18:10:14 +01:00
Ethanell 19344bd9d5 Fix duplicated slot and order them 2021-01-14 09:57:38 +01:00
Ethanell dd8a94a492 Refactor GUI, ProjectionHandler and ProjectionSelecter 2021-01-14 09:25:26 +01:00
Tergel TSAGAAN b3d18e78b2 merge 2021-01-14 09:02:16 +01:00
Tergel TSAGAAN c869010150 Merge branch 'master' of https://forge.univ-lyon1.fr/cannes-cpoa/projection-planning into master
 Conflicts:
	src/main/java/GUI/Agenda/Agenda.java
2021-01-14 08:31:03 +01:00
Tergel TSAGAAN a9e867237a dispose dialog when escape
handling multiple projection on same slot and room
2021-01-13 15:37:51 +01:00
Ethanell d11cdb2caf Implement MaterialUI theme 2021-01-12 20:48:37 +01:00
Ethanell 56b41d49a4 Add dynamic competitions on GUI 2021-01-12 19:43:01 +01:00
Tergel TSAGAAN 34b1b1d55a Merge branch 'master' of https://forge.univ-lyon1.fr/cannes-cpoa/projection-planning into master
 Conflicts:
	src/main/java/GUI/ProjectionHandler.java
2021-01-12 17:42:17 +01:00
Ethanell 23cd5d4b3d Fix Tergel mess v2 2021-01-12 17:40:07 +01:00
Tergel TSAGAAN fe2d3e150f Merge branch 'master' of https://forge.univ-lyon1.fr/cannes-cpoa/projection-planning into master 2021-01-12 15:36:58 +01:00
Ethanell 26c1fe4a57 Fix Tergel mess v2 2021-01-12 15:31:30 +01:00
Tergel TSAGAAN d5a71e5a50 Merge branch 'master' of https://forge.univ-lyon1.fr/cannes-cpoa/projection-planning into master
 Conflicts:
	src/main/java/GUI/Agenda/Agenda.java
	src/main/java/GUI/Agenda/TableModel.java
	src/main/java/GUI/ProjectionHandler.java
2021-01-12 15:25:55 +01:00
Ethanell 61a0b623c9 Use config for dates 2021-01-12 15:24:49 +01:00
Ethanell b2fb461fd4 Update configuration system 2021-01-12 15:01:02 +01:00
Tergel TSAGAAN c58cfaf148 automatic day/slot selection when adding 2021-01-12 14:45:38 +01:00
Ethanell 71412f825d Fix Tergel mess 2021-01-11 18:04:46 +01:00
Tergel TSAGAAN 45c7e62bd8 Update row header text to slot times
Fix movie that appear in wrong slot
2021-01-11 17:56:40 +01:00
Tergel TSAGAAN c6a7f697b9 Remove edit from GUI menu bar and add exception to ProjectionHandler 2021-01-11 16:57:36 +01:00
Tergel TSAGAAN ebfc03efdf edit projection 2021-01-11 16:13:11 +01:00
Tergel TSAGAAN 28d2b300f1 fix popup doesn't appear when left click
added cell selection when displaying popup
2021-01-07 14:38:53 +01:00
Ethanell 336288b71a Add remove support and contextual right click menu 2021-01-07 12:13:36 +01:00
Tergel TSAGAAN ca7d3f1136 add projection, update agenda 2021-01-05 17:52:38 +01:00
Ethanell 7c2140e9f7 Merge branch 'DB' into 'master'
Setup add projection

See merge request cannes-cpoa/projection-planning!2
2021-01-05 16:12:33 +01:00
Ethanell 3e70d12bac Setup add projection 2021-01-05 15:58:57 +01:00
Ethanell d215ea980b Merge branch 'GUI' into 'master'
Gui

See merge request cannes-cpoa/projection-planning!1
2021-01-05 14:11:03 +01:00
Tergel TSAGAAN 78071e9935 removed sout 2021-01-04 21:58:22 +01:00
Tergel TSAGAAN a9cd8e715d Added add/edit/remove projection dialog, agenda adaptation 2021-01-04 21:50:04 +01:00
Ethanell 9d7216673f Add getAvailable on Movie, Projection, Room and Slot 2021-01-04 17:54:51 +01:00
Tergel TSAGAAN 33e181a667 Main gui prototype 2021-01-03 17:32:05 +01:00
Tergel TSAGAAN d9fbf7cdd9 backup 2020-12-24 21:02:10 +01:00
Ethanell 480d8bd62c Add M2M relations add and remove functions 2020-12-18 14:02:37 +01:00
Ethanell eb5e01e21b Add creation constructor on DB class 2020-12-18 13:35:01 +01:00
Tergel TSAGAAN 86ef72e388 test 2020-12-18 11:51:44 +01:00
Ethanell ffa8c80e22 Add DB create function 2020-12-18 11:43:26 +01:00
Ethanell c17d02d1f8 Add DB config file support 2020-12-18 11:42:54 +01:00
Ethanell 543376af52 Add exception when new object is not present in the DB 2020-12-17 12:26:33 +01:00
Ethanell 694a596126 Remove update and save function and set delete on Table 2020-12-17 12:26:33 +01:00
Ethanell 2bd9311e29 Add getter and setter connected to DB 2020-12-17 12:26:33 +01:00
Ethanell 951b7ed30a Init DB package 2020-12-17 12:25:37 +01:00
Ethanell 307c0b59eb Init DB table class 2020-12-14 12:05:24 +01:00
Ethanell 3a7875742d Init GUI 2020-12-14 11:16:22 +01:00
Ethanell d710eb8446 Init commit 2020-12-14 10:50:34 +01:00