Skip to content

Commit

Permalink
Merge pull request #158 from edissyum/2.x
Browse files Browse the repository at this point in the history
Add input duplication and fix form duplication
  • Loading branch information
nathan30 authored May 17, 2022
2 parents a7a602b + 901a827 commit 39e0499
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 12 deletions.
5 changes: 5 additions & 0 deletions dist/assets/i18n/frontend/eng.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@
"duplicate": "Duplicate form",
"enable": "Enable form",
"form_deleted": "Form deleted successfully",
"form_disabled": "Form disabled successfully",
"form_duplicated": "Form duplicated successfully",
"form_enabled": "Form enabled successfully",
"input_metadata": "Input metadata",
"input_settings": "Inputs",
"inputs_list_already_linked": "The following inputs are linked to this form <br><br> <b><center>{{ inputsList }}</center></b> <br> Please choose a new form for this inputs",
Expand Down Expand Up @@ -369,6 +372,7 @@
"duplicate": "Duplicate input",
"incron_and_script_updated": "Incron and script updated successfully",
"input_deleted": "Input deleted sucessfully",
"input_duplicated": "Input duplicated successfully",
"input_folder": "Document capture path",
"input_folder_header": "Path",
"no_separation": "No separation",
Expand Down Expand Up @@ -419,6 +423,7 @@
"no_output_configured": "No output configured",
"no_parameters_necessary": "No specific parameters necessary",
"output_deleted": "Output deleted successfully",
"output_duplicated": "Output duplicated successfully",
"output_settings_list": "Settings of outputs",
"output_updated": "Output updated successfully",
"parameters": "Specific",
Expand Down
9 changes: 7 additions & 2 deletions dist/assets/i18n/frontend/fra.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,10 @@
"disable": "Désactiver le formulaire",
"duplicate": "Dupliquer le formulaire",
"enable": "Activer le formulaire",
"form_deleted": "Formulaire supprimé",
"form_deleted": "Formulaire supprimé avec succès",
"form_disabled": "Formulaire désactivé avec succès",
"form_duplicated": "Formulaire dupliqué avec succès",
"form_enabled": "Formulaire activé avec succès",
"input_metadata": "Métadonnées de champs",
"input_settings": "Chaînes entrantes",
"inputs_list_already_linked": "Les chaînes entrante suivantes sont liés à ce formulaire <br><br> <b><center>{{ inputsList }}</center></b> <br> Merci de choisir un nouveau formulaire pour ces chaînes entrantes",
Expand Down Expand Up @@ -369,6 +372,7 @@
"duplicate": "Dupliquer la chaîne entrante",
"incron_and_script_updated": "Script et incron mis à jour",
"input_deleted": "Chaîne entrante supprimée",
"input_duplicated": "Chaîne entrante dupliquée avec succès",
"input_folder": "Chemin de capture des documents",
"input_folder_header": "Chemin",
"no_separation": "Pas de séparation",
Expand Down Expand Up @@ -418,7 +422,8 @@
"no_compress": "Pas de compression",
"no_output_configured": "Aucune chaîne sortante n'est configurée",
"no_parameters_necessary": "Pas de paramètres de spécifiques nécessaire",
"output_deleted": "Chaîne sortante supprimée",
"output_deleted": "Chaîne sortante supprimée avec succès",
"output_duplicated": "Chaîne sortante dupliquée avec succès",
"output_settings_list": "Paramètres de la chaîne sortante",
"output_updated": "Chaîne sortante mis à jour avec succès",
"parameters": "Spécifiques",
Expand Down
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
</div>
</div>
</app-root>
<script src="runtime.a2cfca241c90b7b0.js" type="module"></script><script src="polyfills.30e54e464426fd44.js" type="module"></script><script src="scripts.22b8e68e689977d1.js" defer></script><script src="main.984764ce7f14680d.js" type="module"></script>
<script src="runtime.a2cfca241c90b7b0.js" type="module"></script><script src="polyfills.30e54e464426fd44.js" type="module"></script><script src="scripts.22b8e68e689977d1.js" defer></script><script src="main.b530f99014509926.js" type="module"></script>

