peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

add attachmente

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-30 19:59:39 +01:00
parent 3386c3e22c
commit 83dc37f4e2
21 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+2 -2
View File
@@ -146,12 +146,12 @@
<ion-label>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
<p><span class="span-left">{{( document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/modals/create-process/create-process.page.ts
+12 -4
View File
@@ -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
}
});
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+1
View File
@@ -501,6 +501,7 @@ export class DespachoPrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
-42
View File
@@ -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;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+1
View File
@@ -505,6 +505,7 @@ export class DespachoPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+1
View File
@@ -187,6 +187,7 @@ export class DiplomasGerarPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+1
View File
@@ -398,6 +398,7 @@ export class DiplomaPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+2 -2
View File
@@ -280,12 +280,12 @@
<ion-label>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
<span class="close-button text-black" (click)="removeAttachment(i)" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
<p><span class="span-left">{{( document.EntidadeOrganicaNome || document.Sender)}}</span><span class="span-right"> {{(document.Data || document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+11 -3
View File
@@ -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
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+1
View File
@@ -651,6 +651,7 @@ export class ExpedienteDetailPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+1
View File
@@ -525,6 +525,7 @@ export class ExpedientePrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+1
View File
@@ -405,6 +405,7 @@ export class PedidoPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/deploma-options/deploma-options.page.ts
+1
View File
@@ -158,6 +158,7 @@ export class DiplomaOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/despachos-options/despachos-options.page.ts
+1
View File
@@ -129,6 +129,7 @@ export class DespachosOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+1
View File
@@ -168,6 +168,7 @@ export class DespachosPrOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts
+1
View File
@@ -145,6 +145,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask:this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+1
View File
@@ -336,6 +336,7 @@ export class OptsExpedientePrPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+1
View File
@@ -295,6 +295,7 @@ export class OptsExpedientePage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false
src/app/shared/popover/request-options/request-options.page.ts
+1
View File
@@ -113,6 +113,7 @@ export class RequestOptionsPage implements OnInit {
component: BookMeetingModalPage,
componentProps: {
task: this.task,
fulltask: this.fulltask
},
cssClass: classs,
backdropDismiss: false