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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-06-22 16:37:51 +01:00
parent 6723d95aa3 21083f34b1
commit f0b1132d76
103 changed files with 36031 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+6 -5
View File
@@ -2,14 +2,13 @@
<!-- Edit event for Inicio -->
<div class="main-content height-100 d-flex">
<div class="content d-flex flex-column width-md-100 height-100">
<div class="main-header pt-30 px-20 background-white pb-15">
<ion-header>
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar evento por aprovar </ion-label>
<ion-label class="title">Editar evento por aprovar</ion-label>
</div>
</div>
</ion-header>
@@ -157,7 +156,8 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -192,7 +192,8 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
[(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
[min]="endMinDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -366,6 +367,6 @@
<ion-footer class="background-whit">
<div class="buttons">
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
</div>
</ion-footer>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+91 -13
View File
@@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate = new Date().toISOString().slice(0,10)
public minDate = new Date()
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
async getTask() {
this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
this.processes.GetTask(this.serialNumber).subscribe( (result) => {
this.eventProcess = result
this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
@@ -179,6 +179,9 @@ export class EditEventToApprovePage implements OnInit {
}
onSelectedRecurringChanged(ev:any) {
this.calculetedLastOccurrence(ev);
if(ev.length > 1) {
this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
@@ -188,6 +191,44 @@ export class EditEventToApprovePage implements OnInit {
}
}
calculetedLastOccurrence(type:number){
var valor;
var opcao: boolean;
if (type == 0) {
valor = 7;
opcao = true;
} else if(type == 1){
valor = 30;
opcao = true;
} else if(type == 2){
valor = 1;
opcao = false;
}else if(type == 3){
valor = 5;
opcao = false;
}
this.defineLastOccurrence(valor, opcao);
}
defineLastOccurrence(valor:number, opcao:boolean){
var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
if (opcao == true) {
time.setDate(time.getDate() + valor);
this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
} else {
time = new Date(
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getMinutes()
);
this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
}
}
setOtherData() {
if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
@@ -223,14 +264,12 @@ export class EditEventToApprovePage implements OnInit {
this.setIntervenientCC.emit([]);
this.clearContact.emit();
this.approveEventDismiss.emit({
"serialNumber": this.eventProcess.serialNumber,
"action": "Aprovar",
"saveData": this.eventProcess
serialNumber: this.eventProcess.serialNumber,
action: "Aprovar",
saveData: this.eventProcess
});
}
@@ -276,7 +315,10 @@ export class EditEventToApprovePage implements OnInit {
if(this.Form.invalid) return false
// set dates to eventProcess object
this.getDatepickerData()
this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)).add(1, 'hours'));
this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)).add(1, 'hours'));
// this.restoreDatepickerData()
// this.getDatepickerData()
this.taskParticipantsCc.forEach( e => {
e.IsRequired = false
@@ -291,13 +333,14 @@ export class EditEventToApprovePage implements OnInit {
}
})
const event: EventToApproveEdit = {
SerialNumber: this.eventProcess.serialNumber,
Body: this.eventProcess.workflowInstanceDataFields.Body,
Location: this.eventProcess.workflowInstanceDataFields.Location,
Subject: this.eventProcess.workflowInstanceDataFields.Subject,
StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
StartDate: this.dateControlStart.value,
EndDate: this.dateControlEnd.value,
ReviewUserComment: '',
Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
MDName: this.eventProcess.workflowInstanceDataFields.MDName,
@@ -330,14 +373,14 @@ export class EditEventToApprovePage implements OnInit {
if(document['action'] == 'add') {
delete document.action
this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
// this.toastService.successMessage();
}, error =>{
this.toastService.badRequest();
});
} else if(document['action'] == 'delete') {
delete document.action
this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
// this.toastService.successMessage()
}, error =>{
this.toastService.badRequest()
})
@@ -347,6 +390,42 @@ export class EditEventToApprovePage implements OnInit {
}
async gravasAction() {
await this.save();
if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
this.reenviar();
}
}
async reenviar() {
let body = {
serialNumber: this.eventProcess.serialNumber,
action: "Reenviar",
dataFields: {
ReviewUserComment: "",
}
}
const loader = this.toastService.loading();
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService._successMessage();
this.goToApproveEventList();
} catch (error) {
this.toastService._badRequest();
} finally {
loader.remove()
}
}
goToApproveEventList() {
this.closeEventToApprove.emit();
this.modalController.dismiss();
}
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = removeDuplicate(taskParticipants) ;
@@ -472,7 +551,6 @@ export class EditEventToApprovePage implements OnInit {
}
getDatepickerData() {
this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd