mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Fix event to approve
This commit is contained in:
@@ -71,6 +71,7 @@ export class ProcessesService {
|
||||
};
|
||||
return this.http.get<any>(`${geturl}`, options);
|
||||
}
|
||||
|
||||
|
||||
SetTaskToPending(serialNumber:string): Observable<any>{
|
||||
const geturl = environment.apiURL + 'Tasks/SetTaskPending';
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
</ion-header> -->
|
||||
|
||||
<ion-content id="main-content">
|
||||
|
||||
<div class="main-content d-flex height-100" *ngIf="loadedEvent">
|
||||
<div class="content d-flex flex-column">
|
||||
<div class="header-content width-100 d-flex justify-space-between">
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container-div">
|
||||
<div class="container-div width-100">
|
||||
<div class="ion-item-class-2">
|
||||
<div class="ion-icon-class">
|
||||
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
||||
|
||||
@@ -73,7 +73,7 @@ export class EditEventToApprovePage implements OnInit {
|
||||
Body: "",
|
||||
OccurrenceType: '',
|
||||
Category: '',
|
||||
LastOccurrence: '',
|
||||
LastOccurrence: new Date(),
|
||||
IsRecurring: false,
|
||||
ParticipantsList: [],
|
||||
Agenda: '',
|
||||
@@ -127,7 +127,6 @@ export class EditEventToApprovePage implements OnInit {
|
||||
private toastService: ToastService,
|
||||
) {
|
||||
this.isEventEdited = false;
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@@ -147,6 +146,8 @@ export class EditEventToApprovePage implements OnInit {
|
||||
this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
|
||||
this.eventProcess = result
|
||||
|
||||
this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
|
||||
|
||||
this.restoreDatepickerData()
|
||||
|
||||
// description
|
||||
|
||||
@@ -11,7 +11,6 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { Attachment } from 'src/app/models/attachment.model';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { FormControl, FormGroup, Validators } from '@angular/forms';
|
||||
import * as moment from 'moment';
|
||||
import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
|
||||
|
||||
@Component({
|
||||
@@ -65,11 +64,8 @@ export class EditEventPage implements OnInit {
|
||||
@Output() setIntervenientCC = new EventEmitter<any>();
|
||||
@Output() clearPostEvent = new EventEmitter<any>();
|
||||
|
||||
|
||||
showLoader = false
|
||||
|
||||
|
||||
|
||||
@ViewChild('picker') picker: any;
|
||||
@ViewChild('fim') fim: any;
|
||||
@ViewChild('inicio') inicio: any;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
|
||||
import { EventBody } from 'src/app/models/eventbody.model';
|
||||
import { EventPerson } from 'src/app/models/eventperson.model';
|
||||
import { Event } from 'src/app/models/event.model';
|
||||
import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { ModalController, NavParams } from '@ionic/angular';
|
||||
import { ModalController } from '@ionic/angular';
|
||||
import { NavigationEnd, Router } from '@angular/router';
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
import { LoginUserRespose } from 'src/app/models/user.model';
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import { Component, OnInit} from '@angular/core';
|
||||
|
||||
import { customTask} from '../../../models/dailyworktask.model';
|
||||
import { ProcessesService } from 'src/app/services/processes.service';
|
||||
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
import { LoginUserRespose } from 'src/app/models/user.model';
|
||||
import { NavigationStart, Router } from '@angular/router';
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<ion-header>
|
||||
<div class="title-content">
|
||||
<div class="middle">
|
||||
<ion-label class="title">Editar evento por aprovar gg</ion-label>
|
||||
<ion-label class="title">Editar evento por aprovar</ion-label>
|
||||
</div>
|
||||
</div>
|
||||
</ion-header>
|
||||
|
||||
@@ -69,7 +69,7 @@ export class EditEventToApproveComponent implements OnInit {
|
||||
Body: "",
|
||||
OccurrenceType: '',
|
||||
Category: '',
|
||||
LastOccurrence: '',
|
||||
LastOccurrence: new Date(),
|
||||
ParticipantsList: [],
|
||||
Agenda: '',
|
||||
EndDate: '',
|
||||
@@ -134,9 +134,10 @@ export class EditEventToApproveComponent implements OnInit {
|
||||
|
||||
const result = await this.processes.GetTask(this.serialNumber).toPromise();
|
||||
console.log(result);
|
||||
|
||||
|
||||
this.eventProcess = result
|
||||
this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType
|
||||
this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
|
||||
|
||||
this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate);
|
||||
this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
|
||||
|
||||
@@ -63,6 +63,4 @@ export class LocalstoreService {
|
||||
|
||||
}
|
||||
|
||||
export const localstoreService = new LocalstoreService()
|
||||
|
||||
console.log( AES.encrypt( 'pode ser qualquer', 'ayrton').toString() )
|
||||
export const localstoreService = new LocalstoreService()
|
||||
Reference in New Issue
Block a user