mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 05:45:50 +00:00
Fix event to approve
This commit is contained in:
@@ -18,10 +18,11 @@ import { ReactiveFormsModule } from '@angular/forms';
|
|||||||
import { MatButtonModule } from '@angular/material/button';
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
import { MatSelectModule } from '@angular/material/select';
|
import { MatSelectModule } from '@angular/material/select';
|
||||||
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
|
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
|
||||||
import { MAT_DATE_LOCALE } from '@angular/material/core';
|
|
||||||
import { MatDatepickerModule } from '@angular/material/datepicker';
|
import { MatDatepickerModule } from '@angular/material/datepicker';
|
||||||
import { MatInputModule } from '@angular/material/input';
|
import { MatInputModule } from '@angular/material/input';
|
||||||
import { MatDialogModule } from '@angular/material/dialog';
|
import { MatDialogModule } from '@angular/material/dialog';
|
||||||
|
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -41,6 +42,7 @@ import { MatDialogModule } from '@angular/material/dialog';
|
|||||||
MatButtonModule,
|
MatButtonModule,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
MatDialogModule,
|
MatDialogModule,
|
||||||
|
AttendeeModalPageModule,
|
||||||
],
|
],
|
||||||
declarations: [EditEventToApprovePage],
|
declarations: [EditEventToApprovePage],
|
||||||
exports: [EditEventToApprovePage]
|
exports: [EditEventToApprovePage]
|
||||||
|
|||||||
@@ -280,7 +280,7 @@
|
|||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class-no-height d-flex">
|
<div class="ion-input-class-no-height d-flex" (click)="addParticipants()">
|
||||||
<div class="list-people flex-grow-1">
|
<div class="list-people flex-grow-1">
|
||||||
<ion-item lines="none">
|
<ion-item lines="none">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
@@ -289,7 +289,7 @@
|
|||||||
</ion-list>
|
</ion-list>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="add-people cursor-pointer" (click)="addParticipants()">
|
<div class="add-people cursor-pointer" >
|
||||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -301,7 +301,7 @@
|
|||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class-no-height d-flex">
|
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
|
||||||
<div class="list-people flex-grow-1">
|
<div class="list-people flex-grow-1">
|
||||||
<ion-item lines="none">
|
<ion-item lines="none">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
@@ -310,7 +310,7 @@
|
|||||||
</ion-list>
|
</ion-list>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="add-people cursor-pointer" (click)="addParticipantsCC()">
|
<div class="add-people cursor-pointer" >
|
||||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -361,6 +361,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</ion-item-sliding>
|
</ion-item-sliding>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|
||||||
|
|||||||
@@ -132,9 +132,6 @@ export class EditEventToApprovePage implements OnInit {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
console.log('EDITAR');
|
|
||||||
|
|
||||||
|
|
||||||
if(this.restoreTemporaryData()){
|
if(this.restoreTemporaryData()){
|
||||||
this.setOtherData()
|
this.setOtherData()
|
||||||
} else {
|
} else {
|
||||||
@@ -338,26 +335,6 @@ export class EditEventToApprovePage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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}) {
|
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
|
||||||
this.taskParticipants = removeDuplicate(taskParticipants) ;
|
this.taskParticipants = removeDuplicate(taskParticipants) ;
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ import { ReactiveFormsModule } from '@angular/forms';
|
|||||||
import { MatButtonModule } from '@angular/material/button';
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
import { MatSelectModule } from '@angular/material/select';
|
import { MatSelectModule } from '@angular/material/select';
|
||||||
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
|
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
|
||||||
import { MAT_DATE_LOCALE } from '@angular/material/core';
|
|
||||||
import { MatDatepickerModule } from '@angular/material/datepicker';
|
import { MatDatepickerModule } from '@angular/material/datepicker';
|
||||||
import { MatInputModule } from '@angular/material/input';
|
import { MatInputModule } from '@angular/material/input';
|
||||||
import { MatDialogModule } from '@angular/material/dialog';
|
import { MatDialogModule } from '@angular/material/dialog';
|
||||||
|
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -41,6 +41,7 @@ import { MatDialogModule } from '@angular/material/dialog';
|
|||||||
MatButtonModule,
|
MatButtonModule,
|
||||||
ReactiveFormsModule,
|
ReactiveFormsModule,
|
||||||
MatDialogModule,
|
MatDialogModule,
|
||||||
|
AttendeeModalPageModule,
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
EditEventToApproveComponent
|
EditEventToApproveComponent
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<ion-header>
|
<ion-header>
|
||||||
<div class="title-content">
|
<div class="title-content">
|
||||||
<div class="middle">
|
<div class="middle">
|
||||||
<ion-label class="title">Editar evento por aprovar</ion-label>
|
<ion-label class="title">Editar evento por aprovar gg</ion-label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
@@ -290,12 +290,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container-div width-100">
|
<div class="container-div width-100" >
|
||||||
<div class="ion-item-class-2">
|
<div class="ion-item-class-2">
|
||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="ion-input-class-no-height d-flex">
|
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
|
||||||
<div class="list-people flex-grow-1">
|
<div class="list-people flex-grow-1">
|
||||||
<ion-item lines="none">
|
<ion-item lines="none">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
@@ -304,7 +304,7 @@
|
|||||||
</ion-list>
|
</ion-list>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="add-people cursor-pointer" (click)="addParticipantsCC()">
|
<div class="add-people cursor-pointer" >
|
||||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -259,7 +259,6 @@ export class EditEventToApproveComponent implements OnInit {
|
|||||||
Category: this.eventProcess.workflowInstanceDataFields.Category
|
Category: this.eventProcess.workflowInstanceDataFields.Category
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(event);
|
|
||||||
|
|
||||||
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
|
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
|
||||||
this.toastService.successMessage('Evento editado');
|
this.toastService.successMessage('Evento editado');
|
||||||
@@ -342,7 +341,6 @@ export class EditEventToApproveComponent implements OnInit {
|
|||||||
addParticipants(){
|
addParticipants(){
|
||||||
this.adding = 'intervenient'
|
this.adding = 'intervenient'
|
||||||
this.openAttendees();
|
this.openAttendees();
|
||||||
console.log('LOGS');
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user