From 78ff6ab60b909fc5c688c8c421624f9cfcadcd19 Mon Sep 17 00:00:00 2001 From: pilloumatou Date: Fri, 16 May 2025 15:10:39 +0200 Subject: [PATCH 1/2] Confirmation created --- src/app/components/edition/edition.component.css | 7 ++++++- src/app/components/edition/edition.component.html | 5 ++++- src/app/components/edition/edition.component.ts | 2 ++ src/assets/multilinguism.json | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/components/edition/edition.component.css b/src/app/components/edition/edition.component.css index 148ac9bbc..873bf25f9 100644 --- a/src/app/components/edition/edition.component.css +++ b/src/app/components/edition/edition.component.css @@ -235,4 +235,9 @@ .messageError { color: red; margin-left: calc(40% - 10px); -} \ No newline at end of file +} + +.messageConfirmation { + color: green; + margin-left: calc(40% - 10px); +} diff --git a/src/app/components/edition/edition.component.html b/src/app/components/edition/edition.component.html index 008c2d35f..5e12cdd37 100644 --- a/src/app/components/edition/edition.component.html +++ b/src/app/components/edition/edition.component.html @@ -43,6 +43,9 @@ {{this.multilinguism.translate("save")}}
+
+ {{this.multilinguism.translate("confirmationButtonCreated")}} +
{{this.multilinguism.translate("nameEmpty")}}
@@ -67,4 +70,4 @@ -{{this.configuration.VERSION}} \ No newline at end of file +{{this.configuration.VERSION}} diff --git a/src/app/components/edition/edition.component.ts b/src/app/components/edition/edition.component.ts index ab1e19f4c..a0cd3fe97 100644 --- a/src/app/components/edition/edition.component.ts +++ b/src/app/components/edition/edition.component.ts @@ -44,6 +44,7 @@ export class EditionComponent implements OnInit, ComponentCanDeactivate { nameEmpty = false; + isButtonBuilt:boolean = false; initialEditionState; initialdbnaryState; popstateFired = false; @@ -130,6 +131,7 @@ export class EditionComponent implements OnInit, ComponentCanDeactivate { this.indexedDBacess.update(); this.initialEditionState = Object.assign({}, this.editionService); this.initialdbnaryState = Object.assign({}, this.dbnaryService); + this.isButtonBuilt = true; } else { this.nameEmpty = true; } diff --git a/src/assets/multilinguism.json b/src/assets/multilinguism.json index fedeedc77..7ac9486c3 100644 --- a/src/assets/multilinguism.json +++ b/src/assets/multilinguism.json @@ -373,7 +373,8 @@ { "id" : "focusSelection", "FR": "Sélection par fixation", "EN": "Selection by focus"}, { "id" : "WordNameFile", "FR": "ClavierAugCom", "EN": "GridFileAugcom"}, { "id" : "WordTitle", "FR": "Clavier Augcom", "EN": "AugCom main grid"}, - { "id" : "WordFolder", "FR": "Sous Dossier", "EN": "Folder"} + { "id" : "WordFolder", "FR": "Sous Dossier", "EN": "Folder"}, + { "id" : "confirmationButtonCreated", "FR": "Bouton créé", "EN": "Button created"} ] } From 4842594eccf236622368c88ca308af21d7aa717f Mon Sep 17 00:00:00 2001 From: pilloumatou Date: Fri, 16 May 2025 16:08:31 +0200 Subject: [PATCH 2/2] change the button "save" to "validate" + when validate routing to menu keyboard --- src/app/components/edition/edition.component.html | 2 +- src/app/components/edition/edition.component.ts | 1 + src/assets/multilinguism.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/components/edition/edition.component.html b/src/app/components/edition/edition.component.html index 5e12cdd37..7a0924eaa 100644 --- a/src/app/components/edition/edition.component.html +++ b/src/app/components/edition/edition.component.html @@ -40,7 +40,7 @@
- {{this.multilinguism.translate("save")}} + {{this.multilinguism.translate("validate")}}

diff --git a/src/app/components/edition/edition.component.ts b/src/app/components/edition/edition.component.ts index a0cd3fe97..4f9a7ac42 100644 --- a/src/app/components/edition/edition.component.ts +++ b/src/app/components/edition/edition.component.ts @@ -132,6 +132,7 @@ export class EditionComponent implements OnInit, ComponentCanDeactivate { this.initialEditionState = Object.assign({}, this.editionService); this.initialdbnaryState = Object.assign({}, this.dbnaryService); this.isButtonBuilt = true; + await this.router.navigate(['keyboard']); } else { this.nameEmpty = true; } diff --git a/src/assets/multilinguism.json b/src/assets/multilinguism.json index 7ac9486c3..7a4c0f889 100644 --- a/src/assets/multilinguism.json +++ b/src/assets/multilinguism.json @@ -161,7 +161,7 @@ { "id" : "resetconfig", "FR": "Rétablir la configuration par défaut", "EN" : "Reset to default configuration"}, { "id" : "VoulezVousVraimentSupprimerLaGrille?", "FR" : "Voulez vous vraiment supprimer la grille?", "EN" : "Do you really want to delete the grid?"}, { "id" : "clearGrid", "FR" : "Vider la grille", "EN" : "Clear the grid"}, - { "id" : "validate", "FR" : "Valider", "EN" : "Validate"}, + { "id" : "validate", "FR" : "Valider", "EN" : "Validate"}, { "id": "Print", "FR" : "Exporter", "EN" : "Export"}, { "id": "Header", "FR" : "En-tête", "EN" : "Header"}, { "id": "Footer", "FR" : "Pied de page", "EN" : "Footer"},