Commit Graph

95 Commits

Author SHA1 Message Date
Rochas
82c00cabd4 merge 2025-12-13 17:03:48 +01:00
Rochas
1f055240bb selectRessource au lieu de selectMachine et selectOuvrier 2025-12-13 16:56:33 +01:00
tuanvu
d748c90391 merge erreur 2025-12-13 16:54:40 +01:00
tuanvu
6e4242736f addchantier work 2025-12-13 16:40:43 +01:00
Alexis Leboeuf
038006818d Added image selection on new Anomaly
Caution ! New import, run npm build to download it
Only accesses the Gallery, does not really save the image
2025-12-13 16:34:07 +01:00
Rochas
f213e2dacf Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-13 15:35:25 +01:00
Rochas
e8e30d541d addChantier / selectMachine / machineSummary : presque fini 2025-12-13 15:35:01 +01:00
tuanvu
406c578cba filter for machine 2025-12-13 15:33:46 +01:00
tuanvu
1407d3b20f filter chefs 2025-12-13 15:32:01 +01:00
Amaël Kesteman
602b571d5c Feat: ajout de la page d'ajout d'un nouvel artisant 2025-12-13 15:30:08 +01:00
Amaël Kesteman
ff010fec4e Feat: ajout de la page d'ajout des ressources. 2025-12-13 15:07:21 +01:00
Rochas
d4b056b197 engin rennomé en machine 2025-12-13 12:37:31 +01:00
Rochas
dc02896fdd selectEngins 2025-12-13 12:31:32 +01:00
tuanvu
91fe9f849b borrow and return Ressource -- need to test 2025-12-13 12:02:20 +01:00
tuanvu
730a9882c7 fini fontionnalité de anomalie, ptet changer styles 2025-12-13 11:26:22 +01:00
Rochas
68af57a394 selection d'un chef de chatier dans addChantier 2025-12-13 00:20:06 +01:00
Rochas
e95bb3fd70 addChanter, selectChefChantier, en cour + Update de themed-button pour prendre en charge le changement de theme pendant la pression 2025-12-12 21:57:09 +01:00
Rochas
8ba664c2ad addChantier 2025-12-11 23:22:45 +01:00
Rochas
46c6707d14 correction home 2025-12-11 22:36:56 +01:00
Alexis Leboeuf
b874fdfabf Merging 2025-12-11 22:07:29 +01:00
Alexis Leboeuf
ff6aafb24c Fixed double Chantier display
+ temporarily removed role condition to change chantier status
2025-12-11 22:07:18 +01:00
Rochas
d87d92adfe correction merge selectChantier 2025-12-11 22:05:21 +01:00
Rochas
78152b84ae correction merge selectChantier 2025-12-11 21:56:35 +01:00
Alexis Leboeuf
4eef83e83c Merging branch 'userrole' to implement role management 2025-12-11 21:51:06 +01:00
Alexis Leboeuf
373bd86df4 Role management done for Home screen 2025-12-11 21:47:35 +01:00
Rochas
ef916b2f9b correction addChantier 2025-12-11 21:38:20 +01:00
Rochas
b0c6829585 clean des composants, dossiers 2025-12-11 21:25:58 +01:00
Alexis Leboeuf
e43811d6f8 Pushing the first elements to work on another machine 2025-12-11 21:25:14 +01:00
Rochas
7092d09ba8 clean des composants, dossiers 2025-12-11 21:24:28 +01:00
tuanvu
7c71fece6d Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-11 21:19:17 +01:00
tuanvu
bc566c4f7f change and delete anomaly 2025-12-11 21:19:11 +01:00
Amaël Kesteman
02547dca84 Feat: fix add chantier (continuer la page) 2025-12-11 21:16:49 +01:00
Amaël Kesteman
6446c3f975 Feat: Ajout de la page pour nouveau chantier ( A CORRIGER) 2025-12-11 21:07:59 +01:00
tuanvu
72dafa13c9 add anomaly 2025-12-11 20:42:16 +01:00
Rochas
7c06871e45 clean gestionnaire_ressource et ouvrier, ajout de select Chantier + templateScreen 2025-12-11 19:57:15 +01:00
trochas
2be434e2cf bonjour -> ouvriers 2025-12-11 16:32:53 +01:00
Alexis Leboeuf
d29e2f34e2 Added fields to Marker info display 2025-12-11 15:56:30 +01:00
trochas
89c50827f8 verification du statues 2025-12-11 13:10:22 +01:00
trochas
c1e6453692 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-11 13:04:56 +01:00
tuanvu
8d45e56f9f reupdate auth 2025-12-11 13:04:50 +01:00
trochas
ca283d5b74 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-11 13:02:50 +01:00
trochas
dae973b3fc test 2025-12-11 13:02:45 +01:00
tuanvu
77f07b3626 remove auth, re-add later 2025-12-11 13:01:28 +01:00
trochas
bce1ea92a2 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-11 12:15:30 +01:00
trochas
50603a0fa6 overlay confirm 2025-12-11 12:15:23 +01:00
tuanvu
e5f4e9405a Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet 2025-12-11 12:13:52 +01:00
tuanvu
9a928a73e8 change in bdd work but need to change in list too 2025-12-11 12:12:13 +01:00
Amaël Kesteman
d62a11ed77 Fit: ajout des context user et ressources pour l'ajout de chantier 2025-12-11 11:47:38 +01:00
trochas
e24ee56c27 overlay confirm en cours 2025-12-11 11:32:57 +01:00
trochas
1b0556ab39 overlay confirm en cours 2025-12-11 11:25:11 +01:00