src/app/enums/index.ts

@@ -777,15 +777,15 @@ export namespace Enums {
       },
       {
         key: StatusEnum.TO_PROCESS,
-        value: LabelTranslateEnum.toProcess,
+        value: LabelTranslateEnum.processing,
       },
       {
         key: StatusEnum.PROCESSED,
-        value: LabelTranslateEnum.processed,
+        value: LabelTranslateEnum.uploading,
       },
       {
         key: StatusEnum.READY,
-        value: LabelTranslateEnum.ready,
+        value: LabelTranslateEnum.fileUploaded,
         backgroundColorHexa: ColorHexaEnum.green,
       },
       {

src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts

@@ -675,6 +675,48 @@ export class DepositFormPresentational extends AbstractPresentational implements
     ));
 
     this.computeValidationTitleLanguage(this.formGroupFirstStepType.get(this.formDefinitionFirstStepType.subtype)?.value);
+    this._makeAbstractMandatoryForThesisAndMasters();
+  }
+
+  private _makeAbstractMandatoryForThesisAndMasters(): void {
+    this.subscribe(this.formGroupFirstStepType.get(this.formDefinitionFirstStepType.subtype).valueChanges.pipe(
+      distinctUntilChanged(),
+      tap((subType: Enums.Deposit.DepositFriendlyNameSubTypeEnum) => {
+        this._computeValidationAbstract(subType);
+      }),
+    ));
+    this._computeValidationAbstract(this.formGroupFirstStepType.get(this.formDefinitionFirstStepType.subtype)?.value);
+  }
+
+  private _computeValidationAbstract(subType: Enums.Deposit.DepositFriendlyNameSubTypeEnum): void {
+    const formArrayAbstract = this.form.get(DepositFormRuleHelper.pathAbstract) as FormArray;
+    let fcAbstract = undefined;
+    if (formArrayAbstract?.controls?.length > 0) {
+      fcAbstract = formArrayAbstract.controls[0];
+    }
+    const fcText = fcAbstract?.get(this.formDefinitionDepositFormTextLanguage.text);
+    const fcLang = fcAbstract?.get(this.formDefinitionDepositFormTextLanguage.lang);
+    if (subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.THESIS ||
+      subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.MASTER_DEGREE ||
+      subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.MASTER_OF_ADVANCED_STUDIES ||
+      subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.PRIVATE_DOCTOR_THESIS
+    ) {
+      fcText?.setValidators([SolidifyValidator, Validators.required]);
+      fcLang?.setValidators([SolidifyValidator, Validators.required]);
+    } else {
+      fcText?.setValidators([SolidifyValidator]);
+      fcLang?.setValidators([SolidifyValidator]);
+    }
+    fcText?.updateValueAndValidity();
+    fcLang?.updateValueAndValidity();
+
+    const fcLocalNumber = this.form.get(DepositFormRuleHelper.pathIdentifierLocalNumber) as FormArray;
+    if (subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.THESIS) {
+      fcLocalNumber?.setValidators([SolidifyValidator, Validators.required]);
+    } else {
+      fcLocalNumber?.setValidators([SolidifyValidator]);
+    }
+    fcLocalNumber?.updateValueAndValidity();
   }
 
   private computeValidationTitleLanguage(subType: Enums.Deposit.DepositFriendlyNameSubTypeEnum): void {

src/app/features/deposit/helpers/deposit-form-rule.helper.ts

@@ -1147,7 +1147,7 @@ export class DepositFormRuleHelper {
           return LabelTranslateEnum.reportNumber;
         }
         if (subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.THESIS) {
-          return LabelTranslateEnum.localThesis;
+          return LabelTranslateEnum.thesisNumber;
         }
         return LabelTranslateEnum.localNumber;
       case this.pathIdentifierIssn:

src/app/shared/enums/label-translate.enum.ts

@@ -270,7 +270,7 @@ export class LabelTranslateEnum {
   static startDate: string = MARK_AS_TRANSLATABLE("general.label.startDate");
   static endDate: string = MARK_AS_TRANSLATABLE("general.label.endDate");
   static reportNumber: string = MARK_AS_TRANSLATABLE("general.label.reportNumber");
-  static localThesis: string = MARK_AS_TRANSLATABLE("general.label.localThesis");
+  static thesisNumber: string = MARK_AS_TRANSLATABLE("general.label.thesisNumber");
   static itemsProcessed: string = MARK_AS_TRANSLATABLE("general.label.itemsProcessed");
   static itemsIgnored: string = MARK_AS_TRANSLATABLE("general.label.itemsIgnored");
   static itemsInError: string = MARK_AS_TRANSLATABLE("general.label.itemsInError");
@@ -545,6 +545,9 @@ export class LabelTranslateEnum {
   static inError: string = MARK_AS_TRANSLATABLE("general.status.inError");
   static toBeConfirmed: string = MARK_AS_TRANSLATABLE("general.status.toBeConfirmed");
   static confirmed: string = MARK_AS_TRANSLATABLE("general.status.confirmed");
+  static processing: string = MARK_AS_TRANSLATABLE("general.status.processing");
+  static uploading: string = MARK_AS_TRANSLATABLE("general.status.uploading");
+  static fileUploaded: string = MARK_AS_TRANSLATABLE("general.status.fileUploaded");
 
   static hide: string = MARK_AS_TRANSLATABLE("general.link.hide");
   static show: string = MARK_AS_TRANSLATABLE("general.link.show");

src/assets/i18n/de.json

@@ -843,7 +843,6 @@
       "listInvalidCharacter": "Die folgenden Sonderzeichen sind in Dateinamen nicht erlaubt: ~ ! @ # $ % ^ & * ( ) ` ; < > ? , [ ] { } \\\\",
       "listView": "Listenansicht",
       "localNumber": "general.label.localNumber",
-      "localThesis": "general.label.localThesis",
       "maintainer": "Erhaltung",
       "maintenanceInProgress": "Wartungsarbeiten im Gange",
       "makingAManualDeposit": "general.label.makingAManualDeposit",
@@ -994,6 +993,7 @@
       "thereAreNoCommentsForTheMoment": "general.label.thereAreNoCommentsForTheMoment",
       "thereAreNoCurrentOrderForArchives": "Es gibt keine aktuelle Anfrage nach Archiven",
       "thereAreNoValidatorsCommentsForTheMoment": "general.label.thereAreNoValidatorsCommentsForTheMoment",
+      "thesisNumber": "general.label.thesisNumber",
       "thisPublicationHadAtLeastOneAuthorMemberOfUnige": "general.label.thisPublicationHadAtLeastOneAuthorMemberOfUnige",
       "tilesView": "Kachel-Ansicht",
       "timeToKeep": "Archivierungsfrist",
@@ -1081,12 +1081,15 @@
     "status": {
       "cleaning": "general.status.cleaning",
       "confirmed": "general.status.confirmed",
+      "fileUploaded": "general.status.fileUploaded",
       "inError": "general.status.inError",
       "processed": "general.status.processed",
+      "processing": "general.status.processing",
       "ready": "general.status.ready",
       "received": "general.status.received",
       "toBeConfirmed": "general.status.toBeConfirmed",
-      "toProcess": "general.status.toProcess"
+      "toProcess": "general.status.toProcess",
+      "uploading": "general.status.uploading"
     },
     "validationError": {
       "invalid": "general.validationError.invalid",

src/assets/i18n/en.json

@@ -843,7 +843,6 @@
       "listInvalidCharacter": "The following special characters are not allowed in file names: ~ ! @ # $ % ^ & * ( ) ` ; < > ? , [ ] { } \\\\",
       "listView": "List view",
       "localNumber": "Local number",
-      "localThesis": "Local thesis",
       "maintainer": "Maintainer",
       "maintenanceInProgress": "Maintenance in progress",
       "makingAManualDeposit": "Create a deposit manually",
@@ -994,6 +993,7 @@
       "thereAreNoCommentsForTheMoment": "There are no comments for the moment",
       "thereAreNoCurrentOrderForArchives": "There currently aren't any archives in the download order",
       "thereAreNoValidatorsCommentsForTheMoment": "There are no validator comments at the moment",
+      "thesisNumber": "Thesis number (e.g. Med. 11032)",
       "thisPublicationHadAtLeastOneAuthorMemberOfUnige": "This publication had at least one author who was a member of the UNIGE at the time it was written.",
       "tilesView": "Tile view",
       "timeToKeep": "Time to keep (days)",
@@ -1081,12 +1081,15 @@
     "status": {
       "cleaning": "Cleaning",
       "confirmed": "Confirmed",
+      "fileUploaded": "File uploaded",
       "inError": "In error",
       "processed": "Processed",
+      "processing": "Processing",
       "ready": "Ready",
       "received": "Received",
       "toBeConfirmed": "To confirm",
-      "toProcess": "To process"
+      "toProcess": "To process",
+      "uploading": "Uploading"
     },
     "validationError": {
       "invalid": "This field is invalid",

src/assets/i18n/fr.json

@@ -843,7 +843,6 @@
       "listInvalidCharacter": "Les caractères spéciaux suivants ne sont pas autorisés dans les noms de fichiers: ~ ! @ # $ % ^ & * ( ) ` ; < > ? , [ ] { } \\\\",
       "listView": "Vue liste",
       "localNumber": "Numéro local",
-      "localThesis": "Thèse local",
       "maintainer": "Mainteneur",
       "maintenanceInProgress": "Maintenance en cours",
       "makingAManualDeposit": "Faire un dépôt manuel",
@@ -994,6 +993,7 @@
       "thereAreNoCommentsForTheMoment": "Il n'y a aucun commentaire pour le moment",
       "thereAreNoCurrentOrderForArchives": "Il y a aucune demande d'archives en cours",
       "thereAreNoValidatorsCommentsForTheMoment": "Il n'y a aucun commentaire validateur pour le moment",
+      "thesisNumber": "N° de thèse (par ex. Méd. 11032)",
       "thisPublicationHadAtLeastOneAuthorMemberOfUnige": "Ce dépôt comportait au moins un auteur membre de l'UNIGE lors de sa rédaction.",
       "tilesView": "Vue tuiles",
       "timeToKeep": "Temps de préservation (jours)",
@@ -1081,12 +1081,15 @@
     "status": {
       "cleaning": "Nettoyage",
       "confirmed": "Confirmé",
+      "fileUploaded": "Fichier chargé",
       "inError": "En erreur",
       "processed": "Traité",
+      "processing": "En traitement",
       "ready": "Prêt",
       "received": "Reçu",
       "toBeConfirmed": "À confirmer",
-      "toProcess": "À traiter"
+      "toProcess": "À traiter",
+      "uploading": "En chargement"
     },
     "validationError": {
       "invalid": "Ce champ est invalide",