lateste git pull made

This commit is contained in:
Eudes Inácio
2021-10-11 09:33:08 +01:00
9 changed files with 38 additions and 23 deletions
@@ -41,7 +41,9 @@ export class ViewDocumentPage implements OnInit {
if(!this.file.title) {
this.file.title = 'Sem Título'
}
console.log(this.task)
}
ngOnInit() {
@@ -72,13 +74,17 @@ export class ViewDocumentPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((res)=>{
if(res.data.component == 'openBookMeetingModal') {
this.openBookMeetingModal()
} else if(res.data.component == 'openExpedientActionsModal') {
this.openExpedientActionsModal(res.data.taskAction)
} else {
console.log('component not found')
if(res.data) {
if(res.data.component == 'openBookMeetingModal') {
this.openBookMeetingModal()
} else if(res.data.component == 'openExpedientActionsModal') {
this.openExpedientActionsModal(res.data.taskAction)
} else {
console.log('component not found')
}
}
})
}
@@ -106,7 +112,7 @@ export class ViewDocumentPage implements OnInit {
}
// efetuar despacho
async openExpedientActionsModal( taskAction: any) {
let classs;
@@ -123,7 +123,7 @@ export class DespachoPrPage implements OnInit {
return user.Type == 'CC';
}) || []
if (!this.cc) {
if(!this.cc) {
this.cc = []
}
@@ -223,12 +223,13 @@ export class DespachoPrPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
openMenu() {
@@ -252,6 +252,9 @@ export class DespachoPage implements OnInit {
async viewDocument(docId:string, Document) {
console.log(this.fulltask)
const modal = await this.modalController.create({
component: ViewDocumentPage,
componentProps: {
@@ -149,12 +149,13 @@ export class DiplomaAssinarPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
getDocumentDetails(forlderId:string, applicationId:string) {
@@ -234,12 +234,13 @@ export class DiplomaPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
getDocumentDetails(forlderId:string, applicationId:string) {
@@ -374,7 +374,8 @@ export class ExpedienteDetailPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
@@ -210,12 +210,13 @@ export class ExpedientePrPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
attachDocument() {
@@ -298,12 +298,13 @@ export class PedidoPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
folderId: this.task.FolderId,
task: this.fulltask
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
openMenu() {
@@ -328,7 +329,7 @@ export class PedidoPage implements OnInit {
popover.onDidDismiss().then((res => {
if (res['data'] == 'close') {
if( res['data'] == 'close') {
this.goBack()
}
@@ -477,7 +478,7 @@ export class PedidoPage implements OnInit {
// });
// }
async distartExpedientModal() {
async distartExpedientModal(){
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -5,7 +5,7 @@
</button>
</div>
<div class="buttons">
<button (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button hidden (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
<button hidden (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>