diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 86f4a4272..3a2b4c69a 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -146,12 +146,12 @@
{{document.Assunto}}
- {{document.appName}}
+ {{document.appName}}
- {{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yyyy HH:mm'}}
+ {{( document.EntidadeOrganicaNome || document.Sender)}} {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}}
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index e1ee282ff..e62e7524e 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -105,6 +105,14 @@ export class CreateProcessPage implements OnInit {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
+
+ console.log('this.fulltask', this.fulltask)
+
+
+ if(this.fulltask?.Documents) {
+ this.documents = this.fulltask.Documents
+ }
+
if (this.task.SerialNumber) {
this.task.serialNumber = this.task.SerialNumber
}
@@ -266,14 +274,14 @@ export class CreateProcessPage implements OnInit {
let docs = {
- ProcessInstanceID: "",
+ ProcessInstanceID: this.fulltask?.workflowInstanceDataFields?.InstanceID,
Attachments: []
}
- const DocumentToSave = this.documents.map((e) => {
+ const DocumentToSave = this.documents.map((e: any) => {
return {
- ApplicationId: e.ApplicationType,
- SourceId: e.Id
+ ApplicationId: e.ApplicationType || e.ApplicationId,
+ SourceId: e.Id || e.DocId || e.SourceId
}
});
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index f2d7f6e59..96cc5f8a3 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -354,7 +354,7 @@ export class EditEventPage implements OnInit {
this.runValidation()
if(this.Form.invalid) return false;
- if(this.selectedRecurringType != '-1'){
+ if(this.selectedRecurringType != '-1') {
this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
}
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index bbfad3429..468d9d7ff 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -831,22 +831,22 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
- console.log(file.type)
+ console.log('TYPE',file.type)
- const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
+ const encodedData = 'data:application/pdf;base64,'+btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
console.error(error);
})));
console.log(encodedData)
const blob = this.fileService.base64toBlob(encodedData, file.type)
- console.log(blob
- )
- const fileBase64 = await this._getBase64(file)
- console.log(fileBase64)
+ console.log('BLOB BLOB',blob)
+ /* const fileBase64 = await this._getBase64(file)
+ console.log('BASE&$',fileBase64) */
- const formData = new FormData();
+ /* const formData = new FormData();
console.log('add file', formData)
- formData.append('blobFile', blob);
+ formData.append('blobFile', blob); */
+ let ob = {'blobFile': blob}
this.ChatSystemService.getDmRoom(roomId).send({
file: {
@@ -859,9 +859,9 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
// "text": "description",
"title_link_download": false,
}],
- temporaryData: formData,
+ temporaryData: ob,
attachmentsModelData: {
- fileBase64: fileBase64,
+ fileBase64: encodedData,
}
});
} else {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 25653055c..0ec04ce59 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -501,6 +501,7 @@ export class DespachoPrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index e7ed249b2..a72722e57 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -5,8 +5,6 @@ import { customFullTask, customTask, DailyWorkTask } from '../../../models/daily
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
-
-import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { NavigationStart, Router } from '@angular/router';
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
@@ -249,46 +247,6 @@ export class DespachosPrPage implements OnInit {
}
- async openBookMeetingModal(task: customFullTask) {
-
- const doc = this.loadedAttachments[this.dicIndex];
-
- task = {
- serialNumber: doc.SourceId,
- taskStartDate: doc.CreateDate,
- isEvent: true,
- workflowInstanceDataFields: {
- FsId: doc.ApplicationId,
- FolderID: null,
- DocId: doc.SourceId,
- Subject: doc.SourceName
- },
- }
-
- let classs;
- if (window.innerWidth <= 800) {
- classs = 'book-meeting-modal modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
- const modal = await this.modalController.create({
- component: BookMeetingModalPage,
- componentProps: {
- task: task,
- },
- cssClass: classs,
- backdropDismiss: false
- });
-
- modal.onDidDismiss().then(
- (e)=>{},
- (error) => {
- console.log(error)
- }
- );
- await modal.present();
- }
-
docIndex(index: number) {
this.dicIndex = index;
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index f2181c472..6c9c831a4 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -505,6 +505,7 @@ export class DespachoPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
index 8d9127911..d77810bc8 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
@@ -187,6 +187,7 @@ export class DiplomasGerarPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
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 1d1283f9c..522fed760 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -398,6 +398,7 @@ export class DiplomaPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 5e525d27b..0d43176c0 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -280,12 +280,12 @@
{{document.Assunto}}
- {{document.appName}}
+ {{document.appName}}
- {{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yyyy HH:mm'}}
+ {{( document.EntidadeOrganicaNome || document.Sender)}} {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}}
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index dea1c19bc..0f9e23232 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -91,6 +91,7 @@ export class BookMeetingModalPage implements OnInit {
@ViewChild('picker1') picker1: any;
task: any;
+ fulltask: any;
taskParticipants: EventPerson[];
taskParticipantsCc: EventPerson[] = [];
@@ -130,6 +131,13 @@ export class BookMeetingModalPage implements OnInit {
this.taskParticipants = [];
this.task = this.navParams.get('task');
+ this.fulltask = this.navParams.get('fulltask');
+
+ console.log('fulltask', this.fulltask)
+
+ if(this.fulltask?.Documents) {
+ this.documents = this.fulltask.Documents
+ }
this.postData = new Event();
this.eventBody = { BodyType: "1", Text: "" };
@@ -313,12 +321,12 @@ export class BookMeetingModalPage implements OnInit {
Attachments: []
}
- const DocumentToSave = this.documents.map((e) => {
+ const DocumentToSave = this.documents.map((e: any) => {
console.log('ASSUNTO', e.Assunto)
return {
- ApplicationId: e.ApplicationType,
+ ApplicationId: e.ApplicationType || e.ApplicationId,
Source: 1,
- SourceId: e.Id,
+ SourceId: e.Id || e.DocId || e.SourceId,
SourceName:e.Assunto,
Description: e.Assunto,
Stakeholders: e.EntidadeOrganicaNome
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index b7b06d731..c3a357641 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -651,6 +651,7 @@ export class ExpedienteDetailPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 8441a72b1..6859b51f8 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -525,6 +525,7 @@ export class ExpedientePrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index a476fe8db..0f6685052 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -405,6 +405,7 @@ export class PedidoPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 0b83278d3..0d68bda7f 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -223,7 +223,7 @@ export class EditEventPage implements OnInit {
participantes: new FormControl(this.taskParticipants, [
// Validators.required
]),
- Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') < new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
+ Date: new FormControl( true,[
Validators.required
]),
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index cabad5bec..53506cdc8 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -4,7 +4,7 @@
Eventos para Aprovação
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 0d4b5eb4b..cf9595b2e 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -272,9 +272,9 @@
-
+
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 165bd22d4..08529f5b5 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -252,9 +252,9 @@
-
+
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 1d4959f4c..53374f8c3 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -7,7 +7,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 ee42d99ee..db020344d 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -158,6 +158,7 @@ export class DiplomaOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index 2a6756e82..952d7f07d 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -129,6 +129,7 @@ export class DespachosOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index 75aab4181..369fb5fc3 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -168,6 +168,7 @@ export class DespachosPrOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
index 323d9bdc1..d1b4d03fe 100644
--- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
@@ -145,6 +145,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index 6399be3d6..098126e26 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -336,6 +336,7 @@ export class OptsExpedientePrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 57c7da224..af5f8e6df 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -295,6 +295,7 @@ export class OptsExpedientePage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index 61ee09216..f319a5658 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -113,6 +113,7 @@ export class RequestOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
+ fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
diff --git a/src/assets/images/theme/gov/icons-delete.svg b/src/assets/images/theme/gov/icons-delete.svg
index 531880103..608ce0793 100644
--- a/src/assets/images/theme/gov/icons-delete.svg
+++ b/src/assets/images/theme/gov/icons-delete.svg
@@ -1,4 +1,4 @@
-