Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 1.0-maintenance
  • 1.1-maintenance
  • 2.0-maintenance
  • 2.1-maintenance
  • adf-1032-keytitle-at-issn-service
  • adf-1212-add-forgotten-publications-to-validate-into-profile
  • adf-1259-abstract-not-mandatory-for-thesis
  • adf-1393-manage-old-thesis
  • adf-1542-disable-button-to-update-publication-in-access
  • adf-1603-remove-guide-link-from-menu
  • adf-237-structures-user-icons-in-profile
  • adf-956-new-document-types
  • adf-956-new-file-type-imprimatur-and-mode-de-diffusion-for-thesis
  • adf-aou-2036-open-aire
  • aou-1542_add_button_access_bibliography_generator
  • aou-1617_create_warning_when_contributor_are_identical
  • aou-1638_change_radio_to_checkbox
  • fpo/1040_do_not_show_multiple_action_buttons_when_only_one_deposit_is_selected
  • fpo/263_flatten_the_json_format_used_by_the_frontend
  • fpo/avoid_infinite_login_loop
  • fpo/components_in_solidify
  • fpo/dark_mode_refactor
  • hbo-test
  • hbo_fix_dont_run_twice_http_request_autocomplete
  • jbc-new-icons
  • master
  • rodn-1767-access-level-images
  • rodn-1829-scheduled-task-to-export-to-orcid
  • rodn-admin-user-business-roles
  • rodn-labels-refactoring
  • rodn-logout-refactoring
  • rodn-rename-form-data
  • aou-0.0.1
  • aou-0.0.2
  • aou-0.0.3
  • aou-0.0.4
  • aou-0.0.5
  • aou-1.0.0
  • aou-1.0.1
  • aou-1.0.2
  • aou-1.0.3
  • aou-1.0.4
  • aou-1.0.5
  • aou-1.0.6
  • aou-1.1.0
  • aou-1.1.1
  • aou-1.1.2
  • aou-1.2.0-RC1
  • aou-1.2.0-RC2
  • aou-1.2.0-RC3
  • aou-1.2.0-alpha1
  • aou-2.0.0
  • aou-2.0.1
  • aou-2.0.2
  • aou-2.0.3
  • aou-2.0.4
  • aou-2.0.5
  • aou-2.0.6
  • aou-2.0.7
  • aou-2.1.0
  • aou-2.1.1
  • aou-2.1.2
  • aou-2.1.3
  • aou-2.1.4
  • aou-2.1.5
  • aou-2.1.6
  • aou-2.1.7
  • aou-2.2.0
  • aou-2.2.1
  • aou-2.2.2
70 results

Target

Select target project
  • aou/aou-portal
1 result
Select Git revision
  • 1.0-maintenance
  • 1.1-maintenance
  • 2.0-maintenance
  • 2.1-maintenance
  • adf-1032-keytitle-at-issn-service
  • adf-1212-add-forgotten-publications-to-validate-into-profile
  • adf-1259-abstract-not-mandatory-for-thesis
  • adf-1393-manage-old-thesis
  • adf-1542-disable-button-to-update-publication-in-access
  • adf-1603-remove-guide-link-from-menu
  • adf-237-structures-user-icons-in-profile
  • adf-956-new-document-types
  • adf-956-new-file-type-imprimatur-and-mode-de-diffusion-for-thesis
  • adf-aou-2036-open-aire
  • aou-1542_add_button_access_bibliography_generator
  • aou-1617_create_warning_when_contributor_are_identical
  • aou-1638_change_radio_to_checkbox
  • fpo/1040_do_not_show_multiple_action_buttons_when_only_one_deposit_is_selected
  • fpo/263_flatten_the_json_format_used_by_the_frontend
  • fpo/avoid_infinite_login_loop
  • fpo/components_in_solidify
  • fpo/dark_mode_refactor
  • hbo-test
  • hbo_fix_dont_run_twice_http_request_autocomplete
  • jbc-new-icons
  • master
  • rodn-1767-access-level-images
  • rodn-1829-scheduled-task-to-export-to-orcid
  • rodn-admin-user-business-roles
  • rodn-labels-refactoring
  • rodn-logout-refactoring
  • rodn-rename-form-data
  • aou-0.0.1
  • aou-0.0.2
  • aou-0.0.3
  • aou-0.0.4
  • aou-0.0.5
  • aou-1.0.0
  • aou-1.0.1
  • aou-1.0.2
  • aou-1.0.3
  • aou-1.0.4
  • aou-1.0.5
  • aou-1.0.6
  • aou-1.1.0
  • aou-1.1.1
  • aou-1.1.2
  • aou-1.2.0-RC1
  • aou-1.2.0-RC2
  • aou-1.2.0-RC3
  • aou-1.2.0-alpha1
  • aou-2.0.0
  • aou-2.0.1
  • aou-2.0.2
  • aou-2.0.3
  • aou-2.0.4
  • aou-2.0.5
  • aou-2.0.6
  • aou-2.0.7
  • aou-2.1.0
  • aou-2.1.1
  • aou-2.1.2
  • aou-2.1.3
  • aou-2.1.4
  • aou-2.1.5
  • aou-2.1.6
  • aou-2.1.7
  • aou-2.2.0
  • aou-2.2.1
  • aou-2.2.2
70 results
Show changes
Commits on Source (2)
......@@ -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,
},
{
......
......@@ -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 {
......
......@@ -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:
......
......@@ -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");
......
......@@ -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",
......
......@@ -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",
......
......@@ -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",
......