add either pattern

This commit is contained in:
Peter Maquiran
2024-05-30 12:03:30 +01:00
parent 3c4ec1a432
commit 746db6f583
9 changed files with 410 additions and 85 deletions
@@ -11,7 +11,9 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
import { ThemeService } from 'src/app/services/theme.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
import { EventToApproveDetails } from 'src/app/models/entiry/agenda/eventToApproveDetails';
import { HttpResponseBase } from '@angular/common/http';
@Component({
selector: 'app-approve-event',
@@ -21,7 +23,7 @@ import { TaskService } from 'src/app/services/task.service'
export class ApproveEventPage implements OnInit {
event: Event;
@Input() loadedEvent:any;
@Input() loadedEvent: EventToApproveDetails;
loadedAttachments:any;
customDate:any;
today:any;
@@ -51,7 +53,8 @@ export class ApproveEventPage implements OnInit {
private toastService: ToastService,
public ThemeService: ThemeService,
private httpErroHandle: HttpErrorHandle,
public TaskService: TaskService
public TaskService: TaskService,
public AgendaDataRepositoryService: AgendaDataRepositoryService
) {
// Event to approve list
@@ -76,15 +79,19 @@ export class ApproveEventPage implements OnInit {
this.modalController.dismiss();
}
getTask() {
this.processes.GetTask(this.serialNumber).subscribe(res => {
this.loadedEvent = res;
this.today = new Date(res.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
async getTask() {
const res = await this.AgendaDataRepositoryService.getEventToApproveById(this.serialNumber)
if(res.isOk()) {
this.loadedEvent = res.value;
this.today = new Date(res.value.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
} else {
console.log(res.error.status)
}
})
}
async approveTask(serialNumber:string) {
@@ -109,7 +116,7 @@ export class ApproveEventPage implements OnInit {
async rejectTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
const loader = this.toastService.loading()
@@ -119,7 +126,7 @@ export class ApproveEventPage implements OnInit {
this.TaskService.loadEventosParaAprovacao();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
this.close()
@@ -133,7 +140,7 @@ export class ApproveEventPage implements OnInit {
} catch (error) {
console.error('getAttchaments',error)
}
}
@@ -151,7 +158,7 @@ export class ApproveEventPage implements OnInit {
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.loadedEvent.FolderId,
// folderId: this.loadedEvent.FolderId,
task: this.loadedEvent
},
cssClass: 'modal modal-desktop'
@@ -179,7 +186,7 @@ export class ApproveEventPage implements OnInit {
}
async emendTask(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
@@ -193,9 +200,9 @@ export class ApproveEventPage implements OnInit {
modal.onDidDismiss()
.then( async (res) => {
if(res.data.option == 'save') {
if(res.data.option == 'save') {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
@@ -203,7 +210,7 @@ export class ApproveEventPage implements OnInit {
"ReviewUserComment": res.data,
}
}
const loader = this.toastService.loading();
try {
@@ -216,11 +223,11 @@ export class ApproveEventPage implements OnInit {
} finally {
loader.remove()
}
} else {
}
}
}, (error) => {
console.log(error)
});
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<ion-toolbar class="header-toolbar" >
<div class="main-header px-20" style="overflow: unset !important;">
<div class="title-content d-flex">
<div class="left">
@@ -127,22 +127,17 @@ export class ViewEventPage implements OnInit {
}
async loadEvent() {
try {
let res = await this.agendaDataRepository.getEventById(this.eventId)
let res = await this.agendaDataRepository.getEventById(this.eventId).toPromise()
console.log('Loaded Event', res)
res = this.dateService.fixDate(res as any)
this.loadedEvent = res as any;
this.setTimeZone()
// this.addEventToDb(res);
} catch (error) {
if(res.isOk()) {
console.log('Loaded Event', res.value)
let changeDate = this.dateService.fixDate(res.value as any) as any
this.loadedEvent = changeDate as any;
this.setTimeZone()
} else {
this.viewEventDetailDismiss.emit({
type: 'close'
})
// this.httpErrorHandle.httpStatusHandle(error)
}
}