Skip to content

Add confirmation in edit menu #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Noars merged 3 commits into from
May 20, 2025
Merged

Add confirmation in edit menu #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78ff6ab
Confirmation created
PillouMatou May 16, 2025
4842594
change the button "save" to "validate" + when validate routing to men…
PillouMatou May 16, 2025
23f7baa
Merge branch 'master' into addConfirmationInEditMenu
PillouMatou May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/app/components/edition/edition.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,9 @@
.messageError {
color: red;
margin-left: calc(40% - 10px);
}
}

.messageConfirmation {
color: green;
margin-left: calc(40% - 10px);
}
7 changes: 5 additions & 2 deletions src/app/components/edition/edition.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@
</div>

<div class="save centerText floatLeft" (click)="this.save()">
{{this.multilinguism.translate("save")}}
{{this.multilinguism.translate("validate")}}
</div>
<br>
<div *ngIf="isButtonBuilt" class="messageConfirmation floatLeft">
{{this.multilinguism.translate("confirmationButtonCreated")}}
</div>
<div *ngIf="nameEmpty" class="messageError floatLeft">
{{this.multilinguism.translate("nameEmpty")}}
</div>
Expand All @@ -67,4 +70,4 @@
</ng-container>
</div>
</div>
{{this.configuration.VERSION}}
{{this.configuration.VERSION}}
3 changes: 3 additions & 0 deletions src/app/components/edition/edition.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export class EditionComponent implements OnInit, ComponentCanDeactivate {


nameEmpty = false;
isButtonBuilt:boolean = false;
initialEditionState; initialdbnaryState;
popstateFired = false;

Expand Down Expand Up @@ -130,6 +131,8 @@ export class EditionComponent implements OnInit, ComponentCanDeactivate {
this.indexedDBacess.update();
this.initialEditionState = Object.assign({}, this.editionService);
this.initialdbnaryState = Object.assign({}, this.dbnaryService);
this.isButtonBuilt = true;
await this.router.navigate(['keyboard']);
} else {
this.nameEmpty = true;
}
Expand Down
3 changes: 2 additions & 1 deletion src/assets/multilinguism.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,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"},
Expand Down Expand Up @@ -375,6 +375,7 @@
{ "id" : "WordNameFile", "FR": "ClavierAugCom", "EN": "GridFileAugcom"},
{ "id" : "WordTitle", "FR": "Clavier Augcom", "EN": "AugCom main grid"},
{ "id" : "WordFolder", "FR": "Sous Dossier", "EN": "Folder"},
{ "id" : "confirmationButtonCreated", "FR": "Bouton créé", "EN": "Button created"},
{ "id" : "OpenTheFolder", "FR": "Ouvre le dossier", "EN": "Open the folder"},
{ "id" : "functionDescription", "FR": "L'élément créé sera un bouton qui effectue des actions", "EN": "The element created will be a button that performs the following actions"},
{ "id" : "Retour", "FR": "Retour", "EN": "Back"},
Expand Down