Agenda noclatura completed

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html

@@ -65,8 +65,8 @@
                   interface="action-sheet" Cancel-text="Cancelar"
                   required
                 >
-                  <ion-select-option value="Oficial">Oficial</ion-select-option>
-                  <ion-select-option value="Pessoal">Pessoal</ion-select-option>
+                  <ion-select-option value="Oficial">Calendário Oficial</ion-select-option>
+                  <ion-select-option value="Pessoal">Calendário Pessoal</ion-select-option>
                 </ion-select>
 
 

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

@@ -11,7 +11,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Meu Calendário
+        Agenda de {{loggeduser.FullName}}
       </ion-segment-button>
       <ion-segment-button value="PR">
         Calendário Partilhado

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

@@ -40,13 +40,12 @@
             <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
 
               <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
-                <div *ngIf="calendars != 'Meu calendario' "> Calendário de {{calendars}} </div>
-                <div *ngIf="calendars == 'Meu calendario'"> {{calendars}} </div>
+                <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
+                    <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
               </mat-option>
 
             </mat-select>
           </mat-form-field>
-
         </div>
       </div>
     </div>
@@ -76,7 +75,7 @@
             <mat-select [(value)]="postEvent.CalendarName" >
 
               <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
-                {{ calendars }}
+                Calendário {{ calendars }}
               </mat-option>
 
             </mat-select>

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

@@ -56,10 +56,10 @@
                 <mat-form-field appearance="none"  class="width-100" >
                   <mat-select placeholder="Selecione agenda" [(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda" >
                     <mat-option value="Oficial">
-                      Oficial
+                      Calendário Oficial
                     </mat-option>
                     <mat-option value="Pessoal">
-                      Pessoal
+                      Calendário Pessoal
                     </mat-option>
                   </mat-select>
                 </mat-form-field>

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

@@ -10,7 +10,7 @@
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
         <ion-segment-button value="MDGPR">
-          Meu Calendário
+          Agenda de {{loggeduser.FullName}}
         </ion-segment-button>
         <ion-segment-button value="PR">
           Calendário Partilhado