mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
git pull made
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
||||
<name>gabinete digital</name>
|
||||
<description>An awesome Ionic/Cordova app.</description>
|
||||
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
|
||||
<content original-src="index.html" src="http://localhost:8100" />
|
||||
<content src="index.html" />
|
||||
<access origin="*" />
|
||||
<allow-navigation href="*" />
|
||||
<allow-navigation href="*" />
|
||||
|
||||
@@ -522,6 +522,7 @@ export class AgendaPage implements OnInit {
|
||||
})
|
||||
|
||||
}
|
||||
// view PR calendar with MDGPR profile
|
||||
else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
|
||||
|
||||
this.eventService.getAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
@@ -551,8 +552,9 @@ export class AgendaPage implements OnInit {
|
||||
this.addEventToDB(response, "pr");
|
||||
|
||||
// clear the current month only
|
||||
// response == september
|
||||
// startTime = 1, endTime = 31
|
||||
this.CalendarStore.removeRange(startTime, endTime, 'pr')
|
||||
|
||||
this.CalendarStore.pushEvent(response, 'pr');
|
||||
let array = []
|
||||
response.array.forEach(element => {
|
||||
@@ -570,6 +572,8 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.listToPresent = array;
|
||||
|
||||
// this.CalendarStore.eventSource
|
||||
|
||||
|
||||
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
|
||||
|
||||
@@ -587,10 +591,11 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
|
||||
} else {
|
||||
// calendar
|
||||
// Desktop only
|
||||
|
||||
let counter = 0;
|
||||
|
||||
// view MDGPR calendar with MDGPR profile
|
||||
if(this.loggeduser.Profile == 'MDGPR') {
|
||||
|
||||
this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {
|
||||
@@ -655,6 +660,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
} else {
|
||||
|
||||
// view PR calendar with PR profile
|
||||
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
|
||||
|
||||
let eventsList;
|
||||
|
||||
Reference in New Issue
Block a user