Skip to content
Snippets Groups Projects
Commit 25bb0e66 authored by Hamza HRAMCHI's avatar Hamza HRAMCHI
Browse files

FIX #15943 TIME 0:15 user with the annotator role cannot pre-position a signature

parent f3b67ba8
No related branches found
No related tags found
No related merge requests found
...@@ -626,6 +626,7 @@ ...@@ -626,6 +626,7 @@
"watermarkContentDesc": "Columns from <b> main_documents </b> can be used. ex: [id] as well as the <b> time variables </b>. ex: [date_now] or [hour_now]", "watermarkContentDesc": "Columns from <b> main_documents </b> can be used. ex: [id] as well as the <b> time variables </b>. ex: [date_now] or [hour_now]",
"notificationTemplateTable": "<table style=\"border: 1pt solid #000000; width: 582px; height: 77px;\" border=\"1\" frame=\"box\" cellspacing=\"1\" cellpadding=\"5\">\n<tbody>\n<tr>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\"><strong>Objet</strong></span></td>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\"><strong>Liens</strong></span></td>\n</tr>\n{{rows}}\n</tbody>\n</table>", "notificationTemplateTable": "<table style=\"border: 1pt solid #000000; width: 582px; height: 77px;\" border=\"1\" frame=\"box\" cellspacing=\"1\" cellpadding=\"5\">\n<tbody>\n<tr>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\"><strong>Objet</strong></span></td>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\"><strong>Liens</strong></span></td>\n</tr>\n{{rows}}\n</tbody>\n</table>",
"notificationTemplateRow": "<tr>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\">{{object}}</span></td>\n<td><span style=\"font-family: arial,helvetica,sans-serif;\"><a href=\"{{link}}\">Voir</a></span></td>\n</tr>", "notificationTemplateRow": "<tr>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\">{{object}}</span></td>\n<td><span style=\"font-family: arial,helvetica,sans-serif;\"><a href=\"{{link}}\">Voir</a></span></td>\n</tr>",
"azure_samlConnection": "Azure SAML" "azure_samlConnection": "Azure SAML",
"cannotSetSignature": "The user with the annotator role cannot pre-position a signature"
} }
} }
\ No newline at end of file
...@@ -625,6 +625,7 @@ ...@@ -625,6 +625,7 @@
"signatureScaling": "Taux de mise à l'échelle du bloc de signature", "signatureScaling": "Taux de mise à l'échelle du bloc de signature",
"originaleize": "Taille originale", "originaleize": "Taille originale",
"scalingDocWith": "{{value}} % de la largeur du document", "scalingDocWith": "{{value}} % de la largeur du document",
"azure_samlConnection": "Azure SAML" "azure_samlConnection": "Azure SAML",
"cannotSetSignature": "L'utilisateur avec le rôle annotateur ne peut pas pré-positionner une signature"
} }
} }
...@@ -352,17 +352,20 @@ export class IndexationComponent implements OnInit { ...@@ -352,17 +352,20 @@ export class IndexationComponent implements OnInit {
} }
async signPos(index: number) { async signPos(index: number) {
if (this.appVisaWorkflow.getCurrentWorkflow().length > 0) { if (this.appVisaWorkflow.getCurrentWorkflow().length === 1 && this.appVisaWorkflow.getCurrentWorkflow()[0].role === 'note') {
this.notificationService.error('lang.cannotSetSignature');
} else if (this.appVisaWorkflow.getCurrentWorkflow().length > 0) {
this.appVisaWorkflow.getCurrentWorkflow().forEach((user: any, indexUser: number) => { this.appVisaWorkflow.getCurrentWorkflow().forEach((user: any, indexUser: number) => {
if (user.signaturePositions === undefined) { if (user.signaturePositions === undefined) {
this.appVisaWorkflow.visaWorkflow[indexUser].signaturePositions = []; this.appVisaWorkflow.visaWorkflow[indexUser].signaturePositions = [];
} }
}); });
const currentWorkflow: any[] = this.appVisaWorkflow.getCurrentWorkflow().filter((user: any) => user.role !== 'note');
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: SignaturePositionComponent, component: SignaturePositionComponent,
cssClass: 'custom-alert-fullscreen', cssClass: 'custom-alert-fullscreen',
componentProps: { componentProps: {
'workflow': this.appVisaWorkflow.getCurrentWorkflow(), 'workflow': currentWorkflow,
'resource': this.filesToUpload[index], 'resource': this.filesToUpload[index],
'pdfContent': 'data:application/pdf;base64,' + this.filesToUpload[index].content, 'pdfContent': 'data:application/pdf;base64,' + this.filesToUpload[index].content,
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment