-
+
+
-
-
-
-
-
-
-
-
-
- {{ task.Folio}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{customDate}}
-{{ task.DeadlineType }}
-{{ task.activityInstanceName }}
-
-
-
-
-
-
- Intervenientes
-
-
- {{interveniente.Name}}
- 0">
-
-
-
-
-
- Com conhecimento
-
-
- {{c.Name}}
-
-
-
-
- Detalhes
-{{ fulltask.workflowInstanceDataFields.TaskMessage }}
-
-
-
-
-
-
-
-
- Documentos Anexados
-{{ attachment.Assunto }} Rascunho
-{{ attachment.DocNumber }}
{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
-
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index 3f83be09b..ddf77dfba 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -9,7 +9,7 @@
border-top-left-radius: 24px;
}
-ion-content, .header-2, .main-content{
+ion-content, .header-2{
padding: 30px 20px 0 20px !important;
}
@@ -37,7 +37,6 @@ ion-content, .header-2, .main-content{
border-top-right-radius: 25px;
}
.content{
- padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
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 2f6721424..2e265d2ad 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
@@ -61,6 +61,11 @@ export class DiplomaAssinarPage implements OnInit {
}
});
+
+ window['tinyupdate'] = () => {
+ this.LoadTaskDetail(this.serialnumber);
+ }
+
}
ngOnInit() {
@@ -125,6 +130,8 @@ export class DiplomaAssinarPage implements OnInit {
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
+ this.mergedArray = []
+
try {
this.getDraft(split_stringDraft);
} catch (error) {
@@ -160,7 +167,7 @@ export class DiplomaAssinarPage implements OnInit {
}
- async viewDocument(docId: string, Document, content) {
+ async viewDocument({Document, content}) {
if (Document.content == "") {
const modal = await this.modalController.create({
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 33d9a7b44..b9a9ee327 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -69,6 +69,11 @@ export class DiplomaPage implements OnInit {
});
+
+ window['tinyupdate'] = () => {
+ this.LoadTaskDetail(this.serialNumber);
+ }
+
}
ngOnInit() {
@@ -135,6 +140,7 @@ export class DiplomaPage implements OnInit {
let stringDraft = res.workflowInstanceDataFields.DraftIds;
let split_stringDraft = stringDraft?.split(";").filter(Boolean);
+ this.mergedArray = []
try {
this.getDraft(split_stringDraft);
} catch (error) {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 009ff04b9..cd78259a8 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -278,10 +278,12 @@ ion-content{
width: 84%;
float: left;
- ion-label{
- margin: 0 !important;
- padding: 2.5px 10.5px 2.5px 10.5px;
- }
+ ion-label{
+ float: left;
+ display: inline;
+ margin: 0 !important;
+ padding: 2.5px 10.5px 2.5px 10.5px;
+ }
}
.item-icon{
@@ -697,6 +699,9 @@ ion-content{
font-size: rem(13);
}
+.new-task {
+ float: left;
+}
.search-input-container{
background-color: white;
diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts
index 0c25fa4f8..2e56b76f3 100644
--- a/src/app/pipes/custom-task.pipe.ts
+++ b/src/app/pipes/custom-task.pipe.ts
@@ -31,7 +31,8 @@ export class CustomTaskPipe implements PipeTransform {
"TaskStatus": fullTask.taskStatus,
"TaskReceiveDate": fullTask.taskReceiveDate,
"Note": fullTask.workflowInstanceDataFields.TaskMessage,
- "InstanceID": fullTask.workflowInstanceDataFields.InstanceID
+ "InstanceID": fullTask.workflowInstanceDataFields?.InstanceID,
+ "DeadlineType": fullTask.workflowInstanceDataFields?.InstanceID
}
}
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
index a3a036e01..34e18c0f6 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
@@ -20,7 +20,7 @@
-
...\" to unstage)\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
+ "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file
{{customDate}}
{{ task.Deadline }}
+{{ task.DeadlineType }}
{{ task.activityInstanceName }}
diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts index 28f4e3c3f..efb1843d1 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts @@ -76,10 +76,11 @@ export class EventDetailsDocumentsOptionsPage implements OnInit { "path": document.path, "ownerId": document.ownerId } - this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => [ - this.erroHandler.httpsSucessMessagge('Draft Save'), - this.modalController.dismiss() - ],(error) => { + this.processService.SaveDraftByID(document.DocId, objectDraft).subscribe((res) => { + this.erroHandler.httpsSucessMessagge('Draft Save'); + this.modalController.dismiss(); + window['tinyupdate']() + },(error) => { this.erroHandler.httpStatusHandle(error) }) diff --git a/version/git-version.ts b/version/git-version.ts index a468bb902..cd2a0b30e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "4143a2d00", - "SHA": "4143a2d00718942f0ca98bd09b0e19b38053266e", + "shortSHA": "ad722c0fe", + "SHA": "ad722c0feaaf81cd6030fd9de7ae34269f4b5d58", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jul 21 10:21:10 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "5095", + "lastCommitTime": "'Fri Jul 21 10:48:26 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "5096", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged