front: fix date translations in study page

Signed-off-by: Alice Khoudli <[email protected]>

Author: Synar

front/public/locales/en/operationalStudies/study.json

@@ -4,10 +4,10 @@
   "createScenario": "Create a scenario",
   "dates": {
     "creation": "Creation",
-    "estimatedend": "Expected ending",
+    "expectedEnd": "Expected end",
     "modified": "Updated",
-    "realend": "Real end",
-    "start": "Started"
+    "realEnd": "Real end",
+    "start": "Start"
   },
   "deleteScenarios": "Delete",
   "deleteItems": "Delete",
@@ -58,7 +58,7 @@
   "studyDescription": "Description",
   "studyDescriptionInvalid": "The description for the study must not exceed 1024 characters",
   "studyDescriptionPlaceholder": "Short description of the study",
-  "studyEstimatedEndDate": "Expected end date",
+  "studyExpectedEndDate": "Expected end date",
   "studyModificationTitle": "Edit a study",
   "studyModifyButton": "Save",
   "studyName": "Study name",

front/public/locales/fr/operationalStudies/study.json

@@ -4,9 +4,9 @@
   "createScenario": "Créer un scénario",
   "dates": {
     "creation": "Création",
-    "estimatedend": "Fin estimée",
+    "expectedEnd": "Fin estimée",
     "modified": "Modification",
-    "realend": "Fin réelle",
+    "realEnd": "Fin réelle",
     "start": "Début"
   },
   "confirmDeleteMessage": "Voulez-vous supprimer le scénario ?",
@@ -57,7 +57,7 @@
   "studyDescription": "Description",
   "studyDescriptionInvalid": "La description de l'étude ne doit pas dépasser 1024 caractères",
   "studyDescriptionPlaceholder": "Courte description de l'étude",
-  "studyEstimatedEndDate": "Fin estimée",
+  "studyExpectedEndDate": "Fin estimée",
   "studyModificationTitle": "Modifier une étude",
   "studyModifyButton": "Enregistrer",
   "studyName": "Nom de l'étude",

front/src/applications/operationalStudies/views/Study.tsx

