diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 24eb062d0..4af06ce11 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -217,14 +217,16 @@ export class DiplomaAssinarPage implements OnInit { "serialNumber": this.serialnumber, "action": "Assinado", "ActionTypeId": 99999842, + "FolderId": this.task.FolderID, "dataFields": { - "DraftIds": "", "ReviewUserComment": '', "InstanceIDNew": this.task.InstanceID, + "DraftIds": "", }, "AttachmentList": { "ProcessInstanceID": this.task.InstanceID, - "DraftIds": "", + "DraftIds": null, + "Attachments": [] }, } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 36d81587c..8ab0e5b26 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -15,7 +15,7 @@ Gabinete Digital
- + Para hoje @@ -114,7 +114,7 @@
- + Para hoje diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.scss b/src/app/shared/popover/deploma-options/deploma-options.page.scss index 9edf9f23e..c45baaf12 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.scss +++ b/src/app/shared/popover/deploma-options/deploma-options.page.scss @@ -35,6 +35,7 @@ @media only screen and (max-width: 800px) { .btn-ok, .btn-cancel, .btn-delete{ width: 47% !important; + min-width: 300px; } } @media only screen and (min-width: 1024px) { diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 41a9ed3d0..ee42d99ee 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -208,14 +208,16 @@ export class DiplomaOptionsPage implements OnInit { "serialNumber": this.serialNumber, "action": "Assinado", "ActionTypeId": 99999842, + "FolderId": this.task.FolderID, "dataFields": { - "DraftIds": "", "ReviewUserComment": note, "InstanceIDNew": this.task.InstanceID, + "DraftIds": "", }, "AttachmentList" : { - "DraftIds": "", - "ProcessInstanceID": this.task.InstanceID + "ProcessInstanceID": this.task.InstanceID, + "DraftIds": null, + "Attachments": [] }, } diff --git a/version/git-version.ts b/version/git-version.ts index 82cbea748..f9e8b7b12 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8d438603e", - "SHA": "8d438603e2c7ddc41573476c48384addde03190a", + "shortSHA": "ba8fce1ec", + "SHA": "ba8fce1ec8e391c9ae1327a6da973ffc03561d36", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jul 24 10:15:51 2023 +0100'", - "lastCommitMessage": "add null", - "lastCommitNumber": "5105", + "lastCommitTime": "'Mon Jul 24 10:23:03 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "5106", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.scss\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file