diff --git a/loko/common/help_docs/fr/statuts_intervention.md b/loko/common/help_docs/fr/statuts_intervention.md index e21e922..815a62a 100644 --- a/loko/common/help_docs/fr/statuts_intervention.md +++ b/loko/common/help_docs/fr/statuts_intervention.md @@ -56,9 +56,9 @@ Voici l'explication détaillée de chaque étape :
-
7
+
7
- En pause : Le chantier est temporairement arrêté (en attente de pièces détachées, conditions météo défavorables, etc.). + En pause : Le chantier est temporairement arrêté (en attente de pièces détachées, conditions météo défavorables, etc.).
diff --git a/loko/common/help_docs/nl/statuts_intervention.md b/loko/common/help_docs/nl/statuts_intervention.md index 8bc1deb..754dee4 100644 --- a/loko/common/help_docs/nl/statuts_intervention.md +++ b/loko/common/help_docs/nl/statuts_intervention.md @@ -56,9 +56,9 @@ Hier is de gedetailleerde uitleg van elke stap:
-
7
+
7
- In pauze : De werf is tijdelijk stilgelegd (in afwachting van onderdelen, slechte weersomstandigheden, enz.). + In pauze : De werf is tijdelijk stilgelegd (in afwachting van onderdelen, slechte weersomstandigheden, enz.).
diff --git a/loko/common/static/common/base_style.css b/loko/common/static/common/base_style.css index e3cc4d4..60b0fda 100644 --- a/loko/common/static/common/base_style.css +++ b/loko/common/static/common/base_style.css @@ -323,8 +323,8 @@ label, } .badge.status-on_pause { - background-color: #90a4ae !important; - color: #000000 !important; + background-color: #6b226e !important; + color: #ffffff !important; } .badge.status-finished { @@ -441,15 +441,15 @@ label, } .filter-option label.status-on_pause { - border-color: #90a4ae !important; - color: #90a4ae !important; + border-color: #6b226e !important; + color: #6b226e !important; background-color: transparent !important; } .filter-option input[type="checkbox"]:hover+label.status-on_pause, .filter-option input[type="checkbox"]:checked+label.status-on_pause { - background-color: #90a4ae !important; - border-color: #90a4ae !important; - color: #000000 !important; + background-color: #6b226e !important; + border-color: #6b226e !important; + color: #ffffff !important; } .filter-option label.status-finished { @@ -555,7 +555,7 @@ label, .text-status-to_be_processed { color: #f4511e !important; } .text-status-assigned { color: #63b3ed !important; } .text-status-in_progress { color: #3182ce !important; } -.text-status-on_pause { color: #90a4ae !important; } +.text-status-on_pause { color: #6b226e !important; } .text-status-finished { color: #26a69a !important; } .text-status-processed { color: #9ae9e2 !important; } .text-status-to_be_corrected { color: #9e87f6 !important; } diff --git a/loko/home/templates/home/widgets/intervention_on_pause.html b/loko/home/templates/home/widgets/intervention_on_pause.html index ade2b66..e4bf8fe 100644 --- a/loko/home/templates/home/widgets/intervention_on_pause.html +++ b/loko/home/templates/home/widgets/intervention_on_pause.html @@ -1,10 +1,10 @@ {% load i18n %} {# ========== Widget compteur d'interventions en pause ========== #} -
-
+
+ @@ -13,7 +13,7 @@
- {{ intervention_on_pause_count }} + {{ intervention_on_pause_count }} {% if is_manager_filter_applied %} {% translate "(gestionnaire)" %} {% endif %} @@ -26,7 +26,7 @@
  • - {{ itv.code }} + {{ itv.code }} {{ itv.creation_time|date:"d/m H:i" }}
    diff --git a/loko/interventions/models.py b/loko/interventions/models.py index ef46c08..8e0d115 100644 --- a/loko/interventions/models.py +++ b/loko/interventions/models.py @@ -64,7 +64,7 @@ STATUS_COLORS = { 'to_be_processed': '#f4511e', 'assigned': '#63b3ed', 'in_progress': '#3182ce', - 'on_pause': '#90a4ae', + 'on_pause': '#6b226e', 'finished': '#26a69a', 'processed': '#9ae9e2', 'to_be_corrected': '#9e87f6', @@ -76,7 +76,7 @@ STATUS_COLORS = { } # Statuts dont le texte doit être sombre (fond clair). -STATUS_COLORS_DARK_TEXT = {'to_be_approved', 'to_be_planned', 'assigned', 'on_pause', 'processed', 'to_be_corrected', 'corrected', 'canceled'} +STATUS_COLORS_DARK_TEXT = {'to_be_approved', 'to_be_planned', 'assigned', 'processed', 'to_be_corrected', 'corrected', 'canceled'} PRIORITY_CHOICES = { diff --git a/loko/interventions/static/interventions/calendar/interventions_calendar.css b/loko/interventions/static/interventions/calendar/interventions_calendar.css index 714ff47..d02e08d 100644 --- a/loko/interventions/static/interventions/calendar/interventions_calendar.css +++ b/loko/interventions/static/interventions/calendar/interventions_calendar.css @@ -47,8 +47,8 @@ .vis-item.status-in_preparation { background-color: #6c757d; border-color: #5a6268; color: #fff; } .vis-item.status-to_be_approved, .vis-item.status-to_be_planned, -.vis-item.status-assigned, -.vis-item.status-on_pause { background-color: #ffc107; border-color: #e0a800; color: #000; } +.vis-item.status-assigned { background-color: #ffc107; border-color: #e0a800; color: #000; } +.vis-item.status-on_pause { background-color: #6b226e; border-color: #531a56; color: #fff; } .vis-item.status-to_be_processed, .vis-item.status-to_be_corrected { background-color: #dc3545; border-color: #bd2130; color: #fff; } .vis-item.status-in_progress { background-color: #007bff; border-color: #0056b3; color: #fff; } diff --git a/loko/interventions/static/interventions/status_colors.js b/loko/interventions/static/interventions/status_colors.js index 5660902..ee420b0 100644 --- a/loko/interventions/static/interventions/status_colors.js +++ b/loko/interventions/static/interventions/status_colors.js @@ -16,7 +16,7 @@ const INTERVENTION_STATUS_COLORS = { to_be_processed: '#f4511e', assigned: '#63b3ed', in_progress: '#3182ce', - on_pause: '#90a4ae', + on_pause: '#6b226e', finished: '#26a69a', processed: '#9ae9e2', to_be_corrected: '#9e87f6', diff --git a/loko/mobile/templates/mobile/mobile_base.html b/loko/mobile/templates/mobile/mobile_base.html index 67f8af2..20cdde2 100644 --- a/loko/mobile/templates/mobile/mobile_base.html +++ b/loko/mobile/templates/mobile/mobile_base.html @@ -131,7 +131,7 @@ .badge.status-to_be_processed { background-color: #f4511e !important; color: #ffffff !important; } .badge.status-assigned { background-color: #63b3ed !important; color: #000000 !important; } .badge.status-in_progress { background-color: #3182ce !important; color: #ffffff !important; } - .badge.status-on_pause { background-color: #90a4ae !important; color: #000000 !important; } + .badge.status-on_pause { background-color: #6b226e !important; color: #ffffff !important; } .badge.status-finished { background-color: #26a69a !important; color: #ffffff !important; } .badge.status-processed { background-color: #9ae9e2 !important; color: #000000 !important; } .badge.status-to_be_corrected { background-color: #9e87f6 !important; color: #000000 !important; }