This commit is contained in:
tiago.kayaya
2021-06-30 15:01:30 +01:00
12 changed files with 176 additions and 153 deletions
+4 -2
View File
@@ -423,8 +423,9 @@
[class.transparent]="mobileComponent.transparentEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber" [serialNumber] = "eventToaprove.serialNumber"
[InstanceId] = "eventToaprove.InstanceId" [InstanceId] = "eventToaprove.InstanceId"
[saveData] = "eventToaprove.saveData"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)" (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
(closeEventToApprove)="closeEventToApprove()" (closeEventToApprove)="closeEventToApproveGoBack()"
(AproveEventEditEvent)="AproveEventEditEvent($event)" (AproveEventEditEvent)="AproveEventEditEvent($event)"
(EditApproveEventDismiss)="EditApproveEventDismiss()" (EditApproveEventDismiss)="EditApproveEventDismiss()"
[eventAttendees]="contacts" [eventAttendees]="contacts"
@@ -437,10 +438,11 @@
[taskParticipants]="taskParticipants" [taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc" [taskParticipantsCc]="taskParticipantsCc"
[serialNumber] = "eventToaprove.serialNumber" [serialNumber] = "eventToaprove.serialNumber"
[saveData] = "eventToaprove.saveData"
(setContact)="setContact($event)" (setContact)="setContact($event)"
(clearContact)="clearContact()" (clearContact)="clearContact()"
(openAttendeesComponent)="openAttendeesComponent($event)" (openAttendeesComponent)="openAttendeesComponent($event)"
(closeComponent)="closeComponentEditEventOrAdd()" (closeComponent)="approveEventDismissGoBack()"
(setIntervenient)="setIntervenient($event)" (setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)" (setIntervenientCC)="setIntervenientCC($event)"
></app-edit-event-to-approve> ></app-edit-event-to-approve>
+32 -13
View File
@@ -20,12 +20,9 @@ import {
DAYS_OF_WEEK, DAYS_OF_WEEK,
} from 'angular-calendar'; } from 'angular-calendar';
import { CustomDateFormatter } from './custom-date-formatter.provider'; import { CustomDateFormatter } from './custom-date-formatter.provider';
import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
import { ViewEventPage } from './view-event/view-event.page';
import { NewEventPage } from './new-event/new-event.page'; import { NewEventPage } from './new-event/new-event.page';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { letProto } from 'rxjs-compat/operator/let';
import { DateAdapter } from '@angular/material/core'; import { DateAdapter } from '@angular/material/core';
@Component({ @Component({
@@ -1209,7 +1206,9 @@ export class AgendaPage implements OnInit {
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
} }
async viewEventsToApprove(){
// called from this template and child event
async viewEventsToApprove() {
await this.cloneAllmobileComponent(); await this.cloneAllmobileComponent();
if( window.innerWidth <= 801){ if( window.innerWidth <= 801){
@@ -1217,13 +1216,26 @@ export class AgendaPage implements OnInit {
} else { } else {
// hide all components // hide all components
this.cloneAllmobileComponent(); this.cloneAllmobileComponent();
this.mobileComponent.transparentEventList = false;
this.mobileComponent.showEventList = true; this.mobileComponent.showEventList = true;
} }
}
approveEventDismissGoBack() {
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
// this.mobileComponent.showEventList = false;
this.mobileComponent.transparentEventList = true;
this.mobileComponent.showEventToApprove = true;
} }
approveEventDismiss({saveData, serialNumber, action}){ approveEventDismiss({saveData, serialNumber, action}){
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
if(action == 'Aprovar'){ if(action == 'Aprovar'){
this.eventToaprove = { this.eventToaprove = {
back: true, back: true,
@@ -1235,19 +1247,26 @@ export class AgendaPage implements OnInit {
this.mobileComponent.transparentEventList = true; this.mobileComponent.transparentEventList = true;
this.mobileComponent.showEventToApprove = true; this.mobileComponent.showEventToApprove = true;
} }
} }
closeEventToApprove(){ closeEventToApprove() {
if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true){
this.mobileComponent.showEventToApprove = false;
this.mobileComponent.showEventList = true;
}
closeEventToApproveGoBack() {
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
} else {
// hide all components
this.cloneAllmobileComponent();
this.mobileComponent.transparentEventList = false; this.mobileComponent.transparentEventList = false;
this.mobileComponent.showEventToApprove = false; this.mobileComponent.showEventList = true;
this.eventToaprove.back = false;
} }
else {
this.mobileComponent.showEventToApprove = false;
this.mobileComponent.showEventList = false;
}
} }
EditApproveEventDismiss(){ EditApproveEventDismiss(){
@@ -170,13 +170,14 @@
</div> </div>
<div class="middle-content"> <div class="container-div width-100">
<div *ngIf="postEvent.Body.Text"> <div class="ion-item-class-2 d-flex width-100">
<h5>Detalhes</h5> <div class="ion-icon-class d-flex">
<ion-item lines="none" class="ion-no-margin ion-no-padding"> <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
<ion-textarea [(ngModel)]="postEvent.Body.Text" placeholder="Detalhes" ></ion-textarea> </div>
</ion-item> <div class="ion-input-class-no-height width-100 flex-grow-1">
<div class="line"></div> <ion-textarea [(ngModel)]="postEvent.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
</div>
</div> </div>
</div> </div>
@@ -2,14 +2,14 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content id="main-content"> <ion-content id="main-content" >
<div class="main-content d-flex height-100"> <div class="main-content d-flex height-100" *ngIf="loadedEvent" >
<div *ngIf="loadedEvent" class="content d-flex flex-column width-100"> <div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
<div class="header-content width-100 d-flex justify-space-between"> <div class="header-content width-100 d-flex justify-space-between">
<div (click)="goBack()" class="header-icon-left cursor-pointer"> <div (click)="goBack()" class="header-icon-left cursor-pointer">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon> <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div> </div>
<div class="header-title flex-grow-1 cursor-pointer"> <div class="header-title flex-grow-1 cursor-pointer" *ngIf="loadedEvent.workflowInstanceDataFields.Subject">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label> <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div> </div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true"> <div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">
@@ -73,7 +73,6 @@
</div> </div>
</div> </div>
<div *ngIf="loadedEvent" class="aside-right flex-column height-100"> <div *ngIf="loadedEvent" class="aside-right flex-column height-100">
<div class="aside-buttons"> <div class="aside-buttons">
<button hidden full class="btn-ok" shape="round" >Editar evento</button> <button hidden full class="btn-ok" shape="round" >Editar evento</button>
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,6 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
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'; import { ToastService } from 'src/app/services/toast.service';
@Component({ @Component({
@@ -20,8 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
}) })
export class ApproveEventPage implements OnInit { export class ApproveEventPage implements OnInit {
event: Event; event: Event;
loadedEvent:any; loadedEvent:any = false
loadedEvent1:any;
loadedAttachments:any; loadedAttachments:any;
customDate:any; customDate:any;
today:any; today:any;
@@ -51,7 +48,6 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController, private animationController: AnimationController,
private toastService: ToastService, private toastService: ToastService,
) { ) {
this.activatedRoute.paramMap.subscribe(params => { this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]); console.log(params["params"]);
@@ -260,10 +256,8 @@ export class ApproveEventPage implements OnInit {
this.router.navigate(['/home/gabinete-digital'], navigationExtras); this.router.navigate(['/home/gabinete-digital'], navigationExtras);
} }
async editar(serialNumber: string) { async editar(serialNumber: string) {
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: EditEventToApproveComponent, component: EditEventToApproveComponent,
componentProps: { componentProps: {
@@ -282,7 +276,4 @@ export class ApproveEventPage implements OnInit {
} }
} }
@@ -1,11 +1,10 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.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 { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular'; import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page'; import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { NavigationEnd, Router } from '@angular/router';
@Component({ @Component({
selector: 'app-event-list', selector: 'app-event-list',
@@ -13,11 +12,13 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
styleUrls: ['./event-list.page.scss'], styleUrls: ['./event-list.page.scss'],
}) })
export class EventListPage implements OnInit { export class EventListPage implements OnInit {
// [desktop] event list to approve
profile:string; profile:string;
segment:string; segment:string;
showLoader: boolean; showLoader: boolean;
eventsPRList: any; eventsPRList: any = []
eventsMDGPRList: any; eventsMDGPRList: any = []
eventPerson: EventPerson; eventPerson: EventPerson;
eventBody: EventBody; eventBody: EventBody;
categories: string[]; categories: string[];
@@ -27,8 +28,7 @@ export class EventListPage implements OnInit {
constructor( constructor(
private processes:ProcessesService, private processes:ProcessesService,
private modalController: ModalController, private modalController: ModalController,
private router: Router, private router: Router
private activatedRoute: ActivatedRoute,
) { } ) { }
ngOnInit() { ngOnInit() {
@@ -18,6 +18,7 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationFolder } from 'src/app/models/publicationfolder';
import { ViewPublicationsPage } from '../view-publications/view-publications.page'; import { ViewPublicationsPage } from '../view-publications/view-publications.page';
import { LoadingService } from 'src/app/services/loading.service'; import { LoadingService } from 'src/app/services/loading.service';
import { ToastService } from 'src/app/services/toast.service';
@Component({ @Component({
selector: 'app-new-publication', selector: 'app-new-publication',
@@ -52,6 +53,7 @@ export class NewPublicationPage implements OnInit {
private navParams: NavParams, private navParams: NavParams,
private publications: PublicationsService, private publications: PublicationsService,
private camera: Camera, private camera: Camera,
private toastService: ToastService,
) { ) {
this.publicationType = this.navParams.get('publicationType'); this.publicationType = this.navParams.get('publicationType');
@@ -112,7 +114,7 @@ export class NewPublicationPage implements OnInit {
if(this.publicationType == '3'){ if(this.publicationType == '3'){
console.log(this.navParams.get('publication')); console.log(this.navParams.get('publication'));
if(this.capturedImage != ''){ if(this.capturedImage != '') {
this.publication = { this.publication = {
DateIndex: this.publication.DateIndex, DateIndex: this.publication.DateIndex,
DocumentId:this.publication.DocumentId, DocumentId:this.publication.DocumentId,
@@ -124,10 +126,18 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.capturedImage, FileBase64: this.capturedImage,
FileExtension: 'jpeg', FileExtension: 'jpeg',
} }
console.log('Edit change image');
try {
console.log(this.publication); console.log(this.publication);
this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise();
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.toastService.successMessage("Publicação criado")
this.close(); this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
}
} }
else{ else{
this.publication = { this.publication = {
@@ -141,10 +151,18 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.publication.FileBase64, FileBase64: this.publication.FileBase64,
FileExtension: 'jpeg', FileExtension: 'jpeg',
} }
console.log('Edit - keep image'); /* console.log('Edit - keep image');
console.log(this.publication); */
try {
console.log(this.publication); console.log(this.publication);
this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise(); await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.toastService.successMessage("Publicação criado")
this.close(); this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
}
} }
} }
else{ else{
@@ -164,6 +182,19 @@ export class NewPublicationPage implements OnInit {
console.log(this.publication); */ console.log(this.publication); */
this.publications.CreatePublication(this.folderId, this.publication).toPromise(); this.publications.CreatePublication(this.folderId, this.publication).toPromise();
this.close(); this.close();
try {
console.log(this.publication);
await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
this.toastService.successMessage("Publicação criado")
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
}
} }
} }
@@ -177,13 +208,13 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = ''; this.capturedImage = '';
} }
setTitle(){ setTitle(){
if(this.publicationType == '1'){ if(this.publicationType == '1') {
this.publicationTitle = 'Nova Publicação Rápida'; this.publicationTitle = 'Nova Publicação Rápida';
} }
else if(this.publicationType == '2'){ else if(this.publicationType == '2') {
this.publicationTitle = 'Nova Publicação'; this.publicationTitle = 'Nova Publicação';
} }
else if(this.publicationType == '3'){ else if(this.publicationType == '3') {
this.publicationTitle = 'Editar Publicação'; this.publicationTitle = 'Editar Publicação';
this.pub = this.navParams.get('publication'); this.pub = this.navParams.get('publication');
} }
@@ -13,14 +13,14 @@
</ion-header> --> </ion-header> -->
<ion-content id="main-content"> <ion-content id="main-content">
<div class="main-content d-flex height-100"> <div class="main-content d-flex height-100" *ngIf="loadedEvent">
<div class="content d-flex flex-column"> <div class="content d-flex flex-column">
<div class="header-content width-100 d-flex justify-space-between"> <div class="header-content width-100 d-flex justify-space-between">
<div (click)="close()" class="header-icon-left cursor-pointer"> <div (click)="close()" class="header-icon-left cursor-pointer">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon> <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div> </div>
<div class="header-title flex-grow-1 cursor-pointer"> <div class="header-title flex-grow-1 cursor-pointer">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label> <label>{{loadedEvent.workflowInstanceDataFields.Subject}} </label>
</div> </div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}"> <div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
<button class="btn-no-color"> <button class="btn-no-color">
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { NavigationExtras, Router } from '@angular/router'; import { NavigationExtras, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model'; import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -8,12 +8,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page'; import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from '../../gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestPage } from '../../popover/bad-request/bad-request.page';
import { SuccessMessagePage} from '../../popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service'; import { ToastService } from 'src/app/services/toast.service';
@Component({ @Component({
selector: 'app-approve-event', selector: 'app-approve-event',
templateUrl: './approve-event.page.html', templateUrl: './approve-event.page.html',
@@ -47,13 +43,11 @@ export class ApproveEventPage implements OnInit {
private processes:ProcessesService, private processes:ProcessesService,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private popoverController: PopoverController, private popoverController: PopoverController,
private menu: MenuController,
private alertService: AlertService, private alertService: AlertService,
private iab: InAppBrowser, private iab: InAppBrowser,
private animationController: AnimationController,
private toastService: ToastService private toastService: ToastService
) { ) {
// $$$ // Event to approve list
} }
@@ -87,7 +81,6 @@ export class ApproveEventPage implements OnInit {
async approveTask(serialNumber:string){ async approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" } let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
try { try {
await this.processes.PostTaskAction(body).toPromise() await this.processes.PostTaskAction(body).toPromise()
@@ -1,19 +1,16 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { AlertController, AnimationController, ModalController } from '@ionic/angular'; import { AlertController, ModalController } from '@ionic/angular';
import * as moment from 'moment'; import * as moment from 'moment';
import { Attachment } from 'src/app/models/attachment.model'; import { Attachment } from 'src/app/models/attachment.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document'; import { SearchDocument } from 'src/app/models/search-document';
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchPage } from 'src/app/pages/search/search.page';
import { AttachmentsService } from 'src/app/services/attachments.service'; import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service'; import { ToastService } from 'src/app/services/toast.service';
import { Event } from '../../../models/event.model'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: { parse: {
@@ -65,7 +62,6 @@ export class EditEventToApprovePage implements OnInit {
@Input() serialNumber: string @Input() serialNumber: string
loadedAttachments: Attachment[]= [] loadedAttachments: Attachment[]= []
eventProcess = { eventProcess = {
@@ -90,8 +86,6 @@ export class EditEventToApprovePage implements OnInit {
} }
show = false show = false
postEvent: Event;
isRecurring:string; isRecurring:string;
isEventEdited: boolean; isEventEdited: boolean;
segment:string = "true"; segment:string = "true";
@@ -121,25 +115,30 @@ export class EditEventToApprovePage implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private processes:ProcessesService, private processes:ProcessesService,
private animationController: AnimationController,
private toastService: ToastService, private toastService: ToastService,
) { ) {
/* this.serialNumber = this.navParams.get('serialNumber'); */ /* this.serialNumber = this.navParams.get('serialNumber'); */
this.isEventEdited = false; this.isEventEdited = false;
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date()));
} }
ngOnInit() { ngOnInit() {
if(!this.restoreTemporaryData()){
} else {
alert('restore!!')
}
this.getTask(); this.getTask();
console.log(this.serialNumber);
// console.log(this.serialNumber);
} }
async getTask() { async getTask() {
console.log('this.eventProcess', this.eventProcess); // console.log('this.eventProcess', this.eventProcess);
const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{ const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{
this.eventProcess = result this.eventProcess = result
@@ -163,6 +162,7 @@ export class EditEventToApprovePage implements OnInit {
this.isRecurring = "Repete"; this.isRecurring = "Repete";
} }
if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => { this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
if(e.IsRequired) { if(e.IsRequired) {
this.taskParticipants.push(e); this.taskParticipants.push(e);
@@ -170,11 +170,14 @@ export class EditEventToApprovePage implements OnInit {
this.taskParticipantsCc.push(e); this.taskParticipantsCc.push(e);
} }
}) })
}
}) })
} }
close() { close() {
console.log('CLOSE');
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
this.closeComponent.emit(); this.closeComponent.emit();
/* this.setIntervenient.emit([]); /* this.setIntervenient.emit([]);
@@ -253,64 +256,31 @@ export class EditEventToApprovePage implements OnInit {
} }
/* async openAttendees() { // setIntervenient(data){
// this.taskParticipants = data;
// this.postEvent.Attendees = data;
// }
if(window.innerWidth <= 1024) { // setIntervenientCC(data) {
const modal = await this.modalController.create({ // this.taskParticipantsCc = data;
component: AttendeesPageModal, // }
componentProps: {
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee modal modal-desktop',
backdropDismiss: false
});
await modal.present(); // addParticipants(){
// this.adding = 'intervenient'
modal.onDidDismiss().then((data) => { // this.openAttendees();
// }
if(data){ // addParticipantsCC(){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants']; // this.adding = 'CC'
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; // this.openAttendees();
// }
this.setIntervenient(newAttendees); dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.setIntervenientCC(newAttendeesCC);
}
});
} else {
this.showAttendees = true
}
}
setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
setIntervenientCC(data) {
this.taskParticipantsCc = data;
}
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
addParticipantsCC(){
this.adding = 'CC'
this.openAttendees();
}
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
this.taskParticipants = taskParticipants; this.taskParticipants = taskParticipants;
this.taskParticipantsCc = taskParticipantsCc; this.taskParticipantsCc = taskParticipantsCc;
} */ }
async addParticipants() { async addParticipants() {
@@ -340,13 +310,30 @@ export class EditEventToApprovePage implements OnInit {
this.getDatepickerData() this.getDatepickerData()
window['temp.path:/home/agenda/edit-event-to-approve.page.ts'] = { window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {
postEvent: this.postEvent, eventProcess: this.eventProcess
segment: this.segment
} }
} }
restoreTemporaryData(): boolean {
const restoredData = window['temp.path:/shared/agenda/edit-event-to-approve.ts']
if(JSON.stringify(restoredData) != "{}" && undefined != restoredData) {
this.eventProcess = restoredData.eventProcess
// restore dater for date and hours picker
this.restoreDatepickerData()
return true;
} else {
return false;
}
}
async getAttachments() { async getAttachments() {
let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
@@ -357,7 +344,7 @@ export class EditEventToApprovePage implements OnInit {
this.loadedAttachments = result this.loadedAttachments = result
console.log('this.loadedAttachments', this.loadedAttachments, result) // console.log('this.loadedAttachments', this.loadedAttachments, result)
} }
deleteAttachment(attachment: Attachment, index) { deleteAttachment(attachment: Attachment, index) {
@@ -12,7 +12,7 @@ import { NavigationEnd, Router } from '@angular/router';
styleUrls: ['./event-list.page.scss'], styleUrls: ['./event-list.page.scss'],
}) })
export class EventListPage implements OnInit { export class EventListPage implements OnInit {
// [desktop] event list to approve
showLoader: boolean; showLoader: boolean;
eventsPRList: any; eventsPRList: any;
@@ -38,7 +38,7 @@ export class EventListPage implements OnInit {
/* console.log(this.profile); */ /* console.log(this.profile); */
if(this.profile == "mdgpr"){ if(this.profile == "mdgpr") {
this.profile = 'MDGPR' this.profile = 'MDGPR'
} else { } else {
this.profile = 'PR' this.profile = 'PR'
@@ -53,7 +53,7 @@ export class EventListPage implements OnInit {
}); });
} }
LoadToApproveEvents(){ LoadToApproveEvents() {
this.showLoader = true; this.showLoader = true;
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
@@ -65,22 +65,20 @@ export class EventListPage implements OnInit {
this.eventsMDGPRList = res; this.eventsMDGPRList = res;
}); });
} }
async openApproveModal(eventSerialNumber, data){ async openApproveModal(eventSerialNumber, data) {
let a =this.eventsMDGPRList.filter((elem)=>{ let a =this.eventsMDGPRList.filter((elem)=>{
console.log(eventSerialNumber," ",elem.serialNumber) console.log(eventSerialNumber," ",elem.serialNumber)
return eventSerialNumber == elem.serialNumber return eventSerialNumber == elem.serialNumber
}); });
console.log(a);
this.approveEventDismiss.emit({ this.approveEventDismiss.emit({
"serialNumber": eventSerialNumber, "serialNumber": eventSerialNumber,
"action": "Aprovar", "action": "Aprovar",
"saveData": data "saveData": data
}); });
} }
doRefresh(event) { doRefresh(event) {
this.LoadToApproveEvents(); this.LoadToApproveEvents();
console.log('refresh'); console.log('refresh');
@@ -63,12 +63,14 @@ export class ViewPublicationsPage implements OnInit {
close(){ close(){
this.closeDesktopComponent.emit(); this.closeDesktopComponent.emit();
} }
getPublicationDetail(){
getPublicationDetail() {
this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{ this.publications.GetPublicationFolderById(this.folderId).subscribe(res=>{
console.log(res); console.log(res);
this.item = res; this.item = res;
}); });
} }
getPublications(){ getPublications(){
this.showLoader = true; this.showLoader = true;