diff --git a/package-lock.json b/package-lock.json index d8a39cb45..4964eafd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,6 +3,8 @@ "version": "0.0.1", "lockfileVersion": 1, "requires": true, +<<<<<<< HEAD +======= <<<<<<< HEAD "packages": { "": { @@ -31969,6 +31971,7 @@ }, ======= >>>>>>> b1b28d97e5e154d67ee3e1041a51f1669de00b65 +>>>>>>> 839062013b575d399f5309046afd9d240f4b484c "dependencies": { "@ampproject/remapping": { "version": "1.0.1", @@ -32771,6 +32774,8 @@ "integrity": "sha512-tk5QlnXfSE2Zu3mJVC3f11Guu5iqnLtNkvvClNHjz/e4FsJEmprfXWCv/QImWs5fLsismHcn31LKYBfWIhOv9g==", "requires": { "@types/cordova": "^0.0.34" +<<<<<<< HEAD +======= }, "dependencies": { "@types/cordova": { @@ -32778,6 +32783,7 @@ "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", "integrity": "sha512-rkiiTuf/z2wTd4RxFOb+clE7PF4AEJU0hsczbUdkHHBtkUmpWQpEddynNfJYKYtZFJKbq4F+brfekt1kx85IZA==" } +>>>>>>> 839062013b575d399f5309046afd9d240f4b484c } }, "@awesome-cordova-plugins/document-viewer": { @@ -34084,13 +34090,17 @@ "resolved": "https://registry.npmjs.org/@capacitor-community/camera-preview/-/camera-preview-1.2.1.tgz", "integrity": "sha512-rskj/12TR4X8cUzvkWvygf7A/4TFUld9BU5nAc1gc3LXU06FGP0R/6MxZKQdf20qqRaTRLPrF3HFAlkz7xb6yg==", "requires": { +<<<<<<< HEAD + "@capacitor/core": "^4.6.1" +======= "@capacitor/core": "^3.6.0" +>>>>>>> 839062013b575d399f5309046afd9d240f4b484c }, "dependencies": { "@capacitor/core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.6.0.tgz", - "integrity": "sha512-F94ozABHXxq1xMcNGMnOVP73WZDWYR1PrJEfVfl9Ja0BXGEJURIxmHBc842OX3rrt3+g0ELHyhX9LTH16eeonw==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-4.6.1.tgz", + "integrity": "sha512-7A2IV9E8umgu9u0fChUTjQJq+Jp25GJZMmWxoQN/nVx/1rcpFJ4m1xo3NPBoIRs+aV7FR+BM17mPrnkKlA8N2g==", "requires": { "tslib": "^2.1.0" } @@ -36825,6 +36835,11 @@ "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "dev": true }, + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha512-rkiiTuf/z2wTd4RxFOb+clE7PF4AEJU0hsczbUdkHHBtkUmpWQpEddynNfJYKYtZFJKbq4F+brfekt1kx85IZA==" + }, "@types/cors": { "version": "2.8.12", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 785d4070d..8f5bc6aca 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -124,7 +124,7 @@ [disabled]="disabled" [min]="currentDate" > - + -
+
- + = 1024){ this.modalController.dismiss(); } - }; - - - + }; } @@ -174,6 +171,43 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(); } + roundTimeQuarterHour() { + var timeToReturn = new Date(); + var minutes = timeToReturn.getMinutes(); + var hours = timeToReturn.getHours(); + + // console.log("MINUTOS: " +minutes); + // console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15)); + + var m = (Math.round(minutes/15) * 15) % 60; + var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + console.log("AFTER MINUTES: " +m); + console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postEvent.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postEvent.EndDate = this.postEvent.StartDate; + } + getRecurrenceTypes() { this.eventService.getRecurrenceTypes().subscribe( res => { diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 0addef5b6..5abf6f7ee 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -28,7 +28,7 @@ -
@@ -121,7 +121,7 @@
- +
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 02b2b5de7..2a1dbfff2 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -230,6 +230,29 @@ export class ViewEventPage implements OnInit { } + deleteYesOrNo() { + this.alertController.create({ + header: 'Eliminar evento?', + message: '', + buttons: [ + { + text: 'Não', + handler: () => { + console.log('Let me think'); + } + }, + { + text: 'Sim', + handler: () => { + this.deleteEvent(); + } + } + ] + }).then(res => { + res.present(); + }); + } + deleteEvent() { const loader = this.toastService.loading() diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 8b014a3f9..19ea53499 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -249,7 +249,7 @@ export class EventsService { if (sharedCalendar.CalendarName == 'Oficial') { this.hasSharedOficial = true - this.headerSharedOficial = this.headerSharedOficial.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); + this.headerSharedOficial = this.headerSharedOficial.set('Authorization',this.loggeduser.BasicAuthKey); this.headerSharedOficial = this.headerSharedOficial.set('CalendarId', sharedCalendar.CalendarId); this.headerSharedOficial = this.headerSharedOficial.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headerSharedOficial = this.headerSharedOficial.set('CalendarName', sharedCalendar.CalendarName); @@ -258,7 +258,7 @@ export class EventsService { this.hasSharedPessoal = true - this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization', 'Basic '+sharedCalendar.CalendarToken); + this.headerSharedPessoal = this.headerSharedPessoal.set('Authorization',this.loggeduser.BasicAuthKey); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarId', sharedCalendar.CalendarId); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId); this.headerSharedPessoal = this.headerSharedPessoal.set('CalendarName', sharedCalendar.CalendarName); @@ -498,7 +498,7 @@ export class EventsService { for (let sharedCalendar of this.loggeduser.SharedCalendars) { var header = new HttpHeaders(); - header = header.set('Authorization', 'Basic '+ sharedCalendar.CalendarToken); + header = header.set('Authorization', this.loggeduser.BasicAuthKey); header = header.set('CalendarId', sharedCalendar.CalendarId); header = header.set('CalendarRoleId', sharedCalendar.CalendarRoleId); header = header.set('CalendarName', sharedCalendar.CalendarName); diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 275ec5752..9bbde70e1 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -120,7 +120,7 @@ -
+
- - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postEvent.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postEvent.EndDate = this.postEvent.StartDate; + } + runValidation() { this.validateFrom = true; if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){ diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index c04724732..d5c7fb2e3 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -19,7 +19,7 @@ -
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index ae42bc358..ee0f241f1 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -150,6 +150,29 @@ export class ViewEventPage implements OnInit { } + deleteYesOrNo() { + this.alertController.create({ + header: 'Eliminar evento?', + message: '', + buttons: [ + { + text: 'Não', + handler: () => { + console.log('Let me think'); + } + }, + { + text: 'Sim', + handler: () => { + this.deleteEvent(); + } + } + ] + }).then(res => { + res.present(); + }); + } + async deleteEvent() { if (this.loadedEvent.IsRecurring) { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7d43c5a1c..0bfa1d818 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,47 +1,18 @@ -// This file can be replaced during build by using the `fileReplacements` array. -// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. -// The list of file replacements can be found in `angular.json`. - - -// const DEV = { -// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', -// apiChatUrl: 'https://www.tabularium.pt/api/v1/', -// apiWsChatUrl: 'wss://www.tabularium.pt/websocket', -// defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local -// defaultuserpwd: 'tabteste@006', //tabteste@006, -// } - -// const QEI = { -// apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/', -// apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', -// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', -// defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local -// defaultuserpwd: 'tabteste@006', //tabteste@006, -// } - export const environment = { - production: false, - //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiURL: 'https://gd-api.oapr.gov.ao/api/', - //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', + // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', apiWsChatUrl: 'ws://gd-chat.oapr.gov.ao/websocket', - // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', /* apiChatUrl: 'https://www.tabularium.pt/api/v1/', apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */ - domain: 'gabinetedigital.local', //gabinetedigital.local + // apiChatUrl: 'https://www.tabularium.pt/api/v1/', + production: true, + domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuserpwd: 'tabteste@006', //tabteste@006, chatOffline: true, presidencia: false, }; - -/* - * For easier debugging in dev elopment mode, you can import the following file - * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. - * - * This import should be commented out in production mode because it will have a negative impact - * on performance if an error is thrown. - */ -// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.