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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-14 14:04:00 +01:00
parent 035af8f533
commit f901627147
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.ts
+6 -4
View File
@@ -85,6 +85,9 @@ export class CreateProcessPage implements OnInit {
this.postData = new Despacho();
this.participants = this.participants = new Array();
//Initialize SubjectTypes Array with the value "Indefinido"
this.selectedTypes = ['99999850'];
this.dispatchFolder = {
Nad: 30,
Subject: '',
@@ -93,12 +96,11 @@ export class CreateProcessPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.SourceID, //FolderId
DeadlineType: '',
SubjectTypes: ['99999850'],
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
//Initialize SubjectTypes Array with the value "Indefinido"
this.selectedTypes = ['99999850'];
this.postData.DispatchFolder = this.dispatchFolder;
this.postData.UsersSelected = this.participants;
/* By Default TypeDeadline should be 'Normal' */
@@ -198,7 +200,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDespatcho(this.postData).toPromise();
this.executado();
this.toastService.successMessage('Despacho criado');
this.toastService.badRequest('Despacho criado');
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+4 -4
View File
@@ -11,6 +11,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-approve-event-modal',
@@ -41,6 +42,7 @@ export class ApproveEventModalPage implements OnInit {
private activatedRoute: ActivatedRoute,
private iab: InAppBrowser,
private animationController: AnimationController,
private toastService: ToastService,
) {
@@ -129,13 +131,11 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.successMessage('Evento rejeitado', () =>{
this.toastService.successMessage('Evento rejeitado', () =>{
this.router.navigate(['/home/gabinete-digital/event-list']);
})
} catch (error) {
this.badRequest('Evento não rejeitado')
this.toastService.badRequest('Evento não rejeitado')
}
this.modalController.dismiss(null);
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+24 -17
View File
@@ -89,6 +89,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskType = this.navParams.get('taskAction');
//Initialize SubjectTypes Array with the value "Indefinido"
this.selectedTypes = ['99999850'];
this.postData = new Despacho();
@@ -101,7 +102,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
DeadlineType: '',
SubjectTypes: ['99999850'],
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -205,7 +206,6 @@ export class ExpedientTaskModalPage implements OnInit {
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
//SubjectTypes: [],
}
try {
let action_despacho = {
@@ -219,11 +219,12 @@ export class ExpedientTaskModalPage implements OnInit {
console.log(this.postData);
this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
this.modalController.dismiss(action_despacho);
//await this.successMessage('Processo efetuado');
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_despacho);
});
} catch (error) {
await this.badRequest('Processo não efetuado')
await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -249,10 +250,11 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postParecer(this.postData).toPromise();
this.modalController.dismiss(action_parecer);
//await this.successMessage('Processo efetuado')
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_parecer);
});
} catch (error) {
await this.badRequest('Processo não efetuado')
await this.toastService.badRequest('Processo não efetuado')
}
break;
case '2':
@@ -276,10 +278,11 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
this.modalController.dismiss(action_deferimento);
//await this.successMessage('Processo efetuado')
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_deferimento);
});
} catch (error) {
await this.badRequest('Processo não efetuado')
await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -313,10 +316,12 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
this.modalController.dismiss(action_despacho_pr);
//await this.successMessage('Processo efetuado')
await this.toastService.successMessage('Processo efetuado', () =>{
this.modalController.dismiss(action_despacho_pr);
});
} catch (error) {
await this.badRequest('Processo não efetuado')
await this.toastService.badRequest('Processo não efetuado')
}
console.log('this.taskResult', this.taskResult);
break;
@@ -342,10 +347,12 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
this.modalController.dismiss(action_parecer_pr);
//await this.successMessage('Processo efetuado')
await this.toastService.badRequest('Processo efetuado', () =>{
this.modalController.dismiss(action_parecer_pr);
})
} catch (error) {
await this.badRequest('Processo não efetuado')
await this.toastService.badRequest('Processo não efetuado')
}
break;
}