peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2021-10-09 10:43:13 +01:00
parent 4ca3998717 405c989b87
commit d7965a9074
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<name>gabinete digital</name> <name>gabinete digital</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author> <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="*" /> <access origin="*" />
<allow-navigation href="*" /> <allow-navigation href="*" />
<allow-navigation href="*" /> <allow-navigation href="*" />
src/app/pages/agenda/agenda.page.ts
+11 -5
View File
@@ -522,7 +522,8 @@ export class AgendaPage implements OnInit {
}) })
} }
else if (this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') { // 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) => { 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"); this.addEventToDB(response, "pr");
// clear the current month only // clear the current month only
// response == september
// startTime = 1, endTime = 31
this.CalendarStore.removeRange(startTime, endTime, 'pr') this.CalendarStore.removeRange(startTime, endTime, 'pr')
this.CalendarStore.pushEvent(response, 'pr'); this.CalendarStore.pushEvent(response, 'pr');
let array = [] let array = []
response.array.forEach(element => { response.array.forEach(element => {
@@ -570,6 +572,8 @@ export class AgendaPage implements OnInit {
this.listToPresent = array; this.listToPresent = array;
// this.CalendarStore.eventSource
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
@@ -587,11 +591,12 @@ export class AgendaPage implements OnInit {
} }
} else { } else {
// calendar // Desktop only
let counter = 0; let counter = 0;
if (this.loggeduser.Profile == 'MDGPR') { // 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) => { 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,7 +660,8 @@ export class AgendaPage implements OnInit {
} else { } else {
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) => { // 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; let eventsList;
if (this.segment == 'Oficial') { if (this.segment == 'Oficial') {