mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'feature/calendar' into developer
This commit is contained in:
@@ -45,7 +45,7 @@
|
||||
<ion-icon *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
|
||||
<ion-icon *ngIf="profile == 'pr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
|
||||
<ion-icon (click)="viewEventsToApprove()" class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
|
||||
<ion-icon (click)="openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
|
||||
<ion-icon (click)="clearContact();openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
|
||||
</ion-row>
|
||||
</ion-row>
|
||||
|
||||
@@ -283,29 +283,27 @@
|
||||
*ngSwitchCase="'day'"
|
||||
[viewDate]="viewDate"
|
||||
[events]="events"
|
||||
(eventClicked)="eventClicked($event)"
|
||||
(eventClicked)="clearContact();eventClicked($event)"
|
||||
>
|
||||
</mwl-calendar-day-view>
|
||||
</div>
|
||||
|
||||
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block"
|
||||
*ngIf="showTimelineMD">
|
||||
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="showTimelineMD">
|
||||
<mwl-calendar-day-view
|
||||
*ngSwitchCase="'day'"
|
||||
[viewDate]="viewDate"
|
||||
[events]="TimelineMD"
|
||||
(eventClicked)="eventClicked($event)"
|
||||
(eventClicked)="clearContact();eventClicked($event)"
|
||||
>
|
||||
</mwl-calendar-day-view>
|
||||
</div>
|
||||
|
||||
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md"
|
||||
*ngIf="showTimelinePR">
|
||||
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md" *ngIf="showTimelinePR">
|
||||
<mwl-calendar-day-view
|
||||
*ngSwitchCase="'day'"
|
||||
[viewDate]="viewDate"
|
||||
[events]="TimelinePR"
|
||||
(eventClicked)="eventClicked($event)"
|
||||
(eventClicked)="clearContact();eventClicked($event)"
|
||||
>
|
||||
</mwl-calendar-day-view>
|
||||
</div>
|
||||
@@ -321,12 +319,14 @@
|
||||
<div *ngIf="(
|
||||
mobileComponent.showAddNewEvent == false &&
|
||||
mobileComponent.showEditEvent == false &&
|
||||
mobileComponent.showEventDitails == false &&
|
||||
mobileComponent.showEventDetails == false &&
|
||||
mobileComponent.showEventList == false &&
|
||||
mobileComponent.showEventToApprove == false
|
||||
mobileComponent.showEventToApprove == false &&
|
||||
mobileComponent.showAttendees == false &&
|
||||
mobileComponent.showAttendeeModal == false
|
||||
)
|
||||
"
|
||||
class="text-black nothing-to-show">
|
||||
class="text-black nothing-to-show">
|
||||
Nenhum evento selecionado
|
||||
</div>
|
||||
|
||||
@@ -336,6 +336,11 @@
|
||||
[selectedSegment]=segment
|
||||
[selectedDate]="eventSelectedDate"
|
||||
(onAddEvent)="openAddEventDismiss($event)"
|
||||
(openAttendeesComponent)="openAttendeesComponent($event)"
|
||||
(cloneAllmobileComponent)="cloneAllmobileComponent()"
|
||||
[eventAttendees]="contacts"
|
||||
(clearContact)="clearContact()"
|
||||
(setContact)="setContact()"
|
||||
|
||||
></app-new-event>
|
||||
<!-- Edit -->
|
||||
@@ -343,15 +348,18 @@
|
||||
[profile]="profile"
|
||||
[selectedSegment]="segment"
|
||||
[postEvent]="postEvent"
|
||||
(cloneAllmobileComponent)="cloneAllmobileComponent($event)"
|
||||
|
||||
(cloneAllmobileComponent)="cloneAllmobileComponent()"
|
||||
(clearContact)="clearContact()"
|
||||
(openAttendeesComponent)="openAttendeesComponent($event)"
|
||||
(setContact)="setContact()"
|
||||
></app-edit-event>
|
||||
|
||||
<!-- View -->
|
||||
<app-view-event *ngIf="mobileComponent.showEventDitails"
|
||||
<app-view-event *ngIf="mobileComponent.showEventDetails"
|
||||
[profile]="profile"
|
||||
[eventId]="selectedEventId"
|
||||
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
|
||||
[eventAttendees]="contacts"
|
||||
></app-view-event>
|
||||
|
||||
|
||||
@@ -366,13 +374,30 @@
|
||||
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
|
||||
[serialNumber] = "eventToaprove.serialNumber"
|
||||
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
|
||||
(closeEventToApprove)="closeEventToApprove($event)"
|
||||
(closeEventToApprove)="closeEventToApprove()"
|
||||
(AproveEventEditEvent)="AproveEventEditEvent($event)"
|
||||
[eventAttendees]="contacts"
|
||||
>
|
||||
|
||||
</app-approve-event>
|
||||
|
||||
<app-attendees
|
||||
class="d-flex flex-column height-100"
|
||||
*ngIf="mobileComponent.showAttendees"
|
||||
(openAttendeeModal)="openAttendeeModal()"
|
||||
[eventAttendees]="contacts"
|
||||
(openAddEvent)="openAddEvent($event)"
|
||||
(GoBackEditOrAdd)="GoBackEditOrAdd()"
|
||||
>
|
||||
</app-attendees>
|
||||
|
||||
|
||||
|
||||
<app-attendee-modal
|
||||
class="d-flex flex-column height-100"
|
||||
*ngIf="mobileComponent.showAttendeeModal"
|
||||
(openAttendeesComponent)="openAttendeesComponent($event)"
|
||||
>
|
||||
</app-attendee-modal>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user