From c0a500f5e0dcc4598ae0fcf9b5053dbb62c7fa0d Mon Sep 17 00:00:00 2001
From: Peter Dias <maquiranpeter29@gmail.com>
Date: Sat, 2 Apr 2022 11:34:55 +0100
Subject: [PATCH] improve

---
 capacitor.config.json                  |  1 +
 src/app/pages/agenda/agenda.page.html  |  1 +
 src/app/pages/agenda/agenda.page.ts    | 25 +++++++++++++++++++++++--
 src/app/services/permission.service.ts |  2 +-
 src/environments/environment.ts        |  4 ++--
 5 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 capacitor.config.json

diff --git a/capacitor.config.json b/capacitor.config.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/capacitor.config.json
@@ -0,0 +1 @@
+{}
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index eb2e12e44..aa3f2a3d8 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -238,6 +238,7 @@
           <div class="timeline-container height-100 d-flex pt-20 pl-20 pl-20 filter-{{segment}}"  >
 
             <div  class="ss-timeline timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
+
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
 
                 <div  class="EventListBox-container" >
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index e57647e61..22d31e998 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1037,6 +1037,14 @@ export class AgendaPage implements OnInit {
           }
           else if (this.loggeduser.Profile == 'PR') {
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          } else {
+            
+            if(this.profile == "pr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            } else if (this.profile == "mdgpr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            }
+
           }
           break;
 
@@ -1046,9 +1054,15 @@ export class AgendaPage implements OnInit {
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
-          else {
+          else if(this.loggeduser.Profile == 'PR') {
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          } else {
+            if(this.profile == "pr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            } else if (this.profile == "mdgpr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            }
           }
           break;
 
@@ -1057,15 +1071,22 @@ export class AgendaPage implements OnInit {
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
 
-          } else {
+          } else if(this.loggeduser.Profile == 'PR') {
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
+          } else {
+            if(this.profile == "pr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            } else if (this.profile == "mdgpr") {
+              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            }
           }
           break;
 
       }
     } else {
+
       this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
       this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts
index 8cace4128..a02dd401a 100644
--- a/src/app/services/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -25,7 +25,7 @@ export class PermissionService {
     }
 
 
-    for(let permission of ([...(this.SessionStore.user.UserPermissions || [] ), 530] || [])) {
+    for(let permission of (this.SessionStore.user.UserPermissions || [])) {
       if (args.includes(permission)) {
         return true;
       }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 9ea344765..975710431 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -21,8 +21,8 @@
 
 export const environment = {
   production: false,
-  apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
-  //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
+  //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
   apiChatUrl: 'https://gabinetedigitalchat.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gabinetedigitalchat.dyndns.info/websocket', 
   //apiChatUrl: 'https://www.tabularium.pt/api/v1/',