mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
list event to approve
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||
|
||||
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
|
||||
<div *ngIf="calendars == 'Meu calendario'">
|
||||
<div *ngIf="calendars == 'Meu calendario'">
|
||||
<!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
|
||||
<span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
|
||||
<span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR' ">Minha agenda</span> -->
|
||||
@@ -66,17 +66,17 @@
|
||||
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
|
||||
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
|
||||
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
|
||||
|
||||
|
||||
<div *ngIf="event.activityInstanceName">
|
||||
<div class="label-event-type font-13-rem"> {{ event.activityInstanceName }} </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</ion-list>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</ion-content>
|
||||
|
||||
@@ -10,6 +10,7 @@ import { EventsService } from 'src/app/services/events.service';
|
||||
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
|
||||
import { EventToApproveList } from 'src/app/models/entiry/agenda/eventToApproveList';
|
||||
@Component({
|
||||
selector: 'app-event-list',
|
||||
templateUrl: './event-list.page.html',
|
||||
@@ -19,7 +20,7 @@ export class EventListPage implements OnInit {
|
||||
// [desktop] event list to approve
|
||||
|
||||
showLoader: boolean;
|
||||
eventsList: any = []
|
||||
eventsList: EventToApproveList = []
|
||||
|
||||
eventPerson: EventPerson;
|
||||
eventBody: EventBody;
|
||||
@@ -92,61 +93,34 @@ export class EventListPage implements OnInit {
|
||||
return new Date(e).toDateString()
|
||||
}
|
||||
|
||||
|
||||
|
||||
async LoadToApproveEvents() {
|
||||
|
||||
|
||||
/* if(SessionStore.user.Profile == 'PR') {
|
||||
return false
|
||||
} */
|
||||
|
||||
this.showLoader = true;
|
||||
|
||||
const segment: any = this.segment
|
||||
let userId;
|
||||
|
||||
if(this.segment == 'Meu calendario') {
|
||||
// color
|
||||
|
||||
if(SessionStore.user.Profile == 'PR') {
|
||||
this.color = 'pr'
|
||||
} else {
|
||||
this.color = 'mdgpr'
|
||||
}
|
||||
|
||||
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
|
||||
try {
|
||||
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
|
||||
} catch (error) {
|
||||
this.eventsList = [];
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
alert('my agenda')
|
||||
this.eventoaprovacaostore.save(segment, this.eventsList)
|
||||
|
||||
let a = await this.AgendaDataRepositoryService.eventToApprove({userId: this.SessionStore.user.UserId}).toPromise()
|
||||
|
||||
userId = SessionStore.user.UserId
|
||||
|
||||
} else if(segment) {
|
||||
// console.log('segment', segment)
|
||||
|
||||
this.color = 'pr'
|
||||
let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
|
||||
try {
|
||||
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
|
||||
} catch(error) {
|
||||
this.eventsList = []
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
this.eventsList = this.eventsList
|
||||
this.eventsList = this.eventsList
|
||||
this.eventoaprovacaostore.save(segment, this.eventsList)
|
||||
userId = segment
|
||||
}
|
||||
|
||||
this.showLoader = false;
|
||||
|
||||
try {
|
||||
let allEvents = await this.AgendaDataRepositoryService.eventToApproveList({userId}).toPromise()
|
||||
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
|
||||
this.eventoaprovacaostore.save(segment, this.eventsList)
|
||||
} catch (e) {
|
||||
this.eventsList = [];
|
||||
this.showLoader = false;
|
||||
}
|
||||
}
|
||||
|
||||
async LoadToApproveEventsNoLoader() {
|
||||
|
||||
Reference in New Issue
Block a user