Merge branch 'develop'

MTES-MCT · Sep 20, 2024 · 672928b · 672928b
2 parents 63313e7 + f4b94ea
commit 672928b
Show file tree

Hide file tree

Showing 217 changed files with 1,286 additions and 429 deletions.
diff --git a/.env b/.env
@@ -68,6 +68,7 @@ CLAMAV_HOST=histologe_clamav
 CLAMAV_STRATEGY=clamd_unix
 CLAMAV_SCAN_ENABLE=1
 HISTORY_TRACKING_ENABLE=1
+FEATURE_SCHS_SYNC_EVENT_ENABLE=0
 ### histologe ###
 
 ### object storage S3 ###

diff --git a/.env.sample b/.env.sample
@@ -54,7 +54,7 @@ CLAMAV_HOST=histologe_clamav
 CLAMAV_STRATEGY=clamd_unix
 CLAMAV_SCAN_ENABLE=1
 FEATURE_PROFIL_EDITION_ENABLED=1
-
+FEATURE_SCHS_SYNC_EVENT_ENABLE=0
 ###> knplabs/knp-snappy-bundle ###
 WKHTMLTOPDF_PATH=wkhtmltopdf
 WKHTMLTOIMAGE_PATH=wkhtmltoimage

diff --git a/assets/app-back-bo.ts b/assets/app-back-bo.ts
diff --git a/assets/app-front-signalement-form.ts b/assets/app-front-signalement-form.ts
diff --git a/assets/app-front-stats.ts b/assets/app-front-stats.ts
diff --git a/assets/app.ts b/assets/app.ts
diff --git a/assets/scripts/app-back-bo.ts b/assets/scripts/app-back-bo.ts
@@ -0,0 +1,32 @@
+import './base-import.ts';
+
+import './vue/index';
+import './vue/signalement-list.ts';
+import './vue/dashboard.ts';
+
+import './vanilla/services/data_delete.js'
+import './vanilla/services/modale_cgu_bo.js';
+import './vanilla/services/pagination.js'
+import './vanilla/services/search_filter_form.js'
+import './vanilla/services/table_sortable.js'
+import './vanilla/services/list_filter_helper.js';
+
+import './vanilla/controllers/form_account.js';
+import './vanilla/controllers/form_nde.js';
+import './vanilla/controllers/form_notification.js';
+import './vanilla/controllers/form_visite.js';
+import './vanilla/controllers/form_modal_handler.js';
+
+import './vanilla/controllers/back_account/back_account.js'
+import './vanilla/controllers/back_archived_signalements/back_archived_signalements_reactiver.js'
+import './vanilla/controllers/back_auto_affectation_rule/form_auto_affectation_rule.js'
+import './vanilla/controllers/back_partner_view/form_partner.js';
+import './vanilla/controllers/back_signalement_view/back_view_signalement.js';
+import './vanilla/controllers/back_signalement_view/form_upload_documents.js';
+import './vanilla/controllers/back_signalement_view/input_autocomplete_bailleur.js';
+import './vanilla/controllers/back_signalement_view/form_cloture_modal.js';
+import './vanilla/controllers/back_signalement_view/form_acceptation_refus.js';
+import './vanilla/controllers/back_signalement_edit_file/back_signalement_edit_file.js';
+import './vanilla/controllers/back_signalement_delete_file/back_signalement_delete_file.js';
+import './vanilla/controllers/back_signalement_list_export/back_signalement_list_export.js';
+import './vanilla/controllers/back_profil_edit_email/back_profil_edit_email.js';
diff --git a/assets/scripts/app-front-signalement-form.ts b/assets/scripts/app-front-signalement-form.ts
@@ -0,0 +1,3 @@
+import './base-import.ts';
+
+import './vue/signalement-form.ts';
diff --git a/assets/scripts/app-front-stats.ts b/assets/scripts/app-front-stats.ts
@@ -0,0 +1,3 @@
+import './base-import.ts';
+
+import './vue/front-stats.ts';
diff --git a/assets/scripts/app.ts b/assets/scripts/app.ts
@@ -0,0 +1,14 @@
+// any CSS you import will output into a single css file (app.css in this case)
+import '../styles/histologe.scss';
+
+import './base-import.ts';
+
+import './vanilla/services/component_search_address.js';
+import './vanilla/services/form_helper.js';
+import './vanilla/services/cookie_banner.js';
+import './vanilla/services/maintenance_banner.js';
+
+import './vanilla/controllers/activate_account/activate_account.js';
+import './vanilla/controllers/front_demande_lien_signalement/front_demande_lien_signalement.js';
+import './vanilla/controllers/front_suivi_signalement/front_suivi_signalement.js';
+import './vanilla/controllers/front_contact/front_contact.js';
diff --git a/assets/base-import.ts → assets/scripts/base-import.ts b/assets/base-import.ts → assets/scripts/base-import.ts
@@ -4,7 +4,7 @@ import {
     SENTRY_DSN_FRONT,
     SENTRY_ENVIRONMENT,
     SENTRY_TRACES_SAMPLE_RATE
-} from'./controllers/environment'
+} from'./vanilla/controllers/environment'
 
 Sentry.init({
     dsn: SENTRY_DSN_FRONT,

diff --git a/...lers/activate_account/activate_account.js → ...lers/activate_account/activate_account.js b/...lers/activate_account/activate_account.js → ...lers/activate_account/activate_account.js
diff --git a/.../controllers/back_account/back_account.js → .../controllers/back_account/back_account.js b/.../controllers/back_account/back_account.js → .../controllers/back_account/back_account.js
diff --git a/...s/back_archived_signalements_reactiver.js → ...s/back_archived_signalements_reactiver.js b/...s/back_archived_signalements_reactiver.js → ...s/back_archived_signalements_reactiver.js
diff --git a/...tation_rule/form_auto_affectation_rule.js → ...tation_rule/form_auto_affectation_rule.js b/...tation_rule/form_auto_affectation_rule.js → ...tation_rule/form_auto_affectation_rule.js
diff --git a/...rollers/back_partner_view/form_partner.js → ...rollers/back_partner_view/form_partner.js b/...rollers/back_partner_view/form_partner.js → ...rollers/back_partner_view/form_partner.js
diff --git a/...ofil_edit_email/back_profil_edit_email.js → ...ofil_edit_email/back_profil_edit_email.js b/...ofil_edit_email/back_profil_edit_email.js → ...ofil_edit_email/back_profil_edit_email.js
diff --git a/...lete_file/back_signalement_delete_file.js → ...lete_file/back_signalement_delete_file.js b/...lete_file/back_signalement_delete_file.js → ...lete_file/back_signalement_delete_file.js
diff --git a/...t_edit_file/back_signalement_edit_file.js → ...t_edit_file/back_signalement_edit_file.js b/...t_edit_file/back_signalement_edit_file.js → ...t_edit_file/back_signalement_edit_file.js
diff --git a/...st_export/back_signalement_list_export.js → ...st_export/back_signalement_list_export.js b/...st_export/back_signalement_list_export.js → ...st_export/back_signalement_list_export.js
diff --git a/...signalement_view/back_view_signalement.js → ...signalement_view/back_view_signalement.js b/...signalement_view/back_view_signalement.js → ...signalement_view/back_view_signalement.js
diff --git a/...ignalement_view/form_acceptation_refus.js → ...ignalement_view/form_acceptation_refus.js b/...ignalement_view/form_acceptation_refus.js → ...ignalement_view/form_acceptation_refus.js
diff --git a/...ck_signalement_view/form_cloture_modal.js → ...ck_signalement_view/form_cloture_modal.js b/...ck_signalement_view/form_cloture_modal.js → ...ck_signalement_view/form_cloture_modal.js
diff --git a/...signalement_view/form_upload_documents.js → ...signalement_view/form_upload_documents.js b/...signalement_view/form_upload_documents.js → ...signalement_view/form_upload_documents.js
diff --git a/...ement_view/input_autocomplete_bailleur.js → ...ement_view/input_autocomplete_bailleur.js b/...ement_view/input_autocomplete_bailleur.js → ...ement_view/input_autocomplete_bailleur.js
diff --git a/assets/controllers/environment.js → ...cripts/vanilla/controllers/environment.js b/assets/controllers/environment.js → ...cripts/vanilla/controllers/environment.js
diff --git a/assets/controllers/form_account.js → ...ripts/vanilla/controllers/form_account.js b/assets/controllers/form_account.js → ...ripts/vanilla/controllers/form_account.js
diff --git a/assets/controllers/form_modal_handler.js → ...vanilla/controllers/form_modal_handler.js b/assets/controllers/form_modal_handler.js → ...vanilla/controllers/form_modal_handler.js
diff --git a/assets/controllers/form_nde.js → ...s/scripts/vanilla/controllers/form_nde.js b/assets/controllers/form_nde.js → ...s/scripts/vanilla/controllers/form_nde.js
diff --git a/assets/controllers/form_notification.js → .../vanilla/controllers/form_notification.js b/assets/controllers/form_notification.js → .../vanilla/controllers/form_notification.js
diff --git a/assets/controllers/form_visite.js → ...cripts/vanilla/controllers/form_visite.js b/assets/controllers/form_visite.js → ...cripts/vanilla/controllers/form_visite.js
diff --git a/...ontrollers/front_contact/front_contact.js → ...ontrollers/front_contact/front_contact.js b/...ontrollers/front_contact/front_contact.js → ...ontrollers/front_contact/front_contact.js
diff --git a/...alement/front_demande_lien_signalement.js → ...alement/front_demande_lien_signalement.js b/...alement/front_demande_lien_signalement.js → ...alement/front_demande_lien_signalement.js
diff --git a/...vi_signalement/front_suivi_signalement.js → ...vi_signalement/front_suivi_signalement.js b/...vi_signalement/front_suivi_signalement.js → ...vi_signalement/front_suivi_signalement.js
diff --git a/assets/services/component_search_address.js → ...illa/services/component_search_address.js b/assets/services/component_search_address.js → ...illa/services/component_search_address.js
diff --git a/assets/services/cookie_banner.js → ...scripts/vanilla/services/cookie_banner.js b/assets/services/cookie_banner.js → ...scripts/vanilla/services/cookie_banner.js
diff --git a/assets/services/cookie_matomo_tracking.js → ...anilla/services/cookie_matomo_tracking.js b/assets/services/cookie_matomo_tracking.js → ...anilla/services/cookie_matomo_tracking.js
diff --git a/assets/services/cookie_utils.js → .../scripts/vanilla/services/cookie_utils.js b/assets/services/cookie_utils.js → .../scripts/vanilla/services/cookie_utils.js
diff --git a/assets/services/data_delete.js → ...s/scripts/vanilla/services/data_delete.js b/assets/services/data_delete.js → ...s/scripts/vanilla/services/data_delete.js
diff --git a/assets/services/form_helper.js → ...s/scripts/vanilla/services/form_helper.js b/assets/services/form_helper.js → ...s/scripts/vanilla/services/form_helper.js
diff --git a/assets/services/list_filter_helper.js → ...ts/vanilla/services/list_filter_helper.js b/assets/services/list_filter_helper.js → ...ts/vanilla/services/list_filter_helper.js
diff --git a/assets/services/maintenance_banner.js → ...ts/vanilla/services/maintenance_banner.js b/assets/services/maintenance_banner.js → ...ts/vanilla/services/maintenance_banner.js
diff --git a/assets/services/modale_cgu_bo.js → ...scripts/vanilla/services/modale_cgu_bo.js b/assets/services/modale_cgu_bo.js → ...scripts/vanilla/services/modale_cgu_bo.js
diff --git a/assets/services/pagination.js → ...ts/scripts/vanilla/services/pagination.js b/assets/services/pagination.js → ...ts/scripts/vanilla/services/pagination.js
diff --git a/assets/scripts/vanilla/services/search_filter_form.js b/assets/scripts/vanilla/services/search_filter_form.js
@@ -0,0 +1,56 @@
+const setBadge = (el) => {
+    let container = el.parentElement.querySelector('.selected__value');
+    if (el.value !== '') {
+        let badge = document.createElement('span');
+        badge.classList.add('fr-badge', 'fr-badge--success', 'fr-m-1v')
+        badge.innerText = el.selectedOptions[0].text;
+        let input = document.createElement('input');
+        input.type = "hidden";
+        input.name = `${el.id}[]`;
+        input.value = el.value;
+        container.append(input);
+        badge.setAttribute('data-value', el.value);
+        container.querySelector('.fr-badge:not([data-value])')?.classList?.add('fr-hidden');
+        container.append(badge)
+        el.selectedOptions[0].classList.add('fr-hidden')
+        badge.addEventListener('click', (event) => {
+            removeBadge(badge);
+        })
+    } else {
+        container.querySelectorAll('.fr-badge[data-value]').forEach(badge => {
+            removeBadge(badge);
+        })
+    }
+    return false;
+}
+const removeBadge = (badge) => {
+    let val = badge.getAttribute('data-value');
+    let input = badge.parentElement.querySelector(`input[value="${val}"]`);
+    let select = badge?.parentElement?.parentElement?.querySelector(`select`) ?? badge?.parentElement?.parentElement?.querySelector(`input[type="date"]`);
+    select.querySelector(`option[value="${val}"]`)?.classList?.remove('fr-hidden');
+    input?.remove();
+    let badges = badge.parentElement.querySelectorAll('.fr-badge[data-value]').length !== 1;
+    console.log(badge.parentElement.querySelectorAll('.fr-badge[data-value]').length)
+    if (!badges) {
+        badge?.parentElement?.querySelector('.fr-badge:not([data-value])')?.classList?.remove('fr-hidden');
+        if (select.tagName === 'SELECT')
+            select.options[0].selected = true;
+    }
+    badge.remove();
+}
+
+document?.querySelectorAll('.select-search-filter-form')?.forEach(select => {
+    select.addEventListener(
+        "change",
+        () => {
+            setBadge(select);
+        },
+        false,
+      );
+})
+
+document?.querySelectorAll('[data-removable="true"]')?.forEach(removale => {
+    removale.addEventListener('click', () => {
+        removeBadge(removale);
+    })
+})
diff --git a/assets/services/table_sortable.js → ...cripts/vanilla/services/table_sortable.js b/assets/services/table_sortable.js → ...cripts/vanilla/services/table_sortable.js
diff --git a/...vue/components/common/AppAutoComplete.vue → ...vue/components/common/AppAutoComplete.vue b/...vue/components/common/AppAutoComplete.vue → ...vue/components/common/AppAutoComplete.vue
diff --git a/assets/vue/components/common/AppNumber.vue → ...ripts/vue/components/common/AppNumber.vue b/assets/vue/components/common/AppNumber.vue → ...ripts/vue/components/common/AppNumber.vue
diff --git a/assets/vue/components/common/AppSearch.vue → ...ripts/vue/components/common/AppSearch.vue b/assets/vue/components/common/AppSearch.vue → ...ripts/vue/components/common/AppSearch.vue
diff --git a/...ue/components/common/HistoBOTabHeader.vue → ...ue/components/common/HistoBOTabHeader.vue b/...ue/components/common/HistoBOTabHeader.vue → ...ue/components/common/HistoBOTabHeader.vue
diff --git a/assets/vue/components/common/HistoButton.vue → ...pts/vue/components/common/HistoButton.vue b/assets/vue/components/common/HistoButton.vue → ...pts/vue/components/common/HistoButton.vue
diff --git a/...s/vue/components/common/HistoCheckbox.vue → ...s/vue/components/common/HistoCheckbox.vue b/...s/vue/components/common/HistoCheckbox.vue → ...s/vue/components/common/HistoCheckbox.vue
diff --git a/.../vue/components/common/HistoFranceMap.vue → .../vue/components/common/HistoFranceMap.vue b/.../vue/components/common/HistoFranceMap.vue → .../vue/components/common/HistoFranceMap.vue
diff --git a/...ents/common/HistoInterfaceSelectOption.ts → ...ents/common/HistoInterfaceSelectOption.ts b/...ents/common/HistoInterfaceSelectOption.ts → ...ents/common/HistoInterfaceSelectOption.ts
diff --git a/...ue/components/common/HistoMultiSelect.vue → ...ue/components/common/HistoMultiSelect.vue b/...ue/components/common/HistoMultiSelect.vue → ...ue/components/common/HistoMultiSelect.vue
@@ -140,7 +140,7 @@ export default defineComponent({
   }
 
   .histo-multi-select .selector {
-    background-color: #FFF;
+    background-color: var(--background-contrast-grey);
     cursor: pointer;
   }
   .histo-multi-select.inactive .selector {
@@ -153,7 +153,7 @@ export default defineComponent({
     width: 100%;
     font-size: 1rem;
     line-height: 1.5rem;
-    background-color: #FFF;
+    background-color: var(--background-contrast-grey);
     border-radius: 4px;
   }
 

diff --git a/assets/vue/components/common/HistoSelect.vue → ...pts/vue/components/common/HistoSelect.vue b/assets/vue/components/common/HistoSelect.vue → ...pts/vue/components/common/HistoSelect.vue
@@ -72,6 +72,6 @@ export default defineComponent({
 
 <style>
   .histo-select select {
-    background-color: #FFF;
+    background-color: var(--background-contrast-grey);
   }
 </style>
diff --git a/...onents/common/external/HistoDataTable.vue → ...onents/common/external/HistoDataTable.vue b/...onents/common/external/HistoDataTable.vue → ...onents/common/external/HistoDataTable.vue
@@ -54,18 +54,22 @@ export default defineComponent({
 <style>
   @import 'datatables.net-dt';
 
+  .histo-data-table table {
+    border: 1px solid var(--border-contrast-grey);
+  }
+
   .histo-data-table table thead {
-    color: var(--blue-france-sun-113-625);
+    color: var(--text-default-grey);
+    background-color: var(--background-alt-grey);
+    text-decoration: underline;
   }
 
   .histo-data-table table.dataTable.display tbody td {
     box-shadow: none;
     background-color: #FFF;
     text-align: left;
   }
-  .histo-data-table table.dataTable.display > tbody > tr.odd > td {
-    background-color: #CACAFBA6;
-  }
+
   .histo-data-table table.dataTable.display > tbody > tr.even > td.sorting_1, .histo-data-table table.dataTable.display > tbody > tr.odd > td.sorting_1 {
     box-shadow: none;
   }
@@ -78,11 +82,12 @@ export default defineComponent({
   }
   .histo-data-table .dataTables_wrapper .dataTables_paginate .paginate_button.current {
     border: 0px;
-    background: var(--blue-france-850-200);
+    background-color: var(--background-active-blue-france);
+    color: var(--text-inverted-blue-france) !important;
   }
   .histo-data-table .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
     color: #161616 !important;
     background-color: #E5E5E5;
-
+    --hover-tint: var(--hover);
   }
 </style>
diff --git a/...nents/common/external/HistoDatePicker.vue → ...nents/common/external/HistoDatePicker.vue b/...nents/common/external/HistoDatePicker.vue → ...nents/common/external/HistoDatePicker.vue
diff --git a/...common/external/chartjs/HistoChartBar.vue → ...common/external/chartjs/HistoChartBar.vue b/...common/external/chartjs/HistoChartBar.vue → ...common/external/chartjs/HistoChartBar.vue
diff --git a/...n/external/chartjs/HistoChartDoughnut.vue → ...n/external/chartjs/HistoChartDoughnut.vue b/...n/external/chartjs/HistoChartDoughnut.vue → ...n/external/chartjs/HistoChartDoughnut.vue
diff --git a/...ommon/external/chartjs/HistoChartLine.vue → ...ommon/external/chartjs/HistoChartLine.vue b/...ommon/external/chartjs/HistoChartLine.vue → ...ommon/external/chartjs/HistoChartLine.vue
diff --git a/...common/external/chartjs/HistoChartPie.vue → ...common/external/chartjs/HistoChartPie.vue b/...common/external/chartjs/HistoChartPie.vue → ...common/external/chartjs/HistoChartPie.vue
diff --git a/...onents/dashboard/TheHistoAppDashboard.vue → ...onents/dashboard/TheHistoAppDashboard.vue b/...onents/dashboard/TheHistoAppDashboard.vue → ...onents/dashboard/TheHistoAppDashboard.vue
@@ -247,7 +247,6 @@ export default defineComponent({
 
 <style>
   #app-dashboard {
-    background-color: #F6F6F6;
     height: 100%;
   }
 </style>
diff --git a/...ents/dashboard/TheHistoDashboardCards.vue → ...ents/dashboard/TheHistoDashboardCards.vue b/...ents/dashboard/TheHistoDashboardCards.vue → ...ents/dashboard/TheHistoDashboardCards.vue
@@ -293,6 +293,7 @@ export default defineComponent({
 <style>
   .histo-dashboard-cards .fr-card .fr-card__body {
     padding: 1.5rem;
+    box-shadow: 0px 3px 6px #16161633;
   }
   .histo-dashboard-cards .fr-card .fr-card__content {
     padding: 0px;

diff --git a/...nts/dashboard/TheHistoDashboardHeader.vue → ...nts/dashboard/TheHistoDashboardHeader.vue b/...nts/dashboard/TheHistoDashboardHeader.vue → ...nts/dashboard/TheHistoDashboardHeader.vue
diff --git a/...nts/dashboard/TheHistoDashboardTables.vue → ...nts/dashboard/TheHistoDashboardTables.vue b/...nts/dashboard/TheHistoDashboardTables.vue → ...nts/dashboard/TheHistoDashboardTables.vue
diff --git a/assets/vue/components/dashboard/requests.ts → ...ipts/vue/components/dashboard/requests.ts b/assets/vue/components/dashboard/requests.ts → ...ipts/vue/components/dashboard/requests.ts
diff --git a/assets/vue/components/dashboard/store.ts → ...scripts/vue/components/dashboard/store.ts b/assets/vue/components/dashboard/store.ts → ...scripts/vue/components/dashboard/store.ts
diff --git a/...nts/front-stats/TheHistoAppFrontStats.vue → ...nts/front-stats/TheHistoAppFrontStats.vue b/...nts/front-stats/TheHistoAppFrontStats.vue → ...nts/front-stats/TheHistoAppFrontStats.vue
diff --git a/...t-stats/TheHistoFrontStatsDetailsItem.vue → ...t-stats/TheHistoFrontStatsDetailsItem.vue b/...t-stats/TheHistoFrontStatsDetailsItem.vue → ...t-stats/TheHistoFrontStatsDetailsItem.vue
diff --git a/.../front-stats/TheHistoFrontStatsGlobal.vue → .../front-stats/TheHistoFrontStatsGlobal.vue b/.../front-stats/TheHistoFrontStatsGlobal.vue → .../front-stats/TheHistoFrontStatsGlobal.vue
diff --git a/...ont-stats/TheHistoFrontStatsTerritory.vue → ...ont-stats/TheHistoFrontStatsTerritory.vue b/...ont-stats/TheHistoFrontStatsTerritory.vue → ...ont-stats/TheHistoFrontStatsTerritory.vue
diff --git a/...stats/TheHistoFrontStatsTerritoryItem.vue → ...stats/TheHistoFrontStatsTerritoryItem.vue b/...stats/TheHistoFrontStatsTerritoryItem.vue → ...stats/TheHistoFrontStatsTerritoryItem.vue
diff --git a/...nt-stats/TheHistoFrontStatsYearToggle.vue → ...nt-stats/TheHistoFrontStatsYearToggle.vue b/...nt-stats/TheHistoFrontStatsYearToggle.vue → ...nt-stats/TheHistoFrontStatsYearToggle.vue
diff --git a/...ts/vue/components/front-stats/requests.ts → ...ts/vue/components/front-stats/requests.ts b/...ts/vue/components/front-stats/requests.ts → ...ts/vue/components/front-stats/requests.ts
diff --git a/assets/vue/components/front-stats/store.ts → ...ripts/vue/components/front-stats/store.ts b/assets/vue/components/front-stats/store.ts → ...ripts/vue/components/front-stats/store.ts
diff --git a/...ignalement-form/TheSignalementAppForm.vue → ...ignalement-form/TheSignalementAppForm.vue b/...ignalement-form/TheSignalementAppForm.vue → ...ignalement-form/TheSignalementAppForm.vue
diff --git a/...s/signalement-form/address_subscreen.json → ...s/signalement-form/address_subscreen.json b/...s/signalement-form/address_subscreen.json → ...s/signalement-form/address_subscreen.json
diff --git a/...orm/components/SignalementFormAddress.vue → ...orm/components/SignalementFormAddress.vue b/...orm/components/SignalementFormAddress.vue → ...orm/components/SignalementFormAddress.vue
diff --git a/...omponents/SignalementFormAutocomplete.vue → ...omponents/SignalementFormAutocomplete.vue b/...omponents/SignalementFormAutocomplete.vue → ...omponents/SignalementFormAutocomplete.vue
diff --git a/...components/SignalementFormBreadCrumbs.vue → ...components/SignalementFormBreadCrumbs.vue b/...components/SignalementFormBreadCrumbs.vue → ...components/SignalementFormBreadCrumbs.vue
diff --git a/...form/components/SignalementFormButton.vue → ...form/components/SignalementFormButton.vue b/...form/components/SignalementFormButton.vue → ...form/components/SignalementFormButton.vue
diff --git a/...rm/components/SignalementFormCheckbox.vue → ...rm/components/SignalementFormCheckbox.vue b/...rm/components/SignalementFormCheckbox.vue → ...rm/components/SignalementFormCheckbox.vue
diff --git a/...omponents/SignalementFormConfirmation.vue → ...omponents/SignalementFormConfirmation.vue b/...omponents/SignalementFormConfirmation.vue → ...omponents/SignalementFormConfirmation.vue
diff --git a/...orm/components/SignalementFormCounter.vue → ...orm/components/SignalementFormCounter.vue b/...orm/components/SignalementFormCounter.vue → ...orm/components/SignalementFormCounter.vue
diff --git a/...t-form/components/SignalementFormDate.vue → ...t-form/components/SignalementFormDate.vue b/...t-form/components/SignalementFormDate.vue → ...t-form/components/SignalementFormDate.vue
diff --git a/...s/SignalementFormDisorderCategoryItem.vue → ...s/SignalementFormDisorderCategoryItem.vue b/...s/SignalementFormDisorderCategoryItem.vue → ...s/SignalementFormDisorderCategoryItem.vue
diff --git a/...s/SignalementFormDisorderCategoryList.vue → ...s/SignalementFormDisorderCategoryList.vue b/...s/SignalementFormDisorderCategoryList.vue → ...s/SignalementFormDisorderCategoryList.vue
diff --git a/...nents/SignalementFormDisorderOverview.vue → ...nents/SignalementFormDisorderOverview.vue b/...nents/SignalementFormDisorderOverview.vue → ...nents/SignalementFormDisorderOverview.vue
diff --git a/.../components/SignalementFormEmailfield.vue → .../components/SignalementFormEmailfield.vue b/.../components/SignalementFormEmailfield.vue → .../components/SignalementFormEmailfield.vue
diff --git a/...t-form/components/SignalementFormIcon.vue → ...t-form/components/SignalementFormIcon.vue b/...t-form/components/SignalementFormIcon.vue → ...t-form/components/SignalementFormIcon.vue
diff --git a/...t-form/components/SignalementFormInfo.vue → ...t-form/components/SignalementFormInfo.vue b/...t-form/components/SignalementFormInfo.vue → ...t-form/components/SignalementFormInfo.vue
diff --git a/...t-form/components/SignalementFormLink.vue → ...t-form/components/SignalementFormLink.vue b/...t-form/components/SignalementFormLink.vue → ...t-form/components/SignalementFormLink.vue
diff --git a/...-form/components/SignalementFormModal.vue → ...-form/components/SignalementFormModal.vue b/...-form/components/SignalementFormModal.vue → ...-form/components/SignalementFormModal.vue
diff --git a/...nts/SignalementFormModalAlreadyExists.vue → ...nts/SignalementFormModalAlreadyExists.vue b/...nts/SignalementFormModalAlreadyExists.vue → ...nts/SignalementFormModalAlreadyExists.vue
diff --git a/...mponents/SignalementFormModalBackHome.vue → ...mponents/SignalementFormModalBackHome.vue b/...mponents/SignalementFormModalBackHome.vue → ...mponents/SignalementFormModalBackHome.vue
diff --git a/.../components/SignalementFormOnlyChoice.vue → .../components/SignalementFormOnlyChoice.vue b/.../components/SignalementFormOnlyChoice.vue → .../components/SignalementFormOnlyChoice.vue
diff --git a/...rm/components/SignalementFormOverview.vue → ...rm/components/SignalementFormOverview.vue b/...rm/components/SignalementFormOverview.vue → ...rm/components/SignalementFormOverview.vue
diff --git a/.../components/SignalementFormPhonefield.vue → .../components/SignalementFormPhonefield.vue b/.../components/SignalementFormPhonefield.vue → .../components/SignalementFormPhonefield.vue
diff --git a/...rm/components/SignalementFormRoomList.vue → ...rm/components/SignalementFormRoomList.vue b/...rm/components/SignalementFormRoomList.vue → ...rm/components/SignalementFormRoomList.vue
diff --git a/...form/components/SignalementFormScreen.vue → ...form/components/SignalementFormScreen.vue b/...form/components/SignalementFormScreen.vue → ...form/components/SignalementFormScreen.vue
diff --git a/...m/components/SignalementFormSubscreen.vue → ...m/components/SignalementFormSubscreen.vue b/...m/components/SignalementFormSubscreen.vue → ...m/components/SignalementFormSubscreen.vue
diff --git a/...rm/components/SignalementFormTextarea.vue → ...rm/components/SignalementFormTextarea.vue b/...rm/components/SignalementFormTextarea.vue → ...rm/components/SignalementFormTextarea.vue
diff --git a/...m/components/SignalementFormTextfield.vue → ...m/components/SignalementFormTextfield.vue b/...m/components/SignalementFormTextfield.vue → ...m/components/SignalementFormTextfield.vue
diff --git a/...t-form/components/SignalementFormTime.vue → ...t-form/components/SignalementFormTime.vue b/...t-form/components/SignalementFormTime.vue → ...t-form/components/SignalementFormTime.vue
diff --git a/...form/components/SignalementFormUpload.vue → ...form/components/SignalementFormUpload.vue b/...form/components/SignalementFormUpload.vue → ...form/components/SignalementFormUpload.vue
diff --git a/...omponents/SignalementFormUploadPhotos.vue → ...omponents/SignalementFormUploadPhotos.vue b/...omponents/SignalementFormUploadPhotos.vue → ...omponents/SignalementFormUploadPhotos.vue
diff --git a/...orm/components/SignalementFormWarning.vue → ...orm/components/SignalementFormWarning.vue b/...orm/components/SignalementFormWarning.vue → ...orm/components/SignalementFormWarning.vue
diff --git a/...t-form/components/SignalementFormYear.vue → ...t-form/components/SignalementFormYear.vue b/...t-form/components/SignalementFormYear.vue → ...t-form/components/SignalementFormYear.vue
diff --git a/.../components/signalement-form/countries.ts → .../components/signalement-form/countries.ts b/.../components/signalement-form/countries.ts → .../components/signalement-form/countries.ts
diff --git a/...ents/signalement-form/dictionary-store.ts → ...ents/signalement-form/dictionary-store.ts b/...ents/signalement-form/dictionary-store.ts → ...ents/signalement-form/dictionary-store.ts
diff --git a/...ent-form/interfaces/interfaceComponent.ts → ...ent-form/interfaces/interfaceComponent.ts b/...ent-form/interfaces/interfaceComponent.ts → ...ent-form/interfaces/interfaceComponent.ts
diff --git a/...m/interfaces/interfaceCountryPhoneItem.ts → ...m/interfaces/interfaceCountryPhoneItem.ts b/...m/interfaces/interfaceCountryPhoneItem.ts → ...m/interfaces/interfaceCountryPhoneItem.ts
diff --git a/...ment-form/interfaces/interfaceMenuItem.ts → ...ment-form/interfaces/interfaceMenuItem.ts b/...ment-form/interfaces/interfaceMenuItem.ts → ...ment-form/interfaces/interfaceMenuItem.ts
diff --git a/...interfaces/interfacePictureDescription.ts → ...interfaces/interfacePictureDescription.ts b/...interfaces/interfacePictureDescription.ts → ...interfaces/interfacePictureDescription.ts
diff --git a/...orm/interfaces/interfaceZoneComponents.ts → ...orm/interfaces/interfaceZoneComponents.ts b/...orm/interfaces/interfaceZoneComponents.ts → ...orm/interfaces/interfaceZoneComponents.ts
diff --git a/...vue/components/signalement-form/matomo.ts → ...vue/components/signalement-form/matomo.ts b/...vue/components/signalement-form/matomo.ts → ...vue/components/signalement-form/matomo.ts
diff --git a/...e/components/signalement-form/requests.ts → ...e/components/signalement-form/requests.ts b/...e/components/signalement-form/requests.ts → ...e/components/signalement-form/requests.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import formStore from './store'
 import * as Sentry from '@sentry/browser'
-import { AXIOS_TIMEOUT } from '../../../controllers/environment'
+import { AXIOS_TIMEOUT } from '../../../vanilla/controllers/environment'
 
 export const requests = {
   doRequestGet (ajaxUrl: string, functionReturn: Function) {

diff --git a/...ement-form/services/componentValidator.ts → ...ement-form/services/componentValidator.ts b/...ement-form/services/componentValidator.ts → ...ement-form/services/componentValidator.ts
diff --git a/...lement-form/services/dictionaryManager.ts → ...lement-form/services/dictionaryManager.ts b/...lement-form/services/dictionaryManager.ts → ...lement-form/services/dictionaryManager.ts
diff --git a/...-form/services/disorderScreenNavigator.ts → ...-form/services/disorderScreenNavigator.ts b/...-form/services/disorderScreenNavigator.ts → ...-form/services/disorderScreenNavigator.ts
diff --git a/...gnalement-form/services/profileUpdater.ts → ...gnalement-form/services/profileUpdater.ts b/...gnalement-form/services/profileUpdater.ts → ...gnalement-form/services/profileUpdater.ts
diff --git a/...alement-form/services/subscreenManager.ts → ...alement-form/services/subscreenManager.ts b/...alement-form/services/subscreenManager.ts → ...alement-form/services/subscreenManager.ts
diff --git a/...alement-form/services/variableReplacer.ts → ...alement-form/services/variableReplacer.ts b/...alement-form/services/variableReplacer.ts → ...alement-form/services/variableReplacer.ts
diff --git a/...gnalement-form/services/variableTester.ts → ...gnalement-form/services/variableTester.ts b/...gnalement-form/services/variableTester.ts → ...gnalement-form/services/variableTester.ts
diff --git a/.../vue/components/signalement-form/store.ts → .../vue/components/signalement-form/store.ts b/.../vue/components/signalement-form/store.ts → .../vue/components/signalement-form/store.ts
diff --git a/...ignalement-list/TheSignalementAppList.vue → ...ignalement-list/TheSignalementAppList.vue b/...ignalement-list/TheSignalementAppList.vue → ...ignalement-list/TheSignalementAppList.vue
diff --git a/...-list/components/SignalementListCards.vue → ...-list/components/SignalementListCards.vue b/...-list/components/SignalementListCards.vue → ...-list/components/SignalementListCards.vue
diff --git a/...ist/components/SignalementListFilters.vue → ...ist/components/SignalementListFilters.vue b/...ist/components/SignalementListFilters.vue → ...ist/components/SignalementListFilters.vue
@@ -511,12 +511,6 @@ export default defineComponent({
 </script>
 <style>
   .grey-background {
-    .histo-select select {
-      background-color: var(--background-contrast-grey);
-    }
-    .histo-multi-select .selector {
-      background-color: var(--background-contrast-grey);
-    }
     .histo-date-picker input {
       background-color: var(--background-contrast-grey);
       box-shadow: inset 0 -2px 0 0 var(--border-plain-grey);

diff --git a/...list/components/SignalementListHeader.vue → ...list/components/SignalementListHeader.vue b/...list/components/SignalementListHeader.vue → ...list/components/SignalementListHeader.vue
diff --git a/.../components/SignalementListPagination.vue → .../components/SignalementListPagination.vue b/.../components/SignalementListPagination.vue → .../components/SignalementListPagination.vue
diff --git a/...ts/signalement-list/interfaces/filters.ts → ...ts/signalement-list/interfaces/filters.ts b/...ts/signalement-list/interfaces/filters.ts → ...ts/signalement-list/interfaces/filters.ts
diff --git a/...alement-list/interfaces/queryParameter.ts → ...alement-list/interfaces/queryParameter.ts b/...alement-list/interfaces/queryParameter.ts → ...alement-list/interfaces/queryParameter.ts
diff --git a/...lement-list/interfaces/signalementItem.ts → ...lement-list/interfaces/signalementItem.ts b/...lement-list/interfaces/signalementItem.ts → ...lement-list/interfaces/signalementItem.ts
diff --git a/...e/components/signalement-list/requests.ts → ...e/components/signalement-list/requests.ts b/...e/components/signalement-list/requests.ts → ...e/components/signalement-list/requests.ts
diff --git a/...-list/services/badgeFilterLabelBuilder.ts → ...-list/services/badgeFilterLabelBuilder.ts b/...-list/services/badgeFilterLabelBuilder.ts → ...-list/services/badgeFilterLabelBuilder.ts
diff --git a/.../vue/components/signalement-list/store.ts → .../vue/components/signalement-list/store.ts b/.../vue/components/signalement-list/store.ts → .../vue/components/signalement-list/store.ts
diff --git a/...vue/components/stats/TheHistoAppStats.vue → ...vue/components/stats/TheHistoAppStats.vue b/...vue/components/stats/TheHistoAppStats.vue → ...vue/components/stats/TheHistoAppStats.vue
@@ -193,14 +193,6 @@ export default defineComponent({
 </script>
 
 <style>
-  .histo-app-stats {
-    background-color: var(--background-alt-grey);
-  }
-
-  .histo-app-stats a {
-    color: var(--blue-france-sun-113-625);
-  }
-
   .loading {
     font-size: 2rem;
   }

diff --git a/...components/stats/TheHistoStatsDetails.vue → ...components/stats/TheHistoStatsDetails.vue b/...components/stats/TheHistoStatsDetails.vue → ...components/stats/TheHistoStatsDetails.vue
@@ -10,7 +10,7 @@
           <template #title>Criticité moyenne</template>
         </TheHistoStatsDetailsItem>
 
-        <div class="fr-col-12">
+        <div class="fr-col-12 histo-chart-line">
           <HistoChartLine :items=sharedState.stats.countSignalementPerMonth>
             <template #title>Nombre total de signalements</template>
           </HistoChartLine>
@@ -146,4 +146,8 @@ export default defineComponent({
     font-style: italic;
     font-size: 0.8rem;
   }
+
+  .histo-chart-line {
+    border: 1px solid var(--blue-france-sun-113-625);
+  }
 </style>
diff --git a/...onents/stats/TheHistoStatsDetailsItem.vue → ...onents/stats/TheHistoStatsDetailsItem.vue b/...onents/stats/TheHistoStatsDetailsItem.vue → ...onents/stats/TheHistoStatsDetailsItem.vue
@@ -25,6 +25,7 @@ export default defineComponent({
     font-weight: bold;
     background: #FFF;
     padding: 1rem 0.5rem;
+    border: 1px solid var(--border-default-grey);
   }
   .histo-stats-details-item div p:first-child {
     font-size: 0.8rem;

diff --git a/...components/stats/TheHistoStatsFilters.vue → ...components/stats/TheHistoStatsFilters.vue b/...components/stats/TheHistoStatsFilters.vue → ...components/stats/TheHistoStatsFilters.vue
@@ -75,7 +75,7 @@
           </HistoCheckbox>
         </div>
         <div class="fr-col-12 fr-col-lg-12 fr-col-xl-3 align-right">
-          <a href="#" @click="onReinitLocalEvent"><span class="fr-fi-refresh-line"></span>Tout réinitialiser</a>
+          <a href="#" @click="onReinitLocalEvent" class="fr-link"><span class="fr-fi-refresh-line"></span>Tout réinitialiser</a>
         </div>
       </div>
     </div>
@@ -172,4 +172,9 @@ export default defineComponent({
     color: var(--blue-france-sun-113-625);
     --icon-size: 1.1rem;
   }
+  .histo-date-picker input {
+    background-color: var(--background-contrast-grey);
+    box-shadow: inset 0 -2px 0 0 var(--border-plain-grey);
+    border-radius: .25rem .25rem 0 0;
+  }
 </style>
diff --git a/.../components/stats/TheHistoStatsGlobal.vue → .../components/stats/TheHistoStatsGlobal.vue b/.../components/stats/TheHistoStatsGlobal.vue → .../components/stats/TheHistoStatsGlobal.vue
diff --git a/assets/vue/components/stats/requests.ts → .../scripts/vue/components/stats/requests.ts b/assets/vue/components/stats/requests.ts → .../scripts/vue/components/stats/requests.ts
diff --git a/assets/vue/components/stats/store.ts → assets/scripts/vue/components/stats/store.ts b/assets/vue/components/stats/store.ts → assets/scripts/vue/components/stats/store.ts
diff --git a/assets/vue/dashboard.ts → assets/scripts/vue/dashboard.ts b/assets/vue/dashboard.ts → assets/scripts/vue/dashboard.ts
diff --git a/assets/vue/front-stats.ts → assets/scripts/vue/front-stats.ts b/assets/vue/front-stats.ts → assets/scripts/vue/front-stats.ts
diff --git a/assets/vue/img/fr--warning-fill.svg → assets/scripts/vue/img/fr--warning-fill.svg b/assets/vue/img/fr--warning-fill.svg → assets/scripts/vue/img/fr--warning-fill.svg
diff --git a/assets/vue/img/france-map.svg → assets/scripts/vue/img/france-map.svg b/assets/vue/img/france-map.svg → assets/scripts/vue/img/france-map.svg
diff --git a/assets/vue/index.ts → assets/scripts/vue/index.ts b/assets/vue/index.ts → assets/scripts/vue/index.ts
diff --git a/assets/vue/signalement-form.ts → assets/scripts/vue/signalement-form.ts b/assets/vue/signalement-form.ts → assets/scripts/vue/signalement-form.ts
diff --git a/assets/vue/signalement-list.ts → assets/scripts/vue/signalement-list.ts b/assets/vue/signalement-list.ts → assets/scripts/vue/signalement-list.ts
diff --git a/assets/services/search_filter_form.js b/assets/services/search_filter_form.js
diff --git a/assets/styles/histologe.scss b/assets/styles/histologe.scss
@@ -835,6 +835,10 @@ a.photo-preview {
     cursor: pointer;
 }
 
+.avatar-histologe{
+    border-radius: 50%;
+    border: 1px solid var(--blue-france-main-525);
+}
 .avatar-placeholder {
     display: flex;
     align-items: center;
@@ -868,4 +872,8 @@ a.photo-preview {
     width: 26px;
     height: 26px;
     font-size: 13px;
+}
+
+.text-decoration-underline{
+    text-decoration: underline;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import './base-import.ts';

		import './vue/signalement-form.ts';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import './base-import.ts';

		import './vue/front-stats.ts';