mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Notificaion route for event aprovoal added
This commit is contained in:
@@ -39,6 +39,7 @@
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths"></meta-data>
|
||||
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@mipmap/ic_launcher" />
|
||||
</provider>
|
||||
</application>
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -372,14 +372,13 @@ __webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _angular_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @angular/core */ "./node_modules/@angular/core/__ivy_ngcc__/fesm2015/core.js");
|
||||
/* harmony import */ var ionic2_calendar__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ionic2-calendar */ "./node_modules/ionic2-calendar/__ivy_ngcc__/fesm2015/ionic2-calendar.js");
|
||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||
/* harmony import */ var _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../cal-modal/cal-modal.page */ "./src/app/pages/cal-modal/cal-modal.page.ts");
|
||||
/* harmony import */ var src_app_services_events_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/events.service */ "./src/app/services/events.service.ts");
|
||||
/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
/* harmony import */ var src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! src/app/services/alert.service */ "./src/app/services/alert.service.ts");
|
||||
/* harmony import */ var _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./new-event/new-event.page */ "./src/app/pages/agenda/new-event/new-event.page.ts");
|
||||
/* harmony import */ var _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./view-event/view-event.page */ "./src/app/pages/agenda/view-event/view-event.page.ts");
|
||||
/* harmony import */ var src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! src/plugin/momentG */ "./src/plugin/momentG.js");
|
||||
/* harmony import */ var src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__);
|
||||
/* harmony import */ var _angular_common__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @angular/common */ "./node_modules/@angular/common/__ivy_ngcc__/fesm2015/common.js");
|
||||
/* harmony import */ var _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../cal-modal/cal-modal.page */ "./src/app/pages/cal-modal/cal-modal.page.ts");
|
||||
/* harmony import */ var src_app_services_events_service__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! src/app/services/events.service */ "./src/app/services/events.service.ts");
|
||||
/* harmony import */ var _angular_router__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @angular/router */ "./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
/* harmony import */ var src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! src/app/services/alert.service */ "./src/app/services/alert.service.ts");
|
||||
/* harmony import */ var _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./new-event/new-event.page */ "./src/app/pages/agenda/new-event/new-event.page.ts");
|
||||
/* harmony import */ var _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./view-event/view-event.page */ "./src/app/pages/agenda/view-event/view-event.page.ts");
|
||||
/* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/index.js");
|
||||
/* harmony import */ var angular_calendar__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! angular-calendar */ "./node_modules/angular-calendar/__ivy_ngcc__/fesm2015/angular-calendar.js");
|
||||
/* harmony import */ var _custom_date_formatter_provider__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./custom-date-formatter.provider */ "./src/app/pages/agenda/custom-date-formatter.provider.ts");
|
||||
@@ -443,18 +442,16 @@ let AgendaPage = class AgendaPage {
|
||||
this.eventSelectedDate = new Date();
|
||||
this.onCurrentChanged = (ev) => {
|
||||
// timeline change date
|
||||
this.timelineDate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(ev), 'dd MMMM yyyy');
|
||||
this.timelineDate = new Date(ev).toLocaleString();
|
||||
this.viewDate = new Date(ev);
|
||||
// calendar change date
|
||||
this.eventSelectedDate = new Date(ev);
|
||||
this.centralizeTimeline(500);
|
||||
this.timelineBoxCorrectHeight(500);
|
||||
};
|
||||
this.onTimeSelected = (ev) => {
|
||||
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
|
||||
this.eventSelectedDate2 = ev.selectedTime;
|
||||
};
|
||||
this.timelineDate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(), 'dd MMMM yyyy');
|
||||
// timeline inicial date
|
||||
this.timelineDate = new Date().toLocaleString();
|
||||
//this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
|
||||
function setCookie(cname, cvalue, exdays) {
|
||||
var d = new Date();
|
||||
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
|
||||
@@ -473,7 +470,7 @@ let AgendaPage = class AgendaPage {
|
||||
//Inicializar segment
|
||||
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */
|
||||
this.router.events.forEach((event) => {
|
||||
if (event instanceof _angular_router__WEBPACK_IMPORTED_MODULE_6__["NavigationEnd"] && event.url == "/home/agenda") {
|
||||
if (event instanceof _angular_router__WEBPACK_IMPORTED_MODULE_7__["NavigationEnd"] && event.url == "/home/agenda") {
|
||||
if (this.segment == null) {
|
||||
this.segment = "Combinada";
|
||||
}
|
||||
@@ -511,10 +508,14 @@ let AgendaPage = class AgendaPage {
|
||||
}
|
||||
// changedate
|
||||
dropDownChangeDate(id) {
|
||||
const currentCandarDayYear = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(this.eventSelectedDate, 'dd -- yyyy', 'pt');
|
||||
const newDate = new Date(currentCandarDayYear.replace('--', id));
|
||||
this.onCurrentChanged(newDate);
|
||||
/* const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt');
|
||||
const newDate = new Date(currentCandarDayYear.replace('--',id));
|
||||
this.onCurrentChanged(newDate); */
|
||||
}
|
||||
/* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
|
||||
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
|
||||
this.eventSelectedDate2 = ev.selectedTime;
|
||||
}; */
|
||||
onRangeChanged(ev) {
|
||||
this.rangeStartDate = ev.startTime;
|
||||
this.rangeEndDate = ev.endTime;
|
||||
@@ -524,7 +525,7 @@ let AgendaPage = class AgendaPage {
|
||||
openCalModal() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
const modal = yield this.modalCtrl.create({
|
||||
component: _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_4__["CalModalPage"],
|
||||
component: _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_5__["CalModalPage"],
|
||||
componentProps: {
|
||||
segment: this.segment,
|
||||
profile: this.profile,
|
||||
@@ -582,18 +583,13 @@ let AgendaPage = class AgendaPage {
|
||||
const timelineContainer = document.querySelectorAll('ion-content')[2];
|
||||
const shadowRoot = timelineContainer.shadowRoot;
|
||||
const scrollContainer = shadowRoot.querySelector('main');
|
||||
try {
|
||||
scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight / 2) - 60);
|
||||
}
|
||||
catch (error) {
|
||||
//
|
||||
}
|
||||
scrollContainer.scrollTop = timelineMarker['offsetTop'] - ((scrollContainer.offsetHeight / 2) - 60);
|
||||
}, timeout);
|
||||
}
|
||||
// for timeline
|
||||
timelineIsCurrentDate() {
|
||||
return true;
|
||||
//return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||
//return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||
}
|
||||
// for timeline
|
||||
timeLineTemplate(startTime, eventlocation, eventDiscription, calendarName, subject, startTimeWisthS, endTime, eventIndex) {
|
||||
@@ -641,10 +637,10 @@ let AgendaPage = class AgendaPage {
|
||||
this.events = [];
|
||||
this.eventsList.forEach((element, eventIndex) => {
|
||||
// timeline start
|
||||
const startHours = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.StartDate), 'HH', 'pt');
|
||||
const EndHours = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.EndDate), 'HH', 'pt');
|
||||
const startHoursOtherFormate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.StartDate), 'HH:mm', 'pt');
|
||||
const EndHoursOtherFormate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.EndDate), 'HH:mm', 'pt');
|
||||
const startHours = new Date(element.StartDate).getHours().toLocaleString();
|
||||
const EndHours = new Date(element.EndDate).getHours().toLocaleString();
|
||||
const startHoursOtherFormate = new Date(element.StartDate).getHours().toLocaleString() + ':' + new Date(element.StartDate).getMinutes().toLocaleString();
|
||||
const EndHoursOtherFormate = Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(element.EndDate), 'HH:mm', 'pt');
|
||||
if (element.CalendarName == calendarName) {
|
||||
this.events.push({
|
||||
title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject, startHoursOtherFormate, EndHoursOtherFormate, eventIndex),
|
||||
@@ -695,7 +691,7 @@ let AgendaPage = class AgendaPage {
|
||||
calendarName: element.CalendarName
|
||||
});
|
||||
});
|
||||
this.timelineFilter(this.timelineFilterState);
|
||||
// this.timelineFilter(this.timelineFilterState);
|
||||
this.myCal.update();
|
||||
this.myCal.loadEvents();
|
||||
this.showLoader = false;
|
||||
@@ -717,7 +713,7 @@ let AgendaPage = class AgendaPage {
|
||||
calendarName: element.CalendarName
|
||||
});
|
||||
});
|
||||
this.timelineFilter(this.timelineFilterState);
|
||||
// this.timelineFilter(this.timelineFilterState);
|
||||
this.myCal.update();
|
||||
this.myCal.loadEvents();
|
||||
this.showLoader = false;
|
||||
@@ -833,7 +829,7 @@ let AgendaPage = class AgendaPage {
|
||||
openAddEvent() {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
const modal = yield this.modalCtrl.create({
|
||||
component: _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_8__["NewEventPage"],
|
||||
component: _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_9__["NewEventPage"],
|
||||
componentProps: {
|
||||
segment: this.segment,
|
||||
profile: this.profile,
|
||||
@@ -864,7 +860,7 @@ let AgendaPage = class AgendaPage {
|
||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||
console.log(this.profile);
|
||||
const modal = yield this.modalCtrl.create({
|
||||
component: _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__["ViewEventPage"],
|
||||
component: _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_10__["ViewEventPage"],
|
||||
componentProps: {
|
||||
eventId: eventId
|
||||
},
|
||||
@@ -897,9 +893,9 @@ AgendaPage.ctorParameters = () => [
|
||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["AlertController"] },
|
||||
{ type: String, decorators: [{ type: _angular_core__WEBPACK_IMPORTED_MODULE_1__["Inject"], args: [_angular_core__WEBPACK_IMPORTED_MODULE_1__["LOCALE_ID"],] }] },
|
||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
|
||||
{ type: src_app_services_events_service__WEBPACK_IMPORTED_MODULE_5__["EventsService"] },
|
||||
{ type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"] },
|
||||
{ type: src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_7__["AlertService"] }
|
||||
{ type: src_app_services_events_service__WEBPACK_IMPORTED_MODULE_6__["EventsService"] },
|
||||
{ type: _angular_router__WEBPACK_IMPORTED_MODULE_7__["Router"] },
|
||||
{ type: src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_8__["AlertService"] }
|
||||
];
|
||||
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["ViewChild"])(ionic2_calendar__WEBPACK_IMPORTED_MODULE_2__["CalendarComponent"])
|
||||
@@ -1440,60 +1436,6 @@ CalModalPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||
|
||||
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ "./src/plugin/momentG.js":
|
||||
/*!*******************************!*\
|
||||
!*** ./src/plugin/momentG.js ***!
|
||||
\*******************************/
|
||||
/*! no static exports found */
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
|
||||
var month = [
|
||||
'Janeiro',
|
||||
'Fevereiro',
|
||||
'Março',
|
||||
'Abril',
|
||||
'Pode',
|
||||
'Junho',
|
||||
'Julho',
|
||||
'Agosto'
|
||||
]
|
||||
|
||||
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
|
||||
|
||||
class momentG {
|
||||
|
||||
static run(date, formate , wgs){
|
||||
|
||||
if(typeof date.getMonth != 'function') {
|
||||
date = new Date(date)
|
||||
}
|
||||
|
||||
var e = {
|
||||
mm : ((date.getMinutes()).toString()).padStart("2","0"),
|
||||
dd : ((date.getDate()).toString()).padStart("2","0"),
|
||||
MM : ((date.getMonth()+1).toString()).padStart("2","0"),
|
||||
HH : date.getHours(),
|
||||
EEEE : week[date.getDay()].padStart("2","0"),
|
||||
MMMM : month[date.getMonth()],
|
||||
yyyy : date.getFullYear(),
|
||||
}
|
||||
|
||||
Object.keys(e).reverse().forEach(element => {
|
||||
var reg = new RegExp(element,'g')
|
||||
formate = formate.replace(reg,e[element])
|
||||
});
|
||||
|
||||
return formate
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
momentG: momentG.run
|
||||
};
|
||||
|
||||
/***/ })
|
||||
|
||||
}]);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -564,52 +564,48 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
var _angular_common__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
|
||||
/*! @angular/common */
|
||||
"./node_modules/@angular/common/__ivy_ngcc__/fesm2015/common.js");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
/*! ../cal-modal/cal-modal.page */
|
||||
"./src/app/pages/cal-modal/cal-modal.page.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_services_events_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(
|
||||
var src_app_services_events_service__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
/*! src/app/services/events.service */
|
||||
"./src/app/services/events.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _angular_router__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(
|
||||
var _angular_router__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
||||
/*! @angular/router */
|
||||
"./node_modules/@angular/router/__ivy_ngcc__/fesm2015/router.js");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(
|
||||
var src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(
|
||||
/*! src/app/services/alert.service */
|
||||
"./src/app/services/alert.service.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(
|
||||
var _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
/*! ./new-event/new-event.page */
|
||||
"./src/app/pages/agenda/new-event/new-event.page.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(
|
||||
var _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
|
||||
/*! ./view-event/view-event.page */
|
||||
"./src/app/pages/agenda/view-event/view-event.page.ts");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(
|
||||
/*! src/plugin/momentG */
|
||||
"./src/plugin/momentG.js");
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__);
|
||||
/* harmony import */
|
||||
|
||||
|
||||
var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(
|
||||
/*! date-fns */
|
||||
"./node_modules/date-fns/esm/index.js");
|
||||
@@ -705,7 +701,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
|
||||
this.onCurrentChanged = function (ev) {
|
||||
// timeline change date
|
||||
_this.timelineDate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(ev), 'dd MMMM yyyy');
|
||||
_this.timelineDate = new Date(ev).toLocaleString();
|
||||
_this.viewDate = new Date(ev); // calendar change date
|
||||
|
||||
_this.eventSelectedDate = new Date(ev);
|
||||
@@ -713,14 +709,10 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
_this.centralizeTimeline(500);
|
||||
|
||||
_this.timelineBoxCorrectHeight(500);
|
||||
};
|
||||
}; // timeline inicial date
|
||||
|
||||
this.onTimeSelected = function (ev) {
|
||||
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
|
||||
_this.eventSelectedDate2 = ev.selectedTime;
|
||||
};
|
||||
|
||||
this.timelineDate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(), 'dd MMMM yyyy');
|
||||
this.timelineDate = new Date().toLocaleString(); //this.timelineDate = formatDate(new Date,'dd MMMM yyyy', 'pt');
|
||||
|
||||
function setCookie(cname, cvalue, exdays) {
|
||||
var d = new Date();
|
||||
@@ -749,7 +741,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */
|
||||
|
||||
this.router.events.forEach(function (event) {
|
||||
if (event instanceof _angular_router__WEBPACK_IMPORTED_MODULE_6__["NavigationEnd"] && event.url == "/home/agenda") {
|
||||
if (event instanceof _angular_router__WEBPACK_IMPORTED_MODULE_7__["NavigationEnd"] && event.url == "/home/agenda") {
|
||||
if (_this2.segment == null) {
|
||||
_this2.segment = "Combinada";
|
||||
} else {
|
||||
@@ -810,10 +802,15 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
}, {
|
||||
key: "dropDownChangeDate",
|
||||
value: function dropDownChangeDate(id) {
|
||||
var currentCandarDayYear = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(this.eventSelectedDate, 'dd -- yyyy', 'pt');
|
||||
var newDate = new Date(currentCandarDayYear.replace('--', id));
|
||||
this.onCurrentChanged(newDate);
|
||||
/* const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt');
|
||||
const newDate = new Date(currentCandarDayYear.replace('--',id));
|
||||
this.onCurrentChanged(newDate); */
|
||||
}
|
||||
/* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
|
||||
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
|
||||
this.eventSelectedDate2 = ev.selectedTime;
|
||||
}; */
|
||||
|
||||
}, {
|
||||
key: "onRangeChanged",
|
||||
value: function onRangeChanged(ev) {
|
||||
@@ -834,7 +831,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
case 0:
|
||||
_context2.next = 2;
|
||||
return this.modalCtrl.create({
|
||||
component: _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_4__["CalModalPage"],
|
||||
component: _cal_modal_cal_modal_page__WEBPACK_IMPORTED_MODULE_5__["CalModalPage"],
|
||||
componentProps: {
|
||||
segment: this.segment,
|
||||
profile: this.profile,
|
||||
@@ -914,18 +911,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
var timelineContainer = document.querySelectorAll('ion-content')[2];
|
||||
var shadowRoot = timelineContainer.shadowRoot;
|
||||
var scrollContainer = shadowRoot.querySelector('main');
|
||||
|
||||
try {
|
||||
scrollContainer.scrollTop = timelineMarker['offsetTop'] - (scrollContainer.offsetHeight / 2 - 60);
|
||||
} catch (error) {//
|
||||
}
|
||||
scrollContainer.scrollTop = timelineMarker['offsetTop'] - (scrollContainer.offsetHeight / 2 - 60);
|
||||
}, timeout);
|
||||
} // for timeline
|
||||
|
||||
}, {
|
||||
key: "timelineIsCurrentDate",
|
||||
value: function timelineIsCurrentDate() {
|
||||
return true; //return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||
return true; //return formatDate(new Date(),'dd MMMM yyyy', 'pt') == formatDate(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||
} // for timeline
|
||||
|
||||
}, {
|
||||
@@ -976,10 +969,10 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
this.events = [];
|
||||
this.eventsList.forEach(function (element, eventIndex) {
|
||||
// timeline start
|
||||
var startHours = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.StartDate), 'HH', 'pt');
|
||||
var EndHours = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.EndDate), 'HH', 'pt');
|
||||
var startHoursOtherFormate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.StartDate), 'HH:mm', 'pt');
|
||||
var EndHoursOtherFormate = Object(src_plugin_momentG__WEBPACK_IMPORTED_MODULE_10__["momentG"])(new Date(element.EndDate), 'HH:mm', 'pt');
|
||||
var startHours = new Date(element.StartDate).getHours().toLocaleString();
|
||||
var EndHours = new Date(element.EndDate).getHours().toLocaleString();
|
||||
var startHoursOtherFormate = new Date(element.StartDate).getHours().toLocaleString() + ':' + new Date(element.StartDate).getMinutes().toLocaleString();
|
||||
var EndHoursOtherFormate = Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(element.EndDate), 'HH:mm', 'pt');
|
||||
|
||||
if (element.CalendarName == calendarName) {
|
||||
_this5.events.push({
|
||||
@@ -1035,9 +1028,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
event: element,
|
||||
calendarName: element.CalendarName
|
||||
});
|
||||
});
|
||||
}); // this.timelineFilter(this.timelineFilterState);
|
||||
|
||||
_this6.timelineFilter(_this6.timelineFilterState);
|
||||
|
||||
_this6.myCal.update();
|
||||
|
||||
@@ -1063,9 +1055,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
event: element,
|
||||
calendarName: element.CalendarName
|
||||
});
|
||||
});
|
||||
}); // this.timelineFilter(this.timelineFilterState);
|
||||
|
||||
_this6.timelineFilter(_this6.timelineFilterState);
|
||||
|
||||
_this6.myCal.update();
|
||||
|
||||
@@ -1232,7 +1223,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
case 0:
|
||||
_context3.next = 2;
|
||||
return this.modalCtrl.create({
|
||||
component: _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_8__["NewEventPage"],
|
||||
component: _new_event_new_event_page__WEBPACK_IMPORTED_MODULE_9__["NewEventPage"],
|
||||
componentProps: {
|
||||
segment: this.segment,
|
||||
profile: this.profile,
|
||||
@@ -1290,7 +1281,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
console.log(this.profile);
|
||||
_context4.next = 3;
|
||||
return this.modalCtrl.create({
|
||||
component: _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_9__["ViewEventPage"],
|
||||
component: _view_event_view_event_page__WEBPACK_IMPORTED_MODULE_10__["ViewEventPage"],
|
||||
componentProps: {
|
||||
eventId: eventId
|
||||
},
|
||||
@@ -1370,11 +1361,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
}, {
|
||||
type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"]
|
||||
}, {
|
||||
type: src_app_services_events_service__WEBPACK_IMPORTED_MODULE_5__["EventsService"]
|
||||
type: src_app_services_events_service__WEBPACK_IMPORTED_MODULE_6__["EventsService"]
|
||||
}, {
|
||||
type: _angular_router__WEBPACK_IMPORTED_MODULE_6__["Router"]
|
||||
type: _angular_router__WEBPACK_IMPORTED_MODULE_7__["Router"]
|
||||
}, {
|
||||
type: src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_7__["AlertService"]
|
||||
type: src_app_services_alert_service__WEBPACK_IMPORTED_MODULE_8__["AlertService"]
|
||||
}];
|
||||
};
|
||||
|
||||
@@ -2244,57 +2235,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
"./src/app/pages/cal-modal/cal-modal.page.scss"))["default"]]
|
||||
})], CalModalPage);
|
||||
/***/
|
||||
},
|
||||
|
||||
/***/
|
||||
"./src/plugin/momentG.js":
|
||||
/*!*******************************!*\
|
||||
!*** ./src/plugin/momentG.js ***!
|
||||
\*******************************/
|
||||
|
||||
/*! no static exports found */
|
||||
|
||||
/***/
|
||||
function srcPluginMomentGJs(module, exports) {
|
||||
var month = ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Pode', 'Junho', 'Julho', 'Agosto'];
|
||||
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
|
||||
|
||||
var momentG = /*#__PURE__*/function () {
|
||||
function momentG() {
|
||||
_classCallCheck(this, momentG);
|
||||
}
|
||||
|
||||
_createClass(momentG, null, [{
|
||||
key: "run",
|
||||
value: function run(date, formate, wgs) {
|
||||
if (typeof date.getMonth != 'function') {
|
||||
date = new Date(date);
|
||||
}
|
||||
|
||||
var e = {
|
||||
mm: date.getMinutes().toString().padStart("2", "0"),
|
||||
dd: date.getDate().toString().padStart("2", "0"),
|
||||
MM: (date.getMonth() + 1).toString().padStart("2", "0"),
|
||||
HH: date.getHours(),
|
||||
EEEE: week[date.getDay()].padStart("2", "0"),
|
||||
MMMM: month[date.getMonth()],
|
||||
yyyy: date.getFullYear()
|
||||
};
|
||||
Object.keys(e).reverse().forEach(function (element) {
|
||||
var reg = new RegExp(element, 'g');
|
||||
formate = formate.replace(reg, e[element]);
|
||||
});
|
||||
return formate;
|
||||
}
|
||||
}]);
|
||||
|
||||
return momentG;
|
||||
}();
|
||||
|
||||
module.exports = {
|
||||
momentG: momentG.run
|
||||
};
|
||||
/***/
|
||||
}
|
||||
}]);
|
||||
//# sourceMappingURL=pages-agenda-agenda-module-es5.js.map
|
||||
File diff suppressed because one or more lines are too long
@@ -432,7 +432,6 @@ let EventsPage = class EventsPage {
|
||||
this.processes = processes;
|
||||
/* Get current system date */
|
||||
this.today = new Date();
|
||||
this.todayEnd = new Date();
|
||||
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
|
||||
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
|
||||
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
|
||||
@@ -449,7 +448,6 @@ let EventsPage = class EventsPage {
|
||||
}, 1000);
|
||||
// list
|
||||
this.LoadList();
|
||||
this.todayEnd = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 23, 59, 59);
|
||||
}
|
||||
swipe() {
|
||||
console.log('!!!!');
|
||||
@@ -500,7 +498,7 @@ let EventsPage = class EventsPage {
|
||||
switch (this.segment) {
|
||||
case "Combinada":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.eventsList = res;
|
||||
if (res.length > 0) {
|
||||
this.currentEvent = res[0].Subject;
|
||||
@@ -510,7 +508,7 @@ let EventsPage = class EventsPage {
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.eventsList = res;
|
||||
console.log(this.eventsList);
|
||||
console.log(res);
|
||||
@@ -523,13 +521,13 @@ let EventsPage = class EventsPage {
|
||||
break;
|
||||
case "Pessoal":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
|
||||
this.showLoader = false;
|
||||
});
|
||||
@@ -537,14 +535,14 @@ let EventsPage = class EventsPage {
|
||||
break;
|
||||
case "Oficial":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");
|
||||
;
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(res => {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
|
||||
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");
|
||||
;
|
||||
this.showLoader = false;
|
||||
@@ -624,7 +622,7 @@ let EventsPage = class EventsPage {
|
||||
"SerialNumber": element.serialNumber,
|
||||
"Folio": element.workflowInstanceFolio,
|
||||
"Senders": element.originator.email,
|
||||
"CreateDate": new Date(element.taskStartDate).toLocaleString(),
|
||||
"CreateDate": Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
|
||||
"DocumentURL": element.formURL,
|
||||
"Remetente": element.workflowInstanceDataFields.Remetente
|
||||
};
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -855,7 +855,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
/* Get current system date */
|
||||
|
||||
this.today = new Date();
|
||||
this.todayEnd = new Date();
|
||||
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
|
||||
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
|
||||
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + this.months[this.today.getMonth()];
|
||||
@@ -873,7 +872,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
}, 1000); // list
|
||||
|
||||
this.LoadList();
|
||||
this.todayEnd = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 23, 59, 59);
|
||||
}
|
||||
|
||||
_createClass(EventsPage, [{
|
||||
@@ -940,7 +938,9 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
switch (this.segment) {
|
||||
case "Combinada":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt')
|
||||
/* + ' 00:00:00' */
|
||||
, Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.eventsList = res;
|
||||
|
||||
if (res.length > 0) {
|
||||
@@ -951,7 +951,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
_this9.showLoader = false;
|
||||
});
|
||||
} else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.eventsList = res;
|
||||
console.log(_this9.eventsList);
|
||||
console.log(res);
|
||||
@@ -966,14 +966,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
|
||||
case "Pessoal":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.personaleventsList = res.filter(function (data) {
|
||||
return data.CalendarName == "Pessoal";
|
||||
});
|
||||
_this9.showLoader = false;
|
||||
});
|
||||
} else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.personaleventsList = res.filter(function (data) {
|
||||
return data.CalendarName == "Pessoal";
|
||||
});
|
||||
@@ -985,7 +985,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
|
||||
case "Oficial":
|
||||
if (this.profile == "mdgpr") {
|
||||
this.eventService.getAllMdEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllMdEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.officialeventsList = res.filter(function (data) {
|
||||
return data.CalendarName == "Oficial";
|
||||
});
|
||||
@@ -993,7 +993,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
_this9.showLoader = false;
|
||||
});
|
||||
} else {
|
||||
this.eventService.getAllPrEvents(this.today.toLocaleString(), this.todayEnd.toLocaleString()).subscribe(function (res) {
|
||||
this.eventService.getAllPrEvents(Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(function (res) {
|
||||
_this9.officialeventsList = res.filter(function (data) {
|
||||
return data.CalendarName == "Oficial";
|
||||
});
|
||||
@@ -1128,7 +1128,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
||||
"SerialNumber": element.serialNumber,
|
||||
"Folio": element.workflowInstanceFolio,
|
||||
"Senders": element.originator.email,
|
||||
"CreateDate": new Date(element.taskStartDate).toLocaleString(),
|
||||
"CreateDate": Object(_angular_common__WEBPACK_IMPORTED_MODULE_4__["formatDate"])(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
|
||||
"DocumentURL": element.formURL,
|
||||
"Remetente": element.workflowInstanceDataFields.Remetente
|
||||
}; // CreateDate
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user