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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-15 11:41:33 +01:00
parent 9644cfb6b5 4eabda4ae7
commit 736c0ab416
11 changed files with 167 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/view-event/view-event.page.ts
+1 -79
View File
@@ -219,87 +219,9 @@ export class ViewEventPage implements OnInit {
});
}
// async openBookMeetingModal() {
// const doc = this.loadedAttachments[ this.dicIndex];
// let 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
// });
// await modal.present();
// modal.onDidDismiss();
// }
// async openExpedientActionsModal(taskAction: any) {
// //this.modalController.dismiss();
// let classs;
// if( window.innerWidth <= 800){
// classs = 'modal modal-desktop'
// } else {
// classs = 'modal modal-desktop showAsideOptions'
// }
// const doc = this.loadedAttachments[ this.dicIndex];
// let task = {
// serialNumber: doc.SourceId,
// taskStartDate: doc.CreateDate,
// isEvent: true,
// workflowInstanceDataFields: {
// FsId: doc.ApplicationId,
// FolderID: null,
// DocId: doc.SourceId,
// Subject: doc.SourceName
// },
// }
// const modal = await this.modalController.create({
// component: ExpedientTaskModalPage,
// componentProps: {
// taskAction: taskAction,
// task: task,
// profile: this.profile,
// },
// cssClass: classs,
// });
// await modal.present();
// modal.onDidDismiss().then(res=>{
// console.log(res['data']);
// if(res['data']=='openDiscart'){
// console.log('open discart');
// // this.distartExpedientModal();
// }
// });
// }
async openTaskOptions() {
const doc = this.loadedAttachments[ this.dicIndex];
const doc = this.loadedAttachments[this.dicIndex];
let customTask = {
serialNumber: doc.SourceId,
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+20 -1
View File
@@ -220,7 +220,7 @@ export class DespachoPage implements OnInit {
}
async reexecute(note:string, documents:any) {
async reencaminhar(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
@@ -230,6 +230,25 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
try {
await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.close();
} catch (error) {
this.badRequest()
}
}
async reexecute(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reexecução",
"ActionTypeId": 100000010,
"dataFields": {
"ReviewUserComment": note,
},
"AttachmentList" :documents,
}
try {
await this.processes.CompleteTask(body).toPromise()
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+5 -5
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);
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
"ReviewUserComment": res.data,
}
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+1 -1
View File
@@ -189,7 +189,7 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
"ReviewUserComment": res.data,
}
}
console.log(body);
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+6 -3
View File
@@ -43,9 +43,12 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-item>
<ion-label *ngIf="!selectedTypes">Tipos de assunto</ion-label>
<ion-select [(ngModel)]="selectedTypes" multiple="true" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-item class="ion-no-border ion-no-padding ion-no-margin">
<ion-label>Tipo de assunto</ion-label>
<ion-select
[(ngModel)]="selectedTypes"
(ngModelChange)="onSelectedTypesChanged($event)"
multiple="true" interface="alert" Cancel-text="Cancelar" required>
<ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
</ion-select>
</ion-item>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+41 -20
View File
@@ -20,6 +20,7 @@ import { EventAttachment } from 'src/app/models/attachment.model';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-expedient-task-modal',
@@ -76,11 +77,11 @@ export class ExpedientTaskModalPage implements OnInit {
private alertController: AlertService,
private authService: AuthService,
private userAuth: AuthService,
private animationController: AnimationController) {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.loggeduser = userAuth.ValidatedUser;
this.user = environment.defaultuser +'@'+ environment.domain;
this.task = this.navParams.get('task');
@@ -88,6 +89,9 @@ 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();
this.participants = this.participants = new Array();
this.dispatchFolder = {
@@ -98,7 +102,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
DeadlineType: '',
SubjectTypes: ['99999844'],
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -126,6 +130,17 @@ export class ExpedientTaskModalPage implements OnInit {
this.getSubjectType();
}
onSelectedTypesChanged(ev:any){
console.log(ev);
if(ev.length > 1){
console.log(ev.filter(data => data != '99999850'));
this.selectedTypes = ev.filter(data => data != '99999850');
}
if(ev.length == 0){
this.selectedTypes = ["99999850"];
}
}
close(){
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);
@@ -191,7 +206,6 @@ export class ExpedientTaskModalPage implements OnInit {
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
//SubjectTypes: [],
}
try {
let action_despacho = {
@@ -205,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;
@@ -235,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':
@@ -262,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;
@@ -299,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;
@@ -328,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;
}
src/app/pages/gabinete-digital/expediente/expediente.page.scss
-1
View File
@@ -34,7 +34,6 @@
//DIV
ion-item{
border: 1px solid blue;
margin: 0 !important;
padding: 0 !important;
--background: none;