Agenda noclatura completed

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

@@ -219,8 +219,8 @@
               <!-- List -->
               <ul *ngIf="showTimelineFilterState">
                 <li  class="changeText" [class.active]="segment == 'Combinado' " (click)="changeSegment('Combinado')" class="cursor-pointer">Todos</li>
-                <li  class="changeText" [class.active]="segment == 'Oficial' " (click)="changeSegment('Oficial')" class="cursor-pointer">Oficial</li>
-                <li  class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Pessoal</li>
+                <li  class="changeText" [class.active]="segment == 'Oficial' " (click)="changeSegment('Oficial')" class="cursor-pointer">Calendário Oficial</li>
+                <li  class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Calendário Pessoal</li>
               </ul>
 
             </ion-row>
@@ -228,11 +228,14 @@
 
           <div class="calendar-title-container px-20 d-none d-md-flex">
             <div class="calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center" *ngIf="eventService.hasOwnCalendar">
-              <div >Meu Calendário</div>
+              <div >Agenda de {{loggeduser.FullName}}</div>
             </div>
             <div class="calendar-title-description text-black align-center" *ngIf="eventService.hasSharedCalendar">
               <div class="flex-grow-1 text-grey d-flex justify-center align-center">
-                <div >Calendário Partilhado</div>
+
+                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
+                  <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}}  </div>
+                </mat-option>
               </div>
             </div>
           </div>
@@ -281,7 +284,8 @@
                         <div class="description">
                           <p class="m-0">{{event.event.Subject}}</p>
                         </div>
-                        <div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
+                          <div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
+                          <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
                       </div>
                     </div>
 
@@ -322,7 +326,8 @@
                         <div class="description">
                           <p class="m-0">{{event.event.Subject}}</p>
                         </div>
-                        <div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
+                        <div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{loggeduser.FullName}} </div>
+                          <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
                       </div>
                     </div>
                   </div>
@@ -364,7 +369,8 @@
                         <div class="description">
                           <p class="m-0">{{event.event.Subject}}</p>
                         </div>
-                        <div class="font-13"> {{ eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) }}</div>
+                        <div class="font-13"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'"> {{loggeduser.FullName}} </div>
+                          <ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
                       </div>
                     </div>
 

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

@@ -179,7 +179,7 @@ export class AgendaPage implements OnInit {
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
     private storage:Storage,
-    public p: PermissionService
+    public p: PermissionService,
   ) {
 
     this.dateAdapter.setLocale('es');

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

@@ -64,10 +64,10 @@
                 <mat-form-field appearance="none" floatLabel="never" class="width-100 " >
                   <mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
                     <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/pages/agenda/new-event/new-event.page.html

@@ -29,8 +29,8 @@
             <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>
 
@@ -62,7 +62,7 @@
           <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
             <mat-select [(value)]="postEvent.CalendarName" >
               <mat-option *ngFor="let calendars of CalendarNamesOptions" value="{{calendars}}">
-                {{ calendars }}
+                Calendário {{ calendars }}
               </mat-option>
             </mat-select>
           </mat-form-field>