fix sayings

dockerfile

@@ -9,7 +9,7 @@ RUN npm install --save --legacy-peer-deps
 COPY ./ /app/
 RUN ionic build --prod
 
-FROM nginx:alpine
+FROM nginx:latest
 COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf
 RUN rm -rf /usr/share/nginx/html/*
 COPY /www/ /usr/share/nginx/html/

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -40,14 +40,14 @@
                 <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
     
                   <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> Agenda do PR </div>
-                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
                     
                     <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                     <mat-option *ngFor="let calendars of _eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                      <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                      <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
                   </mat-option>

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts

@@ -20,6 +20,7 @@ import { EventPipe } from 'src/app/pipes/event.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -96,7 +97,8 @@ export class DocumentSetUpMeetingPage implements OnInit {
   CalendarNameShow = true
   CalendarNamesOptions
   testeFormDefaul = "Eudes"
-
+  environment = environment
+  
   constructor(
     private modalController: ModalController,
     private router:Router,

src/app/modals/view-event/view-event.page.ts

@@ -129,7 +129,7 @@ export class ViewEventPage implements OnInit {
 
   loadEvent() {
     const loader = this.toastService.loading();
-    
+
     if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
         this.loadedEvent = res;

src/app/models/envarioment.ts

@@ -14,6 +14,12 @@ export interface Environment {
     sentryUrl: string;
     despachoLabel: string
     despachoLabel2: string,
+    agendaPR: string
+    agendaVP: string
+    PR: string
+    VP: string
+    dispatchPR: string
+
 }
 
 

src/app/models/user.model.ts

@@ -41,6 +41,14 @@ export class LoginUserRespose {
 }
 
 
+export class  calendarInterface {
+  CalendarId: string
+  CalendarName: "Oficial" | "Pessoal";
+  CalendarRoleId: string;
+  Id: number;
+  OwnerUserId: any
+}
+
 export class UserSession {
   BasicAuthKey: string;
   UserId: number;

src/app/pages/agenda/agenda.page.html

@@ -230,8 +230,8 @@
               <div class="flex-grow-1 text-grey d-flex justify-center align-center">
 
                 <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
-                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                   <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                     
                 </mat-option>

src/app/pages/agenda/agenda.page.ts

@@ -32,6 +32,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { PermissionService } from 'src/app/services/permission.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-agenda',
@@ -164,7 +165,7 @@ export class AgendaPage implements OnInit {
   array = []
 
   SessionStore = SessionStore;
-  environment
+  environment = environment
 
   constructor(
     @Inject(LOCALE_ID) private locale: string,

src/app/pages/agenda/new-event/new-event.page.html

@@ -30,14 +30,14 @@
             <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
 
               <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> Agenda do PR </div>
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
                 
                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                 <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                  <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
               </mat-option>

src/app/pages/agenda/new-event/new-event.page.ts

@@ -19,6 +19,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick
 import { SessionStore } from 'src/app/store/session.service';
 import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -88,6 +89,7 @@ export class NewEventPage implements OnInit {
   CalendarNamesOptions = ['Oficial', 'Pessoal']
   roomId:string;
   globalEnd = new Date('1999')
+  environment = environment
 
   constructor(
     private modalController: ModalController,
@@ -187,6 +189,7 @@ export class NewEventPage implements OnInit {
     this.setDefaultTime()
 
     this.checkRoleInArray()
+    this.changeAgenda()
   }
 
   setDefaultTime() {

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -6,7 +6,7 @@
   <div class="main-header">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
     <div class="thetitle">
-      <ion-label *ngIf="SessionStore.user.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
+      <ion-label *ngIf="SessionStore.user.Profile =='MDGPR'" >{{environment.dispatchPR }}</ion-label>
       <ion-label *ngIf="SessionStore.user.Profile =='PR'" >Despachos</ion-label>
     </div>
     <div class="theicon btn-refresh">

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -56,6 +56,7 @@ export class DespachosPrPage implements OnInit {
 
   customTaskPipe = new CustomTaskPipe()
   SessionStore = SessionStore
+  environment = environment
 
   constructor(
     private processes: ProcessesService,

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -17,8 +17,8 @@
       </ion-segment-button> -->
       <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
       </ion-segment-button>
     </ion-segment>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -17,6 +17,7 @@ import { RouteService } from 'src/app/services/route.service';
 import { Storage } from '@ionic/storage';
 import { EventsService } from 'src/app/services/events.service';
 import { SessionStore } from 'src/app/store/session.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-event-list',
@@ -40,6 +41,7 @@ export class EventListPage implements OnInit {
   eventoaprovacaostore = EventoAprovacaoStore;
   eventsList: any = []
   color: 'pr' | 'mdgpr'
+  environment = environment
 
   constructor(
     private processes: ProcessesService,

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -36,14 +36,14 @@
                 <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
     
                   <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> Agenda do PR </div>
-                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                    <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                     <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
                     
                     <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                     <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{ calendars.Fullname || calendars}}">
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                     <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                      <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                      <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
                   </mat-option>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -21,6 +21,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { RoleIdService } from 'src/app/services/role-id.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 
 const moment = _rollupMoment || _moment;
@@ -112,7 +113,8 @@ export class BookMeetingModalPage implements OnInit {
   CalendarName
 
   sessionStore = SessionStore;
-
+  environment = environment
+  
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -187,7 +187,7 @@
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
                   <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
                 </div>
-                <p class="text-center exp-card-title">Diplomas por Assinar PR </p>
+                <p class="text-center exp-card-title">Diplomas por Assinar {{ environment.PR}} </p>
                 <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
               </div>
               

src/app/services/events.service.ts

@@ -11,6 +11,7 @@ import { catchError } from "rxjs/operators";
 import { Storage } from '@ionic/storage';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SessionStore } from '../store/session.service';
+import { calendarInterface } from '../models/user.model';
 
 
 @Injectable({
@@ -306,6 +307,22 @@ export class EventsService {
   }
 
 
+  DetectCalendars(CalendarId) {
+    const calendars = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars)
+    return calendars.find((e) => e.CalendarId == CalendarId)
+  }
+
+  makeHeader(calendar: calendarInterface) {
+    let header = new HttpHeaders();
+    header = header.set('Authorization', SessionStore.user.BasicAuthKey);
+    header = header.set('CalendarId', calendar.CalendarId);
+    header = header.set('CalendarRoleId', calendar.CalendarRoleId);
+    header = header.set('CalendarName', calendar.CalendarName);
+
+    return header
+  }
+
+
   isMyCalendar(CalendarId) {
     return this.myCalendarNames[CalendarId] || ""
   }
@@ -672,23 +689,14 @@ export class EventsService {
     return this.http.get<Event>(`${geturl}`, options);
   }
 
-
   genericGetEvent(eventid: string, calendarId: string) {
     let geturl = environment.apiURL + 'calendar/GetEvent';
     let params = new HttpParams();
 
     params = params.set("EventId", eventid);
 
-    const headers = [
-      this.headerSharedOficial,
-      this.headerSharedPessoal,
-      this.headerOwnPessoal,
-      this.headerOwnOficial
-    ] 
-
-    const header = headers.find((header)=> {
-      return header?.get('CalendarId')?.includes(calendarId)
-    })
+    const calendar = this.DetectCalendars(calendarId)
+    const header = this.makeHeader(calendar)
     
     if(header) {
       let options = {
@@ -867,17 +875,8 @@ export class EventsService {
 
     let options: any;
 
-    const Selectedcalendar = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars).find((calendar) =>{
-      return calendar.CalendarId == CalendarId
-    })
-    
-    let header = new HttpHeaders();
-
-    header = header.set('Authorization',SessionStore.user.BasicAuthKey);
-    header = header.set('CalendarId', Selectedcalendar.CalendarId);
-    header = header.set('CalendarRoleId', Selectedcalendar.CalendarRoleId);
-
-    // console.log(Selectedcalendar)
+    const calendar = this.DetectCalendars(CalendarId)
+    const header = this.makeHeader(calendar)
 
     options = {
       headers: header,

src/app/shared/agenda/event-list/event-list.page.html

@@ -12,8 +12,8 @@
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
       </ion-segment-button>
     </ion-segment>

src/app/shared/agenda/event-list/event-list.page.ts

@@ -8,6 +8,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { EventsService } from 'src/app/services/events.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-event-list',
@@ -27,6 +28,7 @@ export class EventListPage implements OnInit {
   loggeduser: LoginUserRespose;
   segment:string;
   eventoaprovacaostore = EventoAprovacaoStore;
+  environment = environment
   color: 'pr' | 'mdgpr'
 
   @Input() profile:string;

src/app/shared/agenda/new-event/new-event.page.html

@@ -41,14 +41,14 @@
             <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
 
               <!-- <mat-option *ngFor="let calendars of _eventService.calendarNamesAry; let i = index" value="{{calendars}}">
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> Agenda do PR </div>
-                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                <div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                 <div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
                 
                 <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
                 <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
-                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+                 <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
                  <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
                  <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
               </mat-option>

src/app/shared/agenda/new-event/new-event.page.ts

@@ -28,6 +28,7 @@ import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
 import { ServerConnectionService } from 'src/app/services/server-connection.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -122,6 +123,7 @@ export class NewEventPage implements OnInit {
   CalendarNameShow = true
 
   CalendarNamesOptions = ['Oficial', 'Pessoal']
+  environment = environment
 
   constructor(
     private modalController: ModalController,
@@ -224,6 +226,7 @@ export class NewEventPage implements OnInit {
 
     this.injectValidation();
     this.setDefaultTime();
+    this.changeAgenda()
 
   }
 

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -2,7 +2,7 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="main-header">
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >{{ environment.dispatchPR}}</ion-label>
       <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
     </div>
     <!-- <div class="theicon">

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -8,6 +8,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { SessionStore } from 'src/app/store/session.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -21,6 +22,7 @@ export class DespachosPrPage implements OnInit {
 
   loggeduser: LoginUserRespose;
   despachosprstore = DespachosprStore;
+  environment = environment
 
 constructor (
   private processes:ProcessesService,

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -15,8 +15,8 @@
 
         <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
           <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR {{ i.OwnerUserIds }}</div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'">{{ environment.agendaPR }}</div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> environment.agendaVP </div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname }} </div>
         </ion-segment-button>
       </ion-segment>

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -11,6 +11,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
 import { EventsService } from 'src/app/services/events.service';
+import { environment } from 'src/environments/environment';
 
 
 @Component({
@@ -33,6 +34,7 @@ export class EventsToApprovePage implements OnInit {
   eventsList: any = []
   color: 'pr' | 'mdgpr'
   eventoaprovacaostore = EventoAprovacaoStore;
+  environment = environment
 
   constructor(
     private processes:ProcessesService,

src/app/shared/popover/despachos-options/despachos-options.page.html

@@ -10,7 +10,7 @@
   <div class="width-100 pr-options"  *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName == 'Despacho do Presidente da República' ">
     <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1 width-50 pr-10">
-        <button class="btn-cancel desk" shape="round" > Responder ao PR </button>
+        <button class="btn-cancel desk" shape="round" > Responder ao {{ environment.PR}} </button>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel width-100" shape="round" >Executado</button>
         <button class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -12,6 +12,7 @@ import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-despachos-options',
@@ -23,6 +24,7 @@ export class DespachosOptionsPage implements OnInit {
   task: customTask
   fulltask: fullTask;
   serialNumber: string;
+  environment = environment
 
   constructor(
     private processes: ProcessesService,

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -9,7 +9,7 @@
   <div class="width-100">
     <div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
       <div class="flex-grow-1 width-50 pr-10">
-        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Responder ao PR </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Responder ao {{ environment.PR}} </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma</button>

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -11,6 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-despachos-pr-options',
@@ -24,6 +25,7 @@ export class DespachosPrOptionsPage implements OnInit {
   fulltask: any;
   serialNumber: string;
   profile: string
+  environment = environment
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -8,7 +8,7 @@
   <div class="width-100">
     <div class="d-flex width-100">
       <div class="flex-grow-1">
-        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"  class="btn-cancel desk" shape="round"> Enviar para o PR </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])"  class="btn-cancel desk" shape="round"> Enviar para o {{ environment.PR}} </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -19,6 +19,7 @@ import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
 import { RouteService } from 'src/app/services/route.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-opts-expediente',
@@ -37,6 +38,7 @@ export class OptsExpedientePage implements OnInit {
   documents:SearchList[] = [];
 
   SessionStore = SessionStore;
+  environment = environment
   
   constructor(
     private popoverController: PopoverController,

src/environments/suport/doneIt.ts

@@ -17,6 +17,11 @@ export const doneITProd: Environment = {
   logoLabel: 'doneIT',
   despachoLabel: 'do Titular',
   despachoLabel2: 'Despachos do Titular',
+  agendaPR: 'Agenda do Titular',
+  agendaVP: 'Agenda do (MD)',
+  PR: 'Titular',
+  VP: '',
+  dispatchPR: 'Despachos Titular',
 };
 
 export const doneITDev: Environment = {
@@ -35,4 +40,9 @@ export const doneITDev: Environment = {
   logoLabel: 'doneIT',
   despachoLabel: 'do Titular',
   despachoLabel2: 'Despachos do Titular',
+  agendaPR: 'Agenda do Titular',
+  agendaVP: 'Agenda do (MD)',
+  PR: 'Titular',
+  VP: '',
+  dispatchPR: 'Despachos Titular',
 };

src/environments/suport/oapr.ts

@@ -17,6 +17,11 @@ export const oaprProd: Environment = {
   chatOffline: true,
   presidencial: true,
   version: versionData,
+  agendaPR: 'Agenda do PR',
+  agendaVP: 'Agenda do MD',
+  PR: 'PR',
+  VP: '',
+  dispatchPR: 'Despachos Presidenciais',
   sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
 };
 
@@ -35,5 +40,10 @@ export const oaprDev: Environment = {
   chatOffline: true,
   presidencial: true,
   version: versionData,
+  agendaPR: 'Agenda do PR',
+  agendaVP: 'Agenda do MD',
+  PR: 'PR',
+  VP: '',
+  dispatchPR: 'Despachos Presidenciais',
   sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712',
 };

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d4c474906",
-  "SHA": "d4c47490673067f88b724d0d231ea9f9be6a2b7e",
+  "shortSHA": "7c03c3f82",
+  "SHA": "7c03c3f822d7af32096a855cd83877bf61532e65",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Mar 20 10:43:46 2023 +0100'",
-  "lastCommitMessage": "reorder list",
-  "lastCommitNumber": "4882",
+  "lastCommitTime": "'Mon Mar 20 16:10:11 2023 +0100'",
+  "lastCommitMessage": "fix",
+  "lastCommitNumber": "4883",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   .gitignore\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   dockerfile\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/modals/view-event/view-event.page.ts\n\tmodified:   src/app/models/envarioment.ts\n\tmodified:   src/app/models/user.model.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.html\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified:   src/environments/suport/doneIt.ts\n\tmodified:   src/environments/suport/oapr.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }