This commit is contained in:
tiago.kayaya
2021-06-29 14:15:56 +01:00
parent 175674ee71
commit c846aec4cb
13 changed files with 1199 additions and 165 deletions
+2
View File
@@ -30,6 +30,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo
import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module';
import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module';
import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module';
@NgModule({
imports: [
@@ -53,6 +54,7 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event
NewEventPageModule,
EventListPageModule,
EditEventPageModule,
EditEventToApprovePageModule,
],
declarations: [
AgendaPage
+23 -3
View File
@@ -356,7 +356,8 @@
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false &&
mobileComponent.showAttendeeModal == false
mobileComponent.showAttendeeModal == false &&
mobileComponent.showEditEventToApprove == false
)
"
class="text-black nothing-to-show">
@@ -407,7 +408,9 @@
></app-view-event>
<app-event-list [class.transparent]="mobileComponent.transparentEventList" *ngIf="mobileComponent.showEventList"
<app-event-list
[class.transparent]="mobileComponent.transparentEventList"
*ngIf="mobileComponent.showEventList"
[profile]="profile"
(approveEventDismiss) = "approveEventDismiss($event)"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
@@ -415,15 +418,32 @@
</app-event-list>
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
<app-approve-event class="d-flex flex-column"
*ngIf="mobileComponent.showEventToApprove"
[class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
[InstanceId] = "eventToaprove.InstanceId"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
(closeEventToApprove)="closeEventToApprove()"
(AproveEventEditEvent)="AproveEventEditEvent($event)"
(EditApproveEventDismiss)="EditApproveEventDismiss()"
[eventAttendees]="contacts"
>
</app-approve-event>
<app-edit-event-to-approve
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showEditEventToApprove"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[serialNumber] = "eventToaprove.serialNumber"
(setContact)="setContact($event)"
(clearContact)="clearContact()"
(openAttendeesComponent)="openAttendeesComponent($event)"
(closeComponent)="closeComponentEditEventOrAdd()"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
></app-edit-event-to-approve>
<app-attendee-modal
[footer]="true"
+9 -2
View File
@@ -135,7 +135,8 @@ export class AgendaPage implements OnInit {
transparentEventToApprove: false,
showEventToApprove: false,
showAttendees: false,
showAttendeeModal: false
showAttendeeModal: false,
showEditEventToApprove: false,
}
eventToaprove: any = {
@@ -1209,7 +1210,7 @@ export class AgendaPage implements OnInit {
}
async viewEventsToApprove(){
await this.cloneAllmobileComponent()
await this.cloneAllmobileComponent();
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
@@ -1249,6 +1250,11 @@ export class AgendaPage implements OnInit {
}
EditApproveEventDismiss(){
this.cloneAllmobileComponent();
this.mobileComponent.showEditEventToApprove = true;
}
async cloneAllmobileComponent(){
this.mobileComponent.showAddNewEvent = false;
@@ -1258,6 +1264,7 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showEventToApprove = false;
this.mobileComponent.showAttendees = false;
this.mobileComponent.showAttendeeModal = false;
this.mobileComponent.showEditEventToApprove = false;
this.closeEventToApprove();
}