diff --git a/package-lock.json b/package-lock.json index 056f6e598..47cdcaf0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2151,15 +2151,9 @@ }, "dependencies": { "@angular-devkit/core": { -<<<<<<< HEAD - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.2.tgz", - "integrity": "sha512-LUDO1AdIjereiMh0j5p9xJcdr9ifhbWCPxlZqfu5wHzUfhCx9gO2Lvjp6rZXQ3OedXg5IZUnyxHlzkszQOsgiw==", -======= "version": "11.2.1", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz", "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==", ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "dev": true, "requires": { "ajv": "6.12.6", @@ -2170,44 +2164,17 @@ } }, "@angular-devkit/schematics": { -<<<<<<< HEAD - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.2.tgz", - "integrity": "sha512-6bIxMwafz/+lwdtcshwOuFfhxTMU4RLma1uxBS34DXupMauPGl0IIXAy5cK9dXPlHLxuGsjeBiOM6eq033RLgw==", - "dev": true, - "requires": { - "@angular-devkit/core": "11.2.2", -======= "version": "11.2.1", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.1.tgz", "integrity": "sha512-y2tzJq+MMwLdQ6Li+AxjozI51miN5CjK9x9jtFHi+njqJr595WTNQi39RjyHxAue1VFMr8gu1VBnKGKJ1J3vNA==", "dev": true, "requires": { "@angular-devkit/core": "11.2.1", ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "ora": "5.3.0", "rxjs": "6.6.3" } }, "@schematics/angular": { -<<<<<<< HEAD - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.2.tgz", - "integrity": "sha512-TcxPy58adUnkirGXyZVVSMuKkA0eIz2PWSQWEgB9l7kO+5LvDOn+RMoc6AVx0s/bU9nH+eozBUJ1XAD/E8QnYQ==", - "dev": true, - "requires": { - "@angular-devkit/core": "11.2.2", - "@angular-devkit/schematics": "11.2.2", - "jsonc-parser": "3.0.0" - } - }, - "@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", - "dev": true - }, -======= "version": "11.2.1", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.1.tgz", "integrity": "sha512-CnN4bkRwhCp7jc4HGJ9qp/xqLwmnkn/zRf/EEb5tHFC0Bz2WvoNuAoqPRSkgIis3L+Ozahmeb8JxTIdazK1Hog==", @@ -2218,7 +2185,6 @@ "jsonc-parser": "3.0.0" } }, ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -2481,15 +2447,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", -<<<<<<< HEAD - "dev": true - }, - "ws": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", - "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==", -======= ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "dev": true } } @@ -3745,8 +3702,6 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, -<<<<<<< HEAD -======= "android-versions": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.6.0.tgz", @@ -3756,7 +3711,6 @@ "semver": "^5.7.1" } }, ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "angular-calendar": { "version": "0.28.22", "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.28.22.tgz", @@ -5426,8 +5380,6 @@ } } }, -<<<<<<< HEAD -======= "cordova-android": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz", @@ -5523,7 +5475,6 @@ } } }, ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "cordova-browser": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-6.0.0.tgz", @@ -6994,17 +6945,6 @@ "ws": "~7.4.2" }, "dependencies": { -<<<<<<< HEAD - "cookie": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", - "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" - }, - "ws": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", - "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==" -======= "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -7012,7 +6952,6 @@ "requires": { "ms": "^2.1.1" } ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 } } }, @@ -8637,6 +8576,12 @@ } } }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true + }, "humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -10666,6 +10611,12 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, "nan": { "version": "2.14.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", @@ -11336,10 +11287,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", -<<<<<<< HEAD - "dev": true, -======= ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "requires": { "bl": "^4.0.3", "chalk": "^4.1.0", @@ -13257,15 +13204,6 @@ } } }, -<<<<<<< HEAD - "protoduck": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", - "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", - "dev": true, - "requires": { - "genfun": "^5.0.0" -======= "properties-parser": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz", @@ -13273,7 +13211,6 @@ "dev": true, "requires": { "string.prototype.codepointat": "^0.2.0" ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 } }, "protractor": { @@ -15068,98 +15005,6 @@ "socket.io-parser": "~3.4.0" }, "dependencies": { -<<<<<<< HEAD - "engine.io-client": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.0.tgz", - "integrity": "sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==", - "requires": { - "component-emitter": "~1.3.0", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.2.0", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } - }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==" - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==" - }, - "socket.io-client": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", - "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", - "requires": { - "backo2": "1.0.2", - "component-bind": "1.0.0", - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "engine.io-client": "~3.5.0", - "has-binary2": "~1.0.2", - "indexof": "0.0.1", - "parseqs": "0.0.6", - "parseuri": "0.0.6", - "socket.io-parser": "~3.3.0", - "to-array": "0.1.4" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", - "requires": { - "component-emitter": "~1.3.0", - "debug": "~3.1.0", - "isarray": "2.0.1" - } - } - } - }, - "ws": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", - "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==" -======= "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -15167,7 +15012,6 @@ "requires": { "ms": "^2.1.1" } ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 } } }, @@ -15696,6 +15540,12 @@ } } }, + "string.prototype.codepointat": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz", + "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==", + "dev": true + }, "string.prototype.trimend": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", @@ -15753,6 +15603,12 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", diff --git a/package.json b/package.json index ff3911a53..3420375d5 100644 --- a/package.json +++ b/package.json @@ -64,31 +64,18 @@ "zone.js": "~0.10.2" }, "devDependencies": { -<<<<<<< HEAD - "@angular-devkit/build-angular": "~0.901.5", - "@angular/cli": "9.1.12", - "@angular/compiler": "~9.1.6", - "@angular/compiler-cli": "~9.1.6", - "@angular/language-service": "~9.1.6", - "@ionic/angular-toolkit": "^3.1.0", -======= "@angular-devkit/build-angular": "^0.1102.1", "@angular/cli": "11.2.1", "@angular/compiler": "~11.2.2", "@angular/compiler-cli": "^11.2.2", "@angular/language-service": "~11.2.2", "@ionic/angular-toolkit": "^3.0.0", ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "@ionic/lab": "3.1.7", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", -<<<<<<< HEAD - "codelyzer": "^5.1.2", -======= "codelyzer": "^6.0.0", "cordova-android": "^9.0.0", ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 "cordova-browser": "^6.0.0", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-device": "^2.0.2", @@ -127,13 +114,8 @@ "cordova-plugin-mfp": {} }, "platforms": [ -<<<<<<< HEAD - "ios", - "browser" -======= "browser", "android" ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 ] }, "main": "karma.conf.js", diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index e5ab96398..39cf44815 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -7,20 +7,12 @@ import { PublicationDetailPage } from '../../app/pages/publications/view-publica import { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page'; import { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page' import { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page' -import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page'; +/* import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page'; */ -<<<<<<< HEAD -import { Plugins, PushNotificationActionPerformed } from '@capacitor/core'; -======= /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */ ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 import { Router } from '@angular/router'; -<<<<<<< HEAD -const { PushNotifications, LocalNotificationAction } = Plugins; -======= /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */ ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 @Component({ selector: 'app-home', @@ -36,13 +28,7 @@ export class HomePage implements OnInit { totalExpediente = 0; profile: string; -<<<<<<< HEAD - windowsWidth = window.innerWidth; - - constructor(private ngZone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { } -======= constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { } ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 ngOnInit() { /* //Initialize profile as mdgpr @@ -122,34 +108,10 @@ export class HomePage implements OnInit { ); */ } -<<<<<<< HEAD - - - - async localNotificationPresent(notification) { - - LocalNotificationAction. - - LocalNotifications.schedule({ - notifications: [ - { - title: notification.title, - body: notification.body, - id: 1, - schedule: { at: new Date(Date.now() + 1000) }, - sound: null, - attachments: null, - actionTypeId: "", - extra: null, - foreground: true, - } - ] -======= /* mobileFirstTest() { this.zone.run(() => { alert("Hello MobileFirst"); alert("Connecting to Server..."); ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 }); WLAuthorizationManager.obtainAccessToken("").then( (token) => { @@ -182,7 +144,7 @@ export class HomePage implements OnInit { ); } */ - async openApproveModal(eventSerialNumber){ + /* async openApproveModal(eventSerialNumber){ const modal = await this.modalController.create({ component: ApproveEventModalPage, componentProps:{ @@ -194,9 +156,9 @@ export class HomePage implements OnInit { await modal.present(); modal.onDidDismiss(); - } + } */ - async viewEventDetail(eventId:any) { + /* async viewEventDetail(eventId:any) { console.log(this.profile); const modal = await this.modalController.create({ @@ -209,7 +171,7 @@ export class HomePage implements OnInit { }); await modal.present(); modal.onDidDismiss(); - } + } */ /* async viewExpedientDetail(serialNumber:any) { console.log(this.profile); @@ -250,7 +212,7 @@ export class HomePage implements OnInit { - async viewPublicationDetail(folderId) { + /* async viewPublicationDetail(folderId) { const modal = await this.modalController.create({ component: PublicationDetailPage, componentProps: { @@ -261,13 +223,13 @@ export class HomePage implements OnInit { }); await modal.present(); modal.onDidDismiss(); - } + } */ - async viewPublications(folderId) { + /* async viewPublications(folderId) { const modal = await this.modalController.create({ component: ViewPublicationsPage, - /* enterAnimation, - leaveAnimation, */ + enterAnimation, + leaveAnimation, componentProps: { item: folderId, }, @@ -277,7 +239,7 @@ export class HomePage implements OnInit { await modal.present(); modal.onDidDismiss(); } - + */ diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index e7d70bd5a..830ff6424 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -7,15 +7,9 @@ import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd } from '@angular/router'; import { AlertService } from 'src/app/services/alert.service'; -<<<<<<< HEAD -import { NewEventPage } from './new-event/new-event.page'; -import { ViewEventPage } from './view-event/view-event.page'; import { momentG } from 'src/plugin/momentG'; import { DomSanitizer } from "@angular/platform-browser"; -======= -import { momentG } from 'src/plugin/momentG' ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 // showTimeline import { setHours, setMinutes } from 'date-fns'; import { @@ -24,13 +18,8 @@ import { CalendarView, DAYS_OF_WEEK, } from 'angular-calendar'; -<<<<<<< HEAD import { CustomDateFormatter } from './custom-date-formatter.provider'; -======= - ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 import { EventListPage } from '../gabinete-digital/event-list/event-list.page'; -import { CustomDateFormatter } from './custom-date-formatter.provider'; import { ViewEventPage } from './view-event/view-event.page'; import { NewEventPage } from './new-event/new-event.page'; @@ -112,7 +101,6 @@ export class AgendaPage implements OnInit { startTime: Date; endTime: Date; -<<<<<<< HEAD mobileComponent: any = { showAddNewEvent: false, @@ -129,8 +117,6 @@ export class AgendaPage implements OnInit { saveData: {} } -======= ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 constructor( private alertCtrl: AlertController, @Inject(LOCALE_ID) private locale: string, @@ -241,17 +227,10 @@ export class AgendaPage implements OnInit { this.onCurrentChanged(newDate); */ } -<<<<<<< HEAD onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0)); this.eventSelectedDate2 = ev.selectedTime; }; -======= - /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { - console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0)); - this.eventSelectedDate2 = ev.selectedTime; - }; */ ->>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67 onRangeChanged (ev: { startTime: Date, endTime: Date }) { this.rangeStartDate = ev.startTime; diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index fce78f6ee..b8fa2eef2 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -11,7 +11,7 @@ import { EventActionsPopoverPage } from '../event-actions-popover/event-actions- @Component({ selector: 'app-approve-event-modal', templateUrl: './approve-event-modal.page.html', - styleUrls: ['./approve-event-modal.page.scss'], + /* styleUrls: ['./approve-event-modal.page.scss'], */ }) export class ApproveEventModalPage implements OnInit { event: Event;