</body></html>

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/assets/i18n/frontend/eng.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@
"duplicate": "Duplicate form",
"enable": "Enable form",
"form_deleted": "Form deleted successfully",
"form_disabled": "Form disabled successfully",
"form_duplicated": "Form duplicated successfully",
"form_enabled": "Form enabled successfully",
"input_metadata": "Input metadata",
"input_settings": "Inputs",
"inputs_list_already_linked": "The following inputs are linked to this form <br><br> <b><center>{{ inputsList }}</center></b> <br> Please choose a new form for this inputs",
Expand Down Expand Up @@ -369,6 +372,7 @@
"duplicate": "Duplicate input",
"incron_and_script_updated": "Incron and script updated successfully",
"input_deleted": "Input deleted sucessfully",
"input_duplicated": "Input duplicated successfully",
"input_folder": "Document capture path",
"input_folder_header": "Path",
"no_separation": "No separation",
Expand Down Expand Up @@ -419,6 +423,7 @@
"no_output_configured": "No output configured",
"no_parameters_necessary": "No specific parameters necessary",
"output_deleted": "Output deleted successfully",
"output_duplicated": "Output duplicated successfully",
"output_settings_list": "Settings of outputs",
"output_updated": "Output updated successfully",
"parameters": "Specific",
Expand Down
9 changes: 7 additions & 2 deletions src/assets/i18n/frontend/fra.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,10 @@
"disable": "Désactiver le formulaire",
"duplicate": "Dupliquer le formulaire",
"enable": "Activer le formulaire",
"form_deleted": "Formulaire supprimé",
"form_deleted": "Formulaire supprimé avec succès",
"form_disabled": "Formulaire désactivé avec succès",
"form_duplicated": "Formulaire dupliqué avec succès",
"form_enabled": "Formulaire activé avec succès",
"input_metadata": "Métadonnées de champs",
"input_settings": "Chaînes entrantes",
"inputs_list_already_linked": "Les chaînes entrante suivantes sont liés à ce formulaire <br><br> <b><center>{{ inputsList }}</center></b> <br> Merci de choisir un nouveau formulaire pour ces chaînes entrantes",
Expand Down Expand Up @@ -369,6 +372,7 @@
"duplicate": "Dupliquer la chaîne entrante",
"incron_and_script_updated": "Script et incron mis à jour",
"input_deleted": "Chaîne entrante supprimée",
"input_duplicated": "Chaîne entrante dupliquée avec succès",
"input_folder": "Chemin de capture des documents",
"input_folder_header": "Chemin",
"no_separation": "Pas de séparation",
Expand Down Expand Up @@ -418,7 +422,8 @@
"no_compress": "Pas de compression",
"no_output_configured": "Aucune chaîne sortante n'est configurée",
"no_parameters_necessary": "Pas de paramètres de spécifiques nécessaire",
"output_deleted": "Chaîne sortante supprimée",
"output_deleted": "Chaîne sortante supprimée avec succès",
"output_duplicated": "Chaîne sortante dupliquée avec succès",
"output_settings_list": "Paramètres de la chaîne sortante",
"output_updated": "Chaîne sortante mis à jour avec succès",
"parameters": "Spécifiques",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export class SplitterFormListComponent implements OnInit {
this.http.post(API_URL + '/ws/forms/duplicate/' + formId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-form'));
this.notify.success(this.translate.instant('FORMS.form_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand All @@ -224,6 +224,7 @@ export class SplitterFormListComponent implements OnInit {
this.http.put(API_URL + '/ws/forms/disable/' + formId, null, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('FORMS.form_disabled'));
}),
catchError((err: any) => {
console.debug(err);
Expand All @@ -239,6 +240,7 @@ export class SplitterFormListComponent implements OnInit {
this.http.put(API_URL + '/ws/forms/enable/' + formId, null, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('FORMS.form_enabled'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export class SplitterInputListComponent implements OnInit {
this.http.post(API_URL + '/ws/inputs/duplicate/' + inputId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadInputs();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-input'));
this.notify.success(this.translate.instant('INPUT.input_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class SplitterOutputListComponent implements OnInit {
this.http.post(API_URL + '/ws/outputs/duplicate/' + outputId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadOutputs();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-output'));
this.notify.success(this.translate.instant('OUTPUT.output_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export class FormListComponent implements OnInit {
this.http.post(API_URL + '/ws/forms/duplicate/' + formId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-form'));
this.notify.success(this.translate.instant('FORMS.form_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand All @@ -284,6 +284,7 @@ export class FormListComponent implements OnInit {
this.http.put(API_URL + '/ws/forms/disable/' + formId, null, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('FORMS.form_disabled'));
}),
catchError((err: any) => {
console.debug(err);
Expand All @@ -299,6 +300,7 @@ export class FormListComponent implements OnInit {
this.http.put(API_URL + '/ws/forms/enable/' + formId, null, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadForms();
this.notify.success(this.translate.instant('FORMS.form_enabled'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export class InputsListComponent implements OnInit {
this.http.post(API_URL + '/ws/inputs/duplicate/' + inputId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadInputs();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-input'));
this.notify.success(this.translate.instant('INPUT.input_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export class OutputsListComponent implements OnInit {
this.http.post(API_URL + '/ws/outputs/duplicate/' + outputId, {}, {headers: this.authService.headers}).pipe(
tap(() => {
this.loadOutputs();
this.notify.success(this.translate.instant('HISTORY-DESC.duplicate-output'));
this.notify.success(this.translate.instant('OUTPUT.output_duplicated'));
}),
catchError((err: any) => {
console.debug(err);
Expand Down

0 comments on commit 39e0499

Please sign in to comment.