Merge branch 'developer-c' of bitbucket.org:equilibriumito/gabinete-digital into feature/calendar

This commit is contained in:
Peter Maquiran
2021-03-30 15:41:31 +01:00
17 changed files with 96 additions and 68 deletions
+5
View File
@@ -26,6 +26,7 @@ registerLocaleData(localeDe);
import { CalendarModule, DateAdapter } from 'angular-calendar';
import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
@NgModule({
imports: [
CommonModule,
@@ -50,6 +51,10 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
ApproveEventComponent,
AttendeesPage,
AttendeeModalPage,
EventsToApprovePage,
],
entryComponents: [
EventsToApprovePage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [
+9 -1
View File
@@ -368,9 +368,17 @@
(approveEventDismiss) = "approveEventDismiss($event)"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
>
</app-event-list>
<!-- <app-events-to-approve
[profile]="profile"
*ngIf="mobileComponent.showEventList"
class="d-flex height-100 flex-column"
(approveEventDismiss) = "approveEventDismiss($event)"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
>
</app-events-to-approve> -->
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"