mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Fix
This commit is contained in:
@@ -48,7 +48,6 @@ export class RequestOptionsPage implements OnInit {
|
||||
|
||||
console.log('serialnumber', this.serialnumber)
|
||||
|
||||
|
||||
this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
|
||||
|
||||
if(!this.showEnviarPendentes) this.showEnviarPendentes = false
|
||||
@@ -66,17 +65,16 @@ export class RequestOptionsPage implements OnInit {
|
||||
};
|
||||
}
|
||||
|
||||
close(){
|
||||
close() {
|
||||
if( window.innerWidth < 801){
|
||||
this.popoverController.dismiss();
|
||||
}
|
||||
else{
|
||||
this.modalController.dismiss();
|
||||
this.popoverController.dismiss('close');
|
||||
} else {
|
||||
this.modalController.dismiss('close');
|
||||
}
|
||||
this.router.navigate(['/home/gabinete-digital/pedidos']);
|
||||
}
|
||||
|
||||
sendExpedienteToPending(){
|
||||
sendExpedienteToPending() {
|
||||
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
|
||||
console.log(res);
|
||||
this.close();
|
||||
@@ -90,7 +88,7 @@ export class RequestOptionsPage implements OnInit {
|
||||
async openBookMeetingModal(task: any) {
|
||||
this.popoverController.dismiss();
|
||||
let classs;
|
||||
if( window.innerWidth <= 800){
|
||||
if( window.innerWidth <= 800) {
|
||||
classs = 'book-meeting-modal modal modal-desktop'
|
||||
} else {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
@@ -135,13 +133,10 @@ export class RequestOptionsPage implements OnInit {
|
||||
this.distartExpedientModal();
|
||||
}
|
||||
|
||||
this.modalController.dismiss('close')
|
||||
this.popoverController.dismiss('close')
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
async distartExpedientModal(){
|
||||
async distartExpedientModal() {
|
||||
this.popoverController.dismiss();
|
||||
console.log(this.fulltask);
|
||||
const modal = await this.modalController.create({
|
||||
@@ -159,9 +154,6 @@ export class RequestOptionsPage implements OnInit {
|
||||
modal.onDidDismiss().then(res=>{
|
||||
if(res['data']=='close'){
|
||||
this.close();
|
||||
/* console.log('2Expedient Discard closed2');
|
||||
this.close();
|
||||
this.openMenu(); */
|
||||
}
|
||||
|
||||
});
|
||||
@@ -258,12 +250,9 @@ export class RequestOptionsPage implements OnInit {
|
||||
this.toastService.badRequest('Processo não arquivado')
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
async openDarParecer(task: any) {
|
||||
this.popoverController.dismiss('close');
|
||||
// console.log(task);
|
||||
|
||||
let classs;
|
||||
if( window.innerWidth <= 800){
|
||||
@@ -281,12 +270,14 @@ export class RequestOptionsPage implements OnInit {
|
||||
backdropDismiss: false
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss();
|
||||
modal.onDidDismiss().then( () => {
|
||||
this.popoverController.dismiss('close');
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
async openDelegarModal(task: any) {
|
||||
this.popoverController.dismiss();
|
||||
// console.log(task);
|
||||
|
||||
let classs;
|
||||
if( window.innerWidth <= 800){
|
||||
|
||||
Reference in New Issue
Block a user