diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php index bfb5a716f48a751a832de4edfad6ee023c4c5b98..b98d02c2c2a4ec6c397cdcd51d0f4fa07dce1ee1 100755 --- a/apps/maarch_entreprise/lang/en.php +++ b/apps/maarch_entreprise/lang/en.php @@ -3971,8 +3971,8 @@ if (!defined('_PROCEED_WORKFLOW')) { if (!defined('_INTERRUPT_WORKFLOW')) { define('_INTERRUPT_WORKFLOW', 'Break the visa flow'); } -if (!defined('_REJECTION_WORKFLOW_REDACTOR')) { - define('_REJECTION_WORKFLOW_REDACTOR', 'Visa rejection - back to the author'); +if (!defined('_RESET_VISA_WORKFLOW')) { + define('_RESET_VISA_WORKFLOW', 'Reset visa workflow'); } if (!defined('_REJECTION_WORKFLOW_PREVIOUS')) { define('_REJECTION_WORKFLOW_PREVIOUS', 'Visa rejection - back to the previous author'); diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php index fe56b3b59f8add8d64dbf31e37a92660bfa63a04..2be1376672a9aa55d2fe729348dce7da3a32ee29 100755 --- a/apps/maarch_entreprise/lang/fr.php +++ b/apps/maarch_entreprise/lang/fr.php @@ -4019,11 +4019,11 @@ if (!defined('_INTERRUPT_WORKFLOW')) { if (!defined('_INTERRUPT_WORKFLOW_DESC')) { define('_INTERRUPT_WORKFLOW_DESC', "Met à jour la date du visa de l'actuel viseur / signataire et de tous les viseurs suivant présents dans le circuit de visa du courrier ('process_date' de la table listinstance). Insère également un message d'interruption sur le viseur actuel ('process_comment' de la table listinstance)."); } -if (!defined('_REJECTION_WORKFLOW_REDACTOR')) { - define('_REJECTION_WORKFLOW_REDACTOR', 'Refuser le visa - retour rédacteur'); +if (!defined('_RESET_VISA_WORKFLOW')) { + define('_RESET_VISA_WORKFLOW', 'Réinitialiser le circuit de visa'); } -if (!defined('_REJECTION_WORKFLOW_REDACTOR_DESC')) { - define('_REJECTION_WORKFLOW_REDACTOR_DESC', "Réinitialise la date de visa de tous les viseurs présents dans le circuit de visa du courrier ('process_date' de la table listinstance)."); +if (!defined('_RESET_VISA_WORKFLOW_DESC')) { + define('_RESET_VISA_WORKFLOW_DESC', "Réinitialise la date de visa de tous les viseurs présents dans le circuit de visa du courrier ('process_date' de la table listinstance)."); } if (!defined('_REJECTION_WORKFLOW_PREVIOUS')) { define('_REJECTION_WORKFLOW_PREVIOUS', 'Refuser le visa - retour au précédent viseur'); diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php index 7ad8a7314124ddb588a38a3e901d0fc2c8048354..b2da828c8802b0433122f967b185f7686191f719 100755 --- a/apps/maarch_entreprise/lang/nl.php +++ b/apps/maarch_entreprise/lang/nl.php @@ -1286,8 +1286,8 @@ if (!defined('_PROCEED_WORKFLOW')) { define('_PROCEED_WORKFLOW', 'Het goedkeurin if (!defined('_PROCEED_WORKFLOW_DESC')) { define('_PROCEED_WORKFLOW_DESC', 'Werkt de datum bij van de huidige goedkeurder / ondertekenaar die in het goedkeuringscircuit van het brief aanwezig is (process_date van de tabel listinstance).');} if (!defined('_INTERRUPT_WORKFLOW')) { define('_INTERRUPT_WORKFLOW', 'Het goedkeuringscircuit onderbreken');} if (!defined('_INTERRUPT_WORKFLOW_DESC')) { define('_INTERRUPT_WORKFLOW_DESC', 'Werkt de datum bij van de huidige goedkeurder / ondertekenaar en van alle volgende goedkeurders die in het goedkeuringscircuit van het brief aanwezig zijn (process_date van de tabel listinstance). Voegt eveneens een onderbrekingsbericht op de huidige goedkeurder in (process_comment van de tabel listinstance).');} -if (!defined('_REJECTION_WORKFLOW_REDACTOR')) { define('_REJECTION_WORKFLOW_REDACTOR', 'Goedkeuring weigeren - terug naar opsteller');} -if (!defined('_REJECTION_WORKFLOW_REDACTOR_DESC')) { define('_REJECTION_WORKFLOW_REDACTOR_DESC', 'Reset de datum van alle huidige goedkeurders die in het goedkeuringscircuit van het brief aanwezig zijn (process_date van de tabel listinstance).');} +if (!defined('_RESET_VISA_WORKFLOW')) { define('_RESET_VISA_WORKFLOW', 'Goedkeuring weigeren - terug naar opsteller');} +if (!defined('_RESET_VISA_WORKFLOW_DESC')) { define('_RESET_VISA_WORKFLOW_DESC', 'Reset de datum van alle huidige goedkeurders die in het goedkeuringscircuit van het brief aanwezig zijn (process_date van de tabel listinstance).');} if (!defined('_REJECTION_WORKFLOW_PREVIOUS')) { define('_REJECTION_WORKFLOW_PREVIOUS', 'De goedkeuring weigeren - terug naar de vorige goedkeurder');} if (!defined('_REJECTION_WORKFLOW_PREVIOUS_DESC')) { define('_REJECTION_WORKFLOW_PREVIOUS_DESC', 'Reset de datum van de vorige goedkeurder die in het goedkeuringscircuit van het brief aanwezig is (process_date van de tabel listinstance).');} if (!defined('_VISA_MAIL')) { define('_VISA_MAIL', 'De e-mail goedkeuren');} diff --git a/core/xml/actions_pages.xml b/core/xml/actions_pages.xml index 638bb0a168862c71932bef8b0d293096163eb875..70aeb2d2b75913d80134fdd5c16c0d6029bbca42 100755 --- a/core/xml/actions_pages.xml +++ b/core/xml/actions_pages.xml @@ -278,10 +278,10 @@ An action page is described in a ACTIONPAGE tag : </ACTIONPAGE> <ACTIONPAGE> <ID>rejection_visa_redactor</ID> - <LABEL>_REJECTION_WORKFLOW_REDACTOR</LABEL> + <LABEL>_RESET_VISA_WORKFLOW</LABEL> <NAME>rejection_visa_redactor</NAME> - <DESC>_REJECTION_WORKFLOW_REDACTOR_DESC</DESC> - <component>rejectVisaBackToRedactorAction</component> + <DESC>_RESET_VISA_WORKFLOW_DESC</DESC> + <component>resetVisaAction</component> <ORIGIN>module</ORIGIN> <MODULE>visa</MODULE> <FLAG_CREATE>false</FLAG_CREATE> diff --git a/migration/20.03/2003.sql b/migration/20.03/2003.sql index 9233567a736687189ea2c6b109aca59e3d92f59b..3a0aac3cd3340934ad64e2d5dfe9521099e719dd 100644 --- a/migration/20.03/2003.sql +++ b/migration/20.03/2003.sql @@ -88,7 +88,7 @@ DELETE FROM actions WHERE component = 'viewDoc' OR action_page in ('view', 'vali UPDATE actions SET component = 'rejectVisaBackToPreviousAction' WHERE action_page = 'rejection_visa_previous'; UPDATE actions SET component = 'redirectInitiatorEntityAction' WHERE action_page = 'redirect_visa_entity'; UPDATE actions SET component = 'rejectVisaBackToPreviousAction' WHERE action_page = 'rejection_visa_previous'; -UPDATE actions SET component = 'rejectVisaBackToRedactorAction' WHERE action_page = 'rejection_visa_redactor'; +UPDATE actions SET component = 'resetVisaAction' WHERE action_page = 'rejection_visa_redactor'; UPDATE actions SET component = 'interruptVisaAction' WHERE action_page = 'interrupt_visa'; UPDATE actions SET component = 'sendSignatureBookAction' WHERE action_page IN ('send_to_visa', 'send_signed_docs'); UPDATE actions SET component = 'continueVisaCircuitAction' WHERE action_page = 'visa_workflow'; diff --git a/src/app/action/controllers/ActionMethodController.php b/src/app/action/controllers/ActionMethodController.php index 38995fe9f483c2df234ecafbcbcb07a18d394474..db8d2206eff6f42c90273b07a0b8b8e6ed1f2d86 100644 --- a/src/app/action/controllers/ActionMethodController.php +++ b/src/app/action/controllers/ActionMethodController.php @@ -56,7 +56,7 @@ class ActionMethodController 'rejectVisaBackToPrevious' => 'rejectVisaBackToPrevious', 'redirectInitiatorEntityAction' => 'redirectInitiatorEntityAction', 'rejectVisaBackToPreviousAction' => 'rejectVisaBackToPrevious', - 'rejectVisaBackToRedactorAction' => 'rejectVisaBackToRedactor', + 'resetVisaAction' => 'resetVisa', 'interruptVisaAction' => 'interruptVisa', 'sendToAvisAction' => 'sendToAvis', 'continueOpinionCircuitAction' => 'continueOpinionCircuit', @@ -458,7 +458,7 @@ class ActionMethodController return true; } - public static function rejectVisaBackToRedactor(array $args) + public static function resetVisa(array $args) { ValidatorModel::notEmpty($args, ['resId']); ValidatorModel::intVal($args, ['resId']); diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php index 27eb075a3e462bc1ee517c1f24878636fa99de43..693b3d3c49e4de1ef28f75aeed4a4caf9b6fb365 100755 --- a/src/core/lang/lang-en.php +++ b/src/core/lang/lang-en.php @@ -248,8 +248,8 @@ define('_SEND_TO_VISA', 'send for visa'); define('_SEND_TO_VISA_DESC', 'Check if visa circuit is setup AND if one or several responses project are linked to mail.'); define('_REJECTION_WORKFLOW_PREVIOUS', 'Visa rejection - back to the previous author'); define('_REJECTION_WORKFLOW_PREVIOUS_DESC', 'Reset visa date of previous supervisor in visa circuit of mail (\'process_date\' of listinstance table).'); -define('_REJECTION_WORKFLOW_REDACTOR', 'Visa rejection - back to the author'); -define('_REJECTION_WORKFLOW_REDACTOR_DESC', 'Reset visa date of all supervisor in visa circuit of mail (\'process_date\' of listinstance table).'); +define('_RESET_VISA_WORKFLOW', 'Reset visa workflow'); +define('_RESET_VISA_WORKFLOW_DESC', 'Reset visa date of all supervisor in visa circuit of mail (\'process_date\' of listinstance table).'); define('_REDIRECT_WORKFLOW_ENTITY', 'Back to the initiator entity'); define('_REDIRECT_WORKFLOW_ENTITY_DESC', 'Back the mail to the initiator entity.'); define('_INTERRUPT_WORKFLOW', 'Break the visa flow'); diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index 0cb04b3154ac762cf7bfc2b8abcdca407ac36664..c5e5773512332d49c02de05bf5b778c3059bf417 100755 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -248,8 +248,8 @@ define('_SEND_TO_VISA', 'Envoyer pour visa'); define('_SEND_TO_VISA_DESC', 'Contrôle si un circuit de visa est configuré ET si un ou plusieurs projets de réponses sont associés au courrier.'); define('_REJECTION_WORKFLOW_PREVIOUS', 'Refuser le visa - retour au précédent viseur'); define('_REJECTION_WORKFLOW_PREVIOUS_DESC', 'Réinitialise la date de visa du précédent viseur présent dans le circuit de visa du courrier (\'process_date\' de la table listinstance).'); -define('_REJECTION_WORKFLOW_REDACTOR', 'Refuser le visa - retour rédacteur'); -define('_REJECTION_WORKFLOW_REDACTOR_DESC', 'Réinitialise la date de visa de tous les viseurs présents dans le circuit de visa du courrier (\'process_date\' de la table listinstance).'); +define('_RESET_VISA_WORKFLOW', 'Réinitialiser le circuit de visa'); +define('_RESET_VISA_WORKFLOW_DESC', 'Réinitialise la date de visa de tous les viseurs présents dans le circuit de visa du courrier (\'process_date\' de la table listinstance).'); define('_REDIRECT_WORKFLOW_ENTITY', 'Rediriger à l\'entité initiatrice'); define('_REDIRECT_WORKFLOW_ENTITY_DESC', "Renvoie le courrier vers l'entité initiatrice."); define('_INTERRUPT_WORKFLOW', 'Interrompre le circuit de visa'); diff --git a/src/core/lang/lang-nl.php b/src/core/lang/lang-nl.php index 6c9d7e433d9a0fc2aa3d45c69dd44c35aade99cb..8e219ce88ea32f8b41501ae57eb932bc467ab8c4 100755 --- a/src/core/lang/lang-nl.php +++ b/src/core/lang/lang-nl.php @@ -247,8 +247,8 @@ define('_SEND_TO_VISA', 'Versturen voor goedkeuring'); define('_SEND_TO_VISA_DESC', 'Controleert of er een goedkeuringscircuit is geconfigureerd EN of er één of meerdere antwoordprojecten aan het brief gekoppeld zijn.'); define('_REJECTION_WORKFLOW_PREVIOUS', 'De goedkeuring weigeren - terug naar de vorige goedkeurder'); define('_REJECTION_WORKFLOW_PREVIOUS_DESC', 'Reset de datum van de vorige goedkeurder die in het goedkeuringscircuit van het brief aanwezig is (\process_date\ van de tabel listinstance).'); -define('_REJECTION_WORKFLOW_REDACTOR', 'Goedkeuring weigeren - terug naar opsteller'); -define('_REJECTION_WORKFLOW_REDACTOR_DESC', 'Reset de datum van alle huidige goedkeurders die in het goedkeuringscircuit van het brief aanwezig zijn (\process_date\ van de tabel listinstance).'); +define('_RESET_VISA_WORKFLOW', 'Goedkeuring weigeren - terug naar opsteller'); +define('_RESET_VISA_WORKFLOW_DESC', 'Reset de datum van alle huidige goedkeurders die in het goedkeuringscircuit van het brief aanwezig zijn (\process_date\ van de tabel listinstance).'); define('_REDIRECT_WORKFLOW_ENTITY', 'Doorsturen naar de initiatiefnemende eenheid'); define('_REDIRECT_WORKFLOW_ENTITY_DESC', 'Stuurt het brief terug naar de initiatiefnemende eenheid.'); define('_INTERRUPT_WORKFLOW', 'Het goedkeuringscircuit onderbreken'); diff --git a/src/frontend/app/actions/actions.service.ts b/src/frontend/app/actions/actions.service.ts index dbb42cfcff22c4b4bb91b3b121f9a56b160c2805..a8ba7b7b29fa67466888cb3023cb212dc067b459 100644 --- a/src/frontend/app/actions/actions.service.ts +++ b/src/frontend/app/actions/actions.service.ts @@ -8,7 +8,7 @@ import { ConfirmActionComponent } from './confirm-action/confirm-action.componen import { MatDialog } from '@angular/material'; import { CloseMailActionComponent } from './close-mail-action/close-mail-action.component'; import { RejectVisaBackToPrevousActionComponent } from './reject-visa-back-to-previous-action/reject-visa-back-to-previous-action.component'; -import { RejectVisaActionComponent } from './reject-visa-action/reject-visa-action.component'; +import { ResetVisaActionComponent } from './reset-visa-action/reset-visa-action.component'; import { InterruptVisaActionComponent } from './interrupt-visa-action/interrupt-visa-action.component'; import { CloseAndIndexActionComponent } from './close-and-index-action/close-and-index-action.component'; import { UpdateAcknowledgementSendDateActionComponent } from './update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component'; @@ -662,8 +662,8 @@ export class ActionsService { ).subscribe(); } - rejectVisaBackToRedactorAction(options: any = null) { - const dialogRef = this.dialog.open(RejectVisaActionComponent, { + resetVisaAction(options: any = null) { + const dialogRef = this.dialog.open(ResetVisaActionComponent, { disableClose: true, width: '500px', data: this.setDatasActionToSend() diff --git a/src/frontend/app/actions/reject-visa-action/reject-visa-action.component.html b/src/frontend/app/actions/reset-visa-action/reset-visa-action.component.html similarity index 62% rename from src/frontend/app/actions/reject-visa-action/reject-visa-action.component.html rename to src/frontend/app/actions/reset-visa-action/reset-visa-action.component.html index f9a85959d692e75d66bc8d34e37631781c627875..80131ffd6e2e6ee5d8fa4e7f6b0d84e48e114741 100644 --- a/src/frontend/app/actions/reject-visa-action/reject-visa-action.component.html +++ b/src/frontend/app/actions/reset-visa-action/reset-visa-action.component.html @@ -9,8 +9,12 @@ <b *ngIf="data.resIds.length === 1" color="primary" class="highlight">{{data.resource.chrono}}</b> <b *ngIf="data.resIds.length > 1" color="primary" class="highlight">{{data.resIds.length}} {{lang.elements}}</b> ? - <div class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" + <div *ngIf="data.resIds.length == 1 && appVisaWorkflow !== undefined && appVisaWorkflow.getFirstVisaUser() !== ''" class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" + [innerHTML]="lang.resetVisaWorkflowUser + ' <b>' + appVisaWorkflow.getFirstVisaUser().labelToDisplay + '</b>'"></div> + <div *ngIf="data.resIds.length > 1" class="alert-message alert-message-info" role="alert" style="margin-top: 30px;" [innerHTML]="lang.resetVisaWorkflow"></div> + <app-visa-workflow *ngIf="data.resIds.length == 1" [adminMode]="false" [resId]="data.resIds[0]" #appVisaWorkflow> + </app-visa-workflow> </div> <div class="col-md-12"> <app-note-editor #noteEditor [resIds]="data.resIds"></app-note-editor> diff --git a/src/frontend/app/actions/reject-visa-action/reject-visa-action.component.scss b/src/frontend/app/actions/reset-visa-action/reset-visa-action.component.scss similarity index 100% rename from src/frontend/app/actions/reject-visa-action/reject-visa-action.component.scss rename to src/frontend/app/actions/reset-visa-action/reset-visa-action.component.scss diff --git a/src/frontend/app/actions/reject-visa-action/reject-visa-action.component.ts b/src/frontend/app/actions/reset-visa-action/reset-visa-action.component.ts similarity index 77% rename from src/frontend/app/actions/reject-visa-action/reject-visa-action.component.ts rename to src/frontend/app/actions/reset-visa-action/reset-visa-action.component.ts index 0a0c7625ee7e2e666357043c80c6956b01fc29e1..0476fc8194c819986cf3bf861937ccefee854814 100644 --- a/src/frontend/app/actions/reject-visa-action/reject-visa-action.component.ts +++ b/src/frontend/app/actions/reset-visa-action/reset-visa-action.component.ts @@ -6,23 +6,24 @@ import { HttpClient } from '@angular/common/http'; import { NoteEditorComponent } from '../../notes/note-editor.component'; import { tap, finalize, catchError } from 'rxjs/operators'; import { of } from 'rxjs'; +import { VisaWorkflowComponent } from '../../visa/visa-workflow.component'; @Component({ - templateUrl: "reject-visa-action.component.html", - styleUrls: ['reject-visa-action.component.scss'], - providers: [NotificationService], + templateUrl: "reset-visa-action.component.html", + styleUrls: ['reset-visa-action.component.scss'], }) -export class RejectVisaActionComponent implements OnInit { +export class ResetVisaActionComponent implements OnInit { lang: any = LANG; loading: boolean = false; @ViewChild('noteEditor', { static: true }) noteEditor: NoteEditorComponent; + @ViewChild('appVisaWorkflow', { static: false }) appVisaWorkflow: VisaWorkflowComponent; constructor( public http: HttpClient, private notify: NotificationService, - public dialogRef: MatDialogRef<RejectVisaActionComponent>, + public dialogRef: MatDialogRef<ResetVisaActionComponent>, @Inject(MAT_DIALOG_DATA) public data: any ) { } diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts index b2fcc3dcd1a862e2e12949191435ebedd89ea3c6..adff98eb486cfe53d52e7d73e134da41d765bbfe 100755 --- a/src/frontend/app/app.module.ts +++ b/src/frontend/app/app.module.ts @@ -41,7 +41,7 @@ import { EnabledBasketPersistenceActionComponent } from './actions/enabled-baske import { ResMarkAsReadActionComponent } from './actions/res-mark-as-read-action/res-mark-as-read-action.component'; import { CloseMailActionComponent } from './actions/close-mail-action/close-mail-action.component'; import { RejectVisaBackToPrevousActionComponent } from './actions/reject-visa-back-to-previous-action/reject-visa-back-to-previous-action.component'; -import { RejectVisaActionComponent } from './actions/reject-visa-action/reject-visa-action.component'; +import { ResetVisaActionComponent } from './actions/reset-visa-action/reset-visa-action.component'; import { InterruptVisaActionComponent } from './actions/interrupt-visa-action/interrupt-visa-action.component'; import { UpdateAcknowledgementSendDateActionComponent } from './actions/update-acknowledgement-send-date-action/update-acknowledgement-send-date-action.component'; import { CreateAcknowledgementReceiptActionComponent } from './actions/create-acknowledgement-receipt-action/create-acknowledgement-receipt-action.component'; @@ -137,7 +137,7 @@ import { AddAvisModelModalComponent } from './avis/addAvisModel/add-avis-model-m CreateAcknowledgementReceiptActionComponent, CloseMailActionComponent, RejectVisaBackToPrevousActionComponent, - RejectVisaActionComponent, + ResetVisaActionComponent, InterruptVisaActionComponent, UpdateDepartureDateActionComponent, SendExternalSignatoryBookActionComponent, @@ -195,7 +195,7 @@ import { AddAvisModelModalComponent } from './avis/addAvisModel/add-avis-model-m CreateAcknowledgementReceiptActionComponent, CloseMailActionComponent, RejectVisaBackToPrevousActionComponent, - RejectVisaActionComponent, + ResetVisaActionComponent, InterruptVisaActionComponent, UpdateDepartureDateActionComponent, SendExternalSignatoryBookActionComponent, diff --git a/src/frontend/app/visa/visa-workflow.component.ts b/src/frontend/app/visa/visa-workflow.component.ts index 2d173b49b9decbcd501a0195110e223ce9f6973d..a12975f2b3b6c376d930a975a269b55dc0d5ea08 100644 --- a/src/frontend/app/visa/visa-workflow.component.ts +++ b/src/frontend/app/visa/visa-workflow.component.ts @@ -336,6 +336,10 @@ export class VisaWorkflowComponent implements OnInit { return (index + 1); } + getFirstVisaUser() { + return !this.functions.empty(this.visaWorkflow.items[0]) ? this.visaWorkflow.items[0] : ''; + } + getCurrentVisaUser() { const index = this.visaWorkflow.items.map((item: any) => item.listinstance_id).indexOf(this.getLastVisaUser().listinstance_id); diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index b12c050a167d2f67d54012ed9d2b503cdc8e0831..87e463dfb0e3d9a7ac7c1e398e6da0fa4994fb8e 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1406,6 +1406,8 @@ export const LANG_EN = { "closeFullscreen" : "Disable fullscreen", "hasNoEntity": "Those mails do not have initiator entity", "destUserSetToDefault": "Assignee will be the assignee of the initiator entity template list", + "resetVisaWorkflow": "The workflow will be <b>reseted</b>, this document will send back to first assignee", + "resetVisaWorkflowUser": "The workflow will be <b>reseted</b>, this document will send back to", "interruptVisaWorkflow": "The following users will not be able to target mail", "rejectVisaBack": "Document will be send to the previous user", "rejectVisaBackUser": "Document will be send back to", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 86c46eec88c31308dcd5a633cf4dcf1f0d37bb6e..717ad7e3793c9247e6de860f4c07536df6adc7d2 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1446,7 +1446,8 @@ export const LANG_FR = { "closeFullscreen" : "Désactiver le mode plein écran", "hasNoEntity": "Les courriers suivants n'ont pas d'entité initiatrice", "destUserSetToDefault": "Le destinataire sera celui de la liste de diffusion de l'entité initiatrice", - "resetVisaWorkflow": "Les dates de visa et signature seront réinitialisées", + "resetVisaWorkflow": "Le circuit va être <b>réinitilisé</b>, le document retournera au premier viseur", + "resetVisaWorkflowUser": "Le circuit va être <b>réinitilisé</b>, le document retournera à ", "interruptVisaWorkflow": "Les utilisateurs suivants ne pourront pas viser le courrier", "rejectVisaBack": "Le courrier sera envoyé à la dernière personne ayant visé", "rejectVisaBackUser": "Le courrier retournera à ", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 404446a53d935431b9f3e2302b987ac5e20eaf7a..a38c9d8b45ee9dd5e1e7e5eae05db82da4bbc86c 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1431,7 +1431,8 @@ export const LANG_NL = { "closeFullscreen" : "Disable fullscreen", //_TO_TRANSLATE "hasNoEntity": "Those mails do not have initiator entity", //_TO_TRANSLATE "destUserSetToDefault": "Assignee will be the assignee of the initiator entity template list", //_TO_TRANSLATE - "resetVisaWorkflow": "Processing date will be reset", //_TO_TRANSLATE + "resetVisaWorkflow": "The workflow will be <b>reseted</b>, this document will send back to first assignee", //_TO_TRANSLATE + "resetVisaWorkflowUser": "The workflow will be <b>reseted</b>, this document will send back to", //_TO_TRANSLATE "interruptVisaWorkflow": "The following users will not be able to target mail", //_TO_TRANSLATE "rejectVisaBack": "Document will be send to the previous user", //_TO_TRANSLATE "rejectVisaBackUser": "Document will be send back to", //_TO_TRANSLATE