Alexis Leboeuf
|
ad91270c9e
|
Merge
|
2025-12-11 23:42:08 +01:00 |
|
Alexis Leboeuf
|
ee3f5012f7
|
Almost finished Roles bugfix
|
2025-12-11 23:41:23 +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 |
|
tuanvu
|
ced2d15e05
|
test changeChantierStatus
|
2025-12-11 11:07:15 +01:00 |
|
Rochas
|
984ef3ab3d
|
fermeture auto + composant selectChantier
|
2025-12-09 23:06:24 +01:00 |
|
trochas
|
e0bdcd5150
|
home en cours
|
2025-12-09 16:34:37 +01:00 |
|
trochas
|
73e8600db9
|
Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet
|
2025-12-09 16:34:20 +01:00 |
|
Amaël Kesteman
|
a9442041e5
|
Feat: ajout d'icone pour la gestion de ressources
|
2025-12-09 16:24:05 +01:00 |
|
trochas
|
4ad0f2ba5f
|
Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet
|
2025-12-09 16:20:10 +01:00 |
|
Alexis Leboeuf
|
4b170cf88e
|
Merge again
|
2025-12-09 16:07:31 +01:00 |
|
Alexis Leboeuf
|
834fe3e8b5
|
Added longitude and latitude fields in Chantier
|
2025-12-09 16:07:23 +01:00 |
|
Amaël Kesteman
|
ad2ed323b8
|
Feat: filtre dans la partie ressource
|
2025-12-09 15:58:26 +01:00 |
|
Alexis Leboeuf
|
fae25add74
|
M E R G E
Some minor conflicts
|
2025-12-09 15:52:34 +01:00 |
|
Alexis Leboeuf
|
2963c722b8
|
Auto recup des chantiers dans Firebase et affichage
|
2025-12-09 15:52:18 +01:00 |
|
trochas
|
65ac5e9804
|
Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/trochas/mmm-projet
|
2025-12-09 15:43:21 +01:00 |
|
trochas
|
d1cd117013
|
fermeture auto
|
2025-12-09 15:43:16 +01:00 |
|
tuanvu
|
162fcdee4c
|
1 time login only
|
2025-12-09 15:41:47 +01:00 |
|
tuanvu
|
5550f0b9dd
|
test chantier.user.getDoc
|
2025-12-09 15:21:08 +01:00 |
|