-
+
+
-
-
-
-
-
-
-
-
-
- {{ 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 @@
-
{{customDate}}
{{ task.Deadline }}
+{{ task.DeadlineType }}
{{ task.activityInstanceName }}
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.html b/src/app/shared/popover/deploma-options/deploma-options.page.html index adbbaf691..9e372b2d5 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.html +++ b/src/app/shared/popover/deploma-options/deploma-options.page.html @@ -22,7 +22,7 @@
-
+
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 d741c83da..4fa197085 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -74,7 +74,7 @@ export class DiplomaOptionsPage implements OnInit {
});
modal.onDidDismiss().then(async (res) => {
- if(res.data){
+ if(res.data) {
const DocumentToSave = res.data.documents.map((e) => {
@@ -105,7 +105,7 @@ export class DiplomaOptionsPage implements OnInit {
await this.arquivar(res.data.note, docs);
this.goBack();
} else if (actionName =='AssinarNew') {
- await this.AssinarNew(res.data.note, docs)
+ await this.AssinarNew()
}
}
}, (error) => {
@@ -235,7 +235,7 @@ export class DiplomaOptionsPage implements OnInit {
}
}
- async AssinarNew(note:string, documents:any) {
+ async AssinarNew() {
let body = {
"InstanceId": this.task.InstanceID,
"FolderId": this.task.FolderID,
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 ca282575d..09d4f2d3c 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "21c5a1d9e",
- "SHA": "21c5a1d9eb7be271dc2cb611d1d836f3f28302a1",
+ "shortSHA": "2e5b28735",
+ "SHA": "2e5b287359258af05812a1a4c5bbcbbcc260d09e",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Eudes InĂ¡cio'",
- "lastCommitTime": "'Fri Jul 21 10:25:33 2023 +0100'",
- "lastCommitMessage": "task details update css",
- "lastCommitNumber": "5094",
+ "lastCommitTime": "'Fri Jul 21 12:57:42 2023 +0100'",
+ "lastCommitMessage": "pull made",
+ "lastCommitNumber": "5097",
"change": "",
- "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 1 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
+ "changeStatus": "On branch developer-catch-merge\nYour branch and 'origin/developer-catch-merge' have diverged,\nand have 2 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\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/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file