@@ -232,14 +232,14 @@ const Study = () => {
                 />
                 <DateBox
                   date={study.expected_end_date ? new Date(study.expected_end_date) : null}
-                  className="estimatedend"
-                  translation="estimatedend"
+                  className="expected-end"
+                  translation="expectedEnd"
                   withoutTime
                 />
                 <DateBox
                   date={study.actual_end_date ? new Date(study.actual_end_date) : null}
-                  className="realend"
-                  translation="realend"
+                  className="real-end"
+                  translation="realEnd"
                   withoutTime
                 />
                 <DateBox

front/src/modules/study/components/AddOrEditStudyModal.tsx

@@ -336,15 +336,15 @@ const AddOrEditStudyModal = ({ editionMode, study, scenarios }: AddOrEditStudyMo
               max={getEarliestDate(currentStudy?.expected_end_date, currentStudy?.actual_end_date)}
             />
             <InputSNCF
-              id="studyInputEstimatedEndDate"
+              id="studyInputExpectedEndDate"
               type="date"
-              name="studyInputEstimatedEndDate"
+              name="studyInputExpectedEndDate"
               label={
                 <div className="d-flex align-items-center">
                   <span className="mr-2 text-warning">
                     <RiCalendarLine />
                   </span>
-                  {t('studyEstimatedEndDate')}
+                  {t('studyExpectedEndDate')}
                 </div>
               }
               value={formatDateForInput(currentStudy?.expected_end_date)}

front/src/styles/scss/applications/operationalStudies/_study.scss

@@ -36,10 +36,10 @@
         &.start {
           border-color: var(--green);
         }
-        &.estimatedend {
+        &.expected-end {
           border-color: var(--yellow);
         }
-        &.realend {
+        &.real-end {
           border-color: var(--orange);
         }
       }

front/tests/003-study-management.spec.ts

@@ -45,7 +45,7 @@ test.describe('Validate the Study creation workflow', () => {
       type: translations.studyCategories.flowRate, // Translated study type
       status: translations.studyStates.started, // Translated study status
       startDate: todayDateISO,
-      estimatedEndDate: todayDateISO,
+      expectedEndDate: todayDateISO,
       endDate: todayDateISO,
       serviceCode: studyData.service_code,
       businessCode: studyData.business_code,
@@ -60,7 +60,7 @@ test.describe('Validate the Study creation workflow', () => {
       type: translations.studyCategories.flowRate,
       status: translations.studyStates.started,
       startDate: expectedDate,
-      estimatedEndDate: expectedDate,
+      expectedEndDate: expectedDate,
       endDate: expectedDate,
       serviceCode: studyData.service_code,
       businessCode: studyData.business_code,
@@ -87,7 +87,7 @@ test.describe('Validate the Study creation workflow', () => {
       type: translations.studyCategories.operability,
       status: translations.studyStates.inProgress,
       startDate: tomorrowDateISO,
-      estimatedEndDate: tomorrowDateISO,
+      expectedEndDate: tomorrowDateISO,
       endDate: tomorrowDateISO,
       serviceCode: 'A1230',
       businessCode: 'B1230',
@@ -106,7 +106,7 @@ test.describe('Validate the Study creation workflow', () => {
       type: translations.studyCategories.operability,
       status: translations.studyStates.inProgress,
       startDate: expectedDate,
-      estimatedEndDate: expectedDate,
+      expectedEndDate: expectedDate,
       endDate: expectedDate,
       serviceCode: 'A1230',
       businessCode: 'B1230',

front/tests/pages/study-page-model.ts

@@ -9,7 +9,7 @@ type StudyDetails = {
   type: string;
   status: string;
   startDate: string;
-  estimatedEndDate: string;
+  expectedEndDate: string;
   endDate: string;
   serviceCode: string;
   businessCode: string;
@@ -50,7 +50,7 @@ class StudyPage extends CommonPage {
 
   readonly studyStartDateInput: Locator;
 
-  readonly studyEstimatedEndDateInput: Locator;
+  readonly studyExpectedEndDateInput: Locator;
 
   readonly studyEndDateInput: Locator;
 
@@ -68,7 +68,7 @@ class StudyPage extends CommonPage {
 
   readonly startDate: Locator;
 
-  readonly estimatedEndDate: Locator;
+  readonly expectedEndDate: Locator;
 
   readonly realEndDate: Locator;
 
@@ -91,7 +91,7 @@ class StudyPage extends CommonPage {
     );
     this.studyDescriptionInput = page.locator('#studyDescription');
     this.studyStartDateInput = page.locator('#studyInputStartDate');
-    this.studyEstimatedEndDateInput = page.locator('#studyInputEstimatedEndDate');
+    this.studyExpectedEndDateInput = page.locator('#studyInputExpectedEndDate');
     this.studyEndDateInput = page.locator('#studyInputRealEndDate');
     this.studyServiceCodeInput = page.locator('#studyInputServiceCode');
     this.studyBusinessCodeInput = page.locator('#studyInputBusinessCode');
@@ -103,11 +103,11 @@ class StudyPage extends CommonPage {
     this.startDate = page.locator(
       '.study-details-dates-date.start .study-details-dates-date-value'
     );
-    this.estimatedEndDate = page.locator(
-      '.study-details-dates-date.estimatedend .study-details-dates-date-value'
+    this.expectedEndDate = page.locator(
+      '.study-details-dates-date.expected-end .study-details-dates-date-value'
     );
     this.realEndDate = page.locator(
-      '.study-details-dates-date.realend .study-details-dates-date-value'
+      '.study-details-dates-date.real-end .study-details-dates-date-value'
     );
   }
 
@@ -119,7 +119,7 @@ class StudyPage extends CommonPage {
       type,
       status,
       startDate,
-      estimatedEndDate,
+      expectedEndDate,
       endDate,
       serviceCode,
       businessCode,
@@ -131,7 +131,7 @@ class StudyPage extends CommonPage {
     await this.setStudyTypeByText(type);
     await this.setStudyStatusByText(status);
     await this.studyStartDateInput.fill(startDate);
-    await this.studyEstimatedEndDateInput.fill(estimatedEndDate);
+    await this.studyExpectedEndDateInput.fill(expectedEndDate);
     await this.studyEndDateInput.fill(endDate);
     await this.studyServiceCodeInput.fill(serviceCode);
     await this.studyBusinessCodeInput.fill(businessCode);
@@ -164,7 +164,7 @@ class StudyPage extends CommonPage {
       type,
       status,
       startDate,
-      estimatedEndDate,
+      expectedEndDate,
       endDate,
       serviceCode,
       businessCode,
@@ -176,7 +176,7 @@ class StudyPage extends CommonPage {
     await expect(this.studyEditionModal).not.toBeVisible();
     await expect(this.studyName).toHaveText(name);
     await expect(this.startDate).toHaveText(startDate);
-    await expect(this.estimatedEndDate).toHaveText(estimatedEndDate);
+    await expect(this.expectedEndDate).toHaveText(expectedEndDate);
     await expect(this.realEndDate).toHaveText(endDate);
     await expect(this.studyDescription).toHaveText(description);
     await expect(this.studyType).toHaveText(type);