diff --git a/src/components/records/NotificationState.test.js b/src/components/records/NotificationState.test.js new file mode 100644 index 00000000..216a9263 --- /dev/null +++ b/src/components/records/NotificationState.test.js @@ -0,0 +1,106 @@ +import { describe, expect, it } from "vitest"; +import { mount } from "@vue/test-utils"; +import NotificationState from "./NotificationState.vue"; + +describe("NotificationState", () => { + it('renders correctly for "BROUILLON" state', () => { + const wrapper = mount(NotificationState, { + props: { + operator: { + notifications: [ + { + status: "BROUILLON", + }, + ], + }, + text: true, + }, + }); + + expect(wrapper.find(".fr-icon--sm").classes()).toContain("fr-icon-article-line"); + expect( + wrapper + .find("span") + .text() + .replace(/\u00A0/g, " "), + ).toContain("Brouillon"); + + const spanElement = wrapper.find("span"); + expect(spanElement.attributes("style")).toContain("background-color: rgb(211, 211, 211)"); + expect(spanElement.attributes("style")).toContain("color: rgb(128, 128, 128)"); + }); + + it('does not render "BROUILLON" state IF another notifications exists', () => { + const wrapper = mount(NotificationState, { + props: { + operator: { + notifications: [ + { + status: "BROUILLON", + }, + { + status: "ENGAGEE", + }, + ], + }, + text: true, + }, + }); + + expect(wrapper.find(".fr-icon--sm").classes()).toContain("fr-icon-success-line"); + expect( + wrapper + .find("span") + .text() + .replace(/\u00A0/g, " "), + ).toContain("Engagée"); + + const spanElement = wrapper.find("span"); + expect(spanElement.attributes("style")).toContain("background-color: rgb(158, 249, 190)"); + expect(spanElement.attributes("style")).toContain("color: rgb(41, 114, 84)"); + }); + + it('does not render text when "text" prop is false', () => { + const wrapper = mount(NotificationState, { + props: { + operator: { + notifications: [ + { + etatCertification: "BROUILLON", + }, + ], + }, + text: false, + }, + }); + + expect(wrapper.find(".mr-1").exists()).toBe(false); + }); + + it('applies styles and classes for "ENGAGEE" state', () => { + const wrapper = mount(NotificationState, { + props: { + operator: { + certificats: [ + { + status: "ENGAGEE", + }, + ], + }, + text: true, + }, + }); + + expect(wrapper.find(".fr-icon--sm").classes()).toContain("fr-icon-success-line"); + expect( + wrapper + .find("span") + .text() + .replace(/\u00A0/g, " "), + ).toContain("Notification Engagée"); + + const spanElement = wrapper.find("span"); + expect(spanElement.attributes("style")).toContain("background-color: rgb(158, 249, 190)"); + expect(spanElement.attributes("style")).toContain("color: rgb(41, 114, 84)"); + }); +}); diff --git a/src/components/records/NotificationState.vue b/src/components/records/NotificationState.vue new file mode 100644 index 00000000..af1b7e9c --- /dev/null +++ b/src/components/records/NotificationState.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/pages/certification/exploitations/index.vue b/src/pages/certification/exploitations/index.vue index aff53c05..8af7d675 100644 --- a/src/pages/certification/exploitations/index.vue +++ b/src/pages/certification/exploitations/index.vue @@ -48,10 +48,12 @@ meta: }} - - - - + + + + + + @@ -61,35 +63,36 @@ meta: code="nom" v-model="sortOrder" @update:modelValue="(v) => updateQuery({ ...v, page: 1 })" - >ExploitationExploitation (n° Bio) - + Début de conversionEngagé le - + + Notification + + Date de l'auditDernier audit - + Statut + - + Chargement des données… - + - +
@@ -75,8 +73,10 @@ import { getUserOperators } from "@/cartobio-api.js"; import { useRouter } from "vue-router"; import Spinner from "@/components/widgets/Spinner.vue"; import Pagination from "@/components/widgets/Pagination.vue"; - -const RESULTS_PER_PAGE = 10; +import NotificationState from "@/components/records/NotificationState.vue"; +import { filterAndSortNotifications } from "@/utils/helper-notification.js"; +import { jjmmyyyy } from "@/utils/dates"; +const RESULTS_PER_PAGE = 12; const router = useRouter(); const isLoading = ref(true); @@ -100,11 +100,36 @@ async function loadOperators() { if (res.nbTotal === 1 && res.operators.length === 1) { await router.push(`/exploitations/${res.operators[0].numeroBio}`); } - operators.value = res.operators; nbTotal.value = res.nbTotal; + operators.value.forEach((e) => { + if (e.certificats.length > 0) { + e.certificats = filterAndSortNotifications(e.certificats); + } + }); isLoading.value = false; } + +//Date de début de conversion : 2024-12-10 +function getDateDemarrage(operator) { + const array = operator.certificats ?? operator.notifications; + + array.sort((a, b) => new Date(b.dateSignatureContrat) - new Date(a.dateSignatureContrat)); + let dateDemarrage; + + for (const notif of array) { + const currentStatut = notif.etatCertification || notif.status; + if (notif.dateDemarrage) { + dateDemarrage = notif.dateDemarrage; + } + + if (currentStatut != "BROUILLON") { + return dateDemarrage; + } + } + + return dateDemarrage; +} diff --git a/src/referentiels/ab.js b/src/referentiels/ab.js index aece7046..5d18ff42 100644 --- a/src/referentiels/ab.js +++ b/src/referentiels/ab.js @@ -235,3 +235,53 @@ export const certificationDateFin = { return d; }, }; + +export const notificationsStateLevel = { + ["BROUILLON"]: { + label: "Brouillon", + color: "#D3D3D3", + textColor: "#808080", + icon: "fr-icon-article-line", + }, + ["ARRETEE"]: { + label: "Arrêtée", + color: "#FFE9E9", + textColor: "#CE0500", + icon: "fr-icon-error-fill", + }, + ["NON ENGAGEE"]: { + label: "Non engagée", + color: "#FBE769", + textColor: "#66673D", + icon: "fr-icon-stop-circle-line", + }, + // NOTE : Pas sûr d'avoir cette enum + // ["NON ENGAGEE-CHT OC"]: { + // label: "Certification en cours", + // color: "fr-badge--new", + // }, + ["ENGAGEE FUTUR"]: { + label: "Engagée future", + color: "#E3E3FD", + textColor: "#000091", + icon: "fr-icon-time-line", + }, + ["SUSPENDUE"]: { + label: "Suspendue", + color: "#FDDFDB", + textColor: "#A94645", + icon: "fr-icon-pause-circle-line", + }, + ["ENGAGEE"]: { + label: "Engagée", + color: "#9EF9BE", + textColor: "#297254", + icon: "fr-icon-success-line", + }, + ["RETIREE"]: { + label: "Retirée", + color: "#EEE4D9", + textColor: "#6A6156", + icon: "fr-icon-close-circle-line", + }, +}; diff --git a/src/stores/operator.js b/src/stores/operator.js index 9c52a36e..cf6bd09c 100644 --- a/src/stores/operator.js +++ b/src/stores/operator.js @@ -3,6 +3,7 @@ import { computed, ref, watch } from "vue"; import { CUSTOM_DIMENSION_DEPARTEMENT, deleteCustomDimension, setCustomDimension } from "@/stats.js"; import { apiClient } from "@/cartobio-api.js"; import { useCartoBioStorage } from "@/stores/storage.js"; +import { filterAndSortNotifications } from "@/utils/helper-notification.js"; /** * @typedef {import('@vue/reactivity').Ref} Ref @@ -70,7 +71,7 @@ export const useOperatorStore = defineStore("operator", () => { : serverR, ); } - + operatorData.certificats = filterAndSortNotifications(operatorData.certificats); operator.value = operatorData; records.value = recordsData.sort((recordA, recordB) => date(recordB) - date(recordA)); } diff --git a/src/utils/__fixtures__/operator.json b/src/utils/__fixtures__/operator.json index a1827e81..f61add2c 100644 --- a/src/utils/__fixtures__/operator.json +++ b/src/utils/__fixtures__/operator.json @@ -13,5 +13,6 @@ "long": 4.5885, "codeCommune": "42271" } - ] + ], + "certificats": [] } diff --git a/src/utils/dates.js b/src/utils/dates.js index 17618710..a2653370 100644 --- a/src/utils/dates.js +++ b/src/utils/dates.js @@ -26,6 +26,14 @@ const mmyyIntl = new Intl.DateTimeFormat("fr-FR", { year: "numeric", }); +// 07/12/2022 +const jjmmyyIntl = new Intl.DateTimeFormat("fr-FR", { + timeZone: "Europe/Paris", + day: "numeric", + month: "numeric", + year: "numeric", +}); + // 08h58 const hhmmIntl = new Intl.DateTimeFormat("fr-FR", { timeZone: "Europe/Paris", @@ -74,6 +82,14 @@ export function mmyyyy(date) { return onValidDate(date, (d) => mmyyIntl.format(d)); } +/** + * @param {String} date + * @returns {String} formatted date as JJ MM YYYY + */ +export function jjmmyyyy(date) { + return onValidDate(date, (d) => jjmmyyIntl.format(d)); +} + /** * @returns {string} */ diff --git a/src/utils/helper-notification.js b/src/utils/helper-notification.js new file mode 100644 index 00000000..46e59da4 --- /dev/null +++ b/src/utils/helper-notification.js @@ -0,0 +1,63 @@ +function excludeOldNonEngagees(notifications) { + return notifications; + + //FIXME: En attente de savoir si on gère la pagination ou pas + // const sixMonthsAgo = new Date(); + // sixMonthsAgo.setMonth(sixMonthsAgo.getMonth() - 6); + + // return notifications.filter((n) => { + // const certificationDate = new Date(n.updatedAt); + // return !(n.etatCertification === "NON ENGAGEE" && certificationDate < sixMonthsAgo); + // }); +} + +const priorityOrder = [ + "RETIREE", + "ENGAGEE", + "SUSPENDUE", + "ENGAGEE FUTUR", + "NON ENGAGEE-CHT OC", + "ARRETEE", + "NON ENGAGEE", +]; + +function sortByPriority(notifications) { + return notifications.sort((a, b) => { + const priorityA = priorityOrder.indexOf(a.etatCertification); + const priorityB = priorityOrder.indexOf(b.etatCertification); + return priorityA - priorityB; + }); +} + +function resolveConflicts(notifications) { + const groupedNotifications = {}; + + notifications.forEach((n) => { + const key = `${n.numeroBio}-${n.organismeCertificateurId}`; + if (!groupedNotifications[key]) { + groupedNotifications[key] = []; + } + groupedNotifications[key].push(n); + }); + + Object.keys(groupedNotifications).forEach((key) => { + const group = groupedNotifications[key]; + + group.sort((a, b) => { + if (a.etatCertification === b.etatCertification) { + if (a.etatCertification === "ENGAGEE" || a.etatCertification === "ARRÊTÉE") { + return new Date(b.dateDemarrage || b.dateArret) - new Date(a.dateDemarrage || a.dateArret); + } + return new Date(b.createdAt) - new Date(a.createdAt); + } + }); + }); + + return Object.values(groupedNotifications).flat(); +} + +export function filterAndSortNotifications(notifications) { + let filtered = excludeOldNonEngagees(notifications); + filtered = sortByPriority(filtered); + return resolveConflicts(filtered); +} diff --git a/src/utils/helper-notification.test.js b/src/utils/helper-notification.test.js new file mode 100644 index 00000000..34f48da2 --- /dev/null +++ b/src/utils/helper-notification.test.js @@ -0,0 +1,98 @@ +import { describe, test, expect, beforeEach } from "vitest"; + +import { filterAndSortNotifications } from "./helper-notification.js"; + +const creerNotification = ({ + productionId, + active, + updatedAt, + etatCertification, + numeroBio, + organismeCertificateurId, + dateDemarrage, + dateArret, + createdAt, +}) => ({ + productionId, + active, + updatedAt, + etatCertification, + numeroBio, + organismeCertificateurId, + dateDemarrage, + dateArret, + createdAt, +}); + +describe("filterAndSortNotifications", () => { + let notifications; + + beforeEach(() => { + notifications = [ + creerNotification({ + productionId: 1, + active: true, + updatedAt: "2024-09-12", + etatCertification: "NON ENGAGEE", + numeroBio: "123", + organismeCertificateurId: "111", + createdAt: "2024-09-12", + }), + creerNotification({ + productionId: 1, + active: true, + updatedAt: "2023-07-01", + etatCertification: "ENGAGEE", + numeroBio: "124", + organismeCertificateurId: "112", + dateDemarrage: "2023-06-01", + createdAt: "2023-06-01", + }), + creerNotification({ + productionId: 3, + active: true, + updatedAt: "2023-06-01", + etatCertification: "SUSPENDUE", + numeroBio: "123", + organismeCertificateurId: "111", + dateArret: "2023-06-01", + createdAt: "2023-05-01", + }), + creerNotification({ + productionId: 4, + active: true, + updatedAt: "2022-01-01", + etatCertification: "NON ENGAGEE", + numeroBio: "125", + organismeCertificateurId: "113", + createdAt: "2021-12-01", + }), + ]; + }); + + test("filtre les productions actives", () => { + const filtered = filterAndSortNotifications(notifications); + expect(filtered).toHaveLength(4); + }); + + //FIXME: En attente de savoir si on gère la pagination ou pas + /* + test("exclut les anciennes notifications NON ENGAGEE de plus de 6 mois", () => { + const filtered = filterAndSortNotifications(notifications); + expect(filtered).not.toContainEqual( + expect.objectContaining({ etatCertification: "NON ENGAGEE", updatedAt: "2022-01-01" }), + ); + });*/ + + test("tri par priorité", () => { + const sorted = filterAndSortNotifications(notifications); + const order = sorted.map((n) => n.etatCertification); + expect(order).toEqual(["ENGAGEE", "SUSPENDUE", "NON ENGAGEE", "NON ENGAGEE"]); + }); + + test("résout les conflits par la date de certification la plus récente", () => { + const filtered = filterAndSortNotifications(notifications); + expect(filtered[0].etatCertification).toBe("ENGAGEE"); + expect(filtered[1].etatCertification).toBe("SUSPENDUE"); + }); +});