fix

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

@@ -218,8 +218,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">Calendário Oficial</li>
-                <li  class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Calendário Pessoal</li>
+                <li  class="changeText" [class.active]="segment == 'Oficial' " (click)="changeSegment('Oficial')" class="cursor-pointer">Agenda Oficial</li>
+                <li  class="changeText" [class.active]="segment == 'Pessoal' " (click)="changeSegment('Pessoal')" class="cursor-pointer">Agenda Pessoal</li>
               </ul>
 
             </ion-row>
@@ -227,13 +227,17 @@
 
           <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 >Agenda de {{SessionStore.user.FullName}}</div>
+              <!-- <div >Agenda de {{SessionStore.user.FullName}}</div> -->
+              <div >Minha agenda</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">
 
-                <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
-                  <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}}  </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 != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
+                    
                 </mat-option>
               </div>
             </div>

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

@@ -1232,7 +1232,7 @@ export class AgendaPage implements OnInit {
       let taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.UserName
+        Name: SessionStore.user.FullName
       }]
       const modal = await this.modalCtrl.create({
         component: NewEventPage,
@@ -1258,7 +1258,7 @@ export class AgendaPage implements OnInit {
       this.taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.UserName
+        Name: SessionStore.user.FullName
       }]
     }
   }
@@ -1542,4 +1542,9 @@ export class AgendaPage implements OnInit {
     return reuslt.length != 0
   }
 
+
+  checkRoleInArray(str) {
+    return this.eventService.calendarRole.includes(str);
+  }
+
 }

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">
-                      Calendário Oficial
+                      Agenda Oficial
                     </mat-option>
                     <mat-option value="Pessoal">
-                      Calendário Pessoal
+                      Agenda Pessoal
                     </mat-option>
                   </mat-select>
                 </mat-form-field>

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

@@ -3,7 +3,8 @@
     <div class="main-header">
       <div class="title-content width-100">
         <div class="middle">
-          <ion-label class="title">Novo Evento</ion-label>
+          <ion-label class="title">Novo Evento</ion-label> <br>
+          <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
         </div>
       </div>
     </div>
@@ -27,11 +28,18 @@
 
           <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
             <mat-select [(value)]="CalendarName" (selectionChange)="changeAgenda()">
-              
-              <mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars}}">
-                <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
-                <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
-                  
+
+              <!-- <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 != '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 != '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>
 
             </mat-select>
@@ -40,7 +48,6 @@
         </div>
       </div>
     </div>
-
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
@@ -62,7 +69,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}}">
-                Calendário {{ calendars }}
+                Agenda {{ calendars }}
               </mat-option>
             </mat-select>
           </mat-form-field>

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

@@ -24,7 +24,7 @@ ion-content{
        .middle{
         padding: 0!important;
         float: left;
-        width: 221px;
+        width: max-content;
         margin: 2.5px 0 0 5px;
       }
     }

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

@@ -117,6 +117,7 @@ export class NewEventPage implements OnInit {
     }
 
     if(!this.CalendarName) {
+      console.log('true', this.eventService.calendarNamesAry.includes('Meu calendario'))
       if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
         this.CalendarName = 'Meu calendario';
         console.log(this.eventService.calendarNamesAry)
@@ -183,6 +184,7 @@ export class NewEventPage implements OnInit {
 
     this.setDefaultTime()
 
+    this.checkRoleInArray()
   }
 
   setDefaultTime() {
@@ -566,4 +568,16 @@ export class NewEventPage implements OnInit {
     this.documents = this.documents.filter( (e, i) =>  index != i);
 
   }
+
+  checkRoleInArray() {
+    for (let index = 0; index < this.eventService.calendarNamesAry.length; index++) {
+      console.log('ROLE1', this.eventService.calendarNamesAry[index])
+      
+    }
+
+    for (let index = 0; index < this.eventService.calendarRole.length; index++) {
+      console.log('ROLE2',this.eventService.calendarRole[index])
+      
+    }
+  }
 }

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

@@ -17,10 +17,12 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Meu Calendário
+        Minha agenda
       </ion-segment-button>
-      <ion-segment-button value="PR">
-        Calendário Partilhado
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
+        <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 != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>

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

@@ -15,6 +15,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
 import { Storage } from '@ionic/storage';
+import { EventsService } from 'src/app/services/events.service';
 
 @Component({
   selector: 'app-event-list',
@@ -49,7 +50,8 @@ export class EventListPage implements OnInit {
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
     private RouteService: RouteService,
-    private storage: Storage
+    private storage: Storage,
+    public eventService: EventsService,
   ) { }
 
   ngOnInit() {

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

@@ -4,7 +4,8 @@
     <div class="content d-flex flex-column width-100 height-100 ">
       <div class="header-content header-default-padding">
         <div class="header-title">
-          <label>Convocar Reunião</label>
+          <label>Convocar Reunião</label> <br>
+          <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
         </div>
       </div>
       <div class="overflow-y-auto content-default-padding">
@@ -32,14 +33,21 @@
             <div class="ion-input-class flex-grow-1 justify-center align-center material-inputs " [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
 
               <mat-form-field appearance="none"  class="width-100" color="ion-color-secondary"  placeholder="Selecione agenda">
-                <mat-select [(value)]="CalendarOwnerName" (selectionChange)="changeAgenda()">
-                  
-                  <mat-option *ngFor="let calendars of calendarService.calendarNamesAry" value="{{calendars}}">
-                    <div *ngIf="calendars != 'Meu calendario' "> Agenda de {{calendars}} </div>
-                    <div *ngIf="calendars == 'Meu calendario'"> Agenda de {{loggeduser.FullName}} </div>
-                      
+                <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 != '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 != '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>
-
+    
                 </mat-select>
               </mat-form-field>
 

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

@@ -153,7 +153,7 @@ export class BookMeetingModalPage implements OnInit {
       this.taskParticipants = [{
         EmailAddress: SessionStore.user.Email,
         IsRequired: true,
-        Name: SessionStore.user.UserName
+        Name: SessionStore.user.FullName
       }]
     }
 

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -2,7 +2,10 @@
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column width-100">
       <ion-item  lines="none">
-        <ion-label class="title">{{modalTitle[taskType]}}</ion-label>
+        <ion-label class="title">{{modalTitle[taskType]}}</ion-label> <br>
+      </ion-item>
+      <ion-item  lines="none">
+        <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
       </ion-item>
 
       <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">

src/app/pages/publications/edit-action/edit-action.page.html

@@ -1,7 +1,8 @@
 <ion-header class="ion-no-border pt-20 px-20">
   <div class="title-content width-100 d-flex align-center justify-space-between ">
     <div class="div-title">
-      <ion-label class="title">Editar acção presidencial</ion-label>
+      <ion-label class="title">Editar acção presidencial</ion-label> <br>
+      <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
     </div>
 
   </div>

src/app/pages/publications/new-action/new-action.page.html

@@ -3,7 +3,8 @@
   <div class="content-container">
     <div class="title-content width-100">
       <div class="div-title">
-        <ion-label class="title"> Nova Acção</ion-label>
+        <ion-label class="title"> Nova Acção</ion-label> <br>
+        <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
       </div>
       <!-- <div class="actionType">
         <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -19,7 +20,7 @@
     </div>
 
   <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
-    <ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="folder.Description" placeholder="Assunto" ></ion-input>
+    <ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="folder.Description" placeholder="Assunto*" ></ion-input>
   </div>
 
   <div class="container-div">

src/app/pages/publications/new-action/new-action.page.scss

@@ -63,7 +63,7 @@ ion-toolbar{
   padding: 0 !important;
 }
 .div-title{
-  width: 180px;
+  width: 250;
 /* padding: 0!important; */
 float: left;
 margin: 2.5px 0 0 5px;

src/app/pages/publications/new-publication/new-publication.page.html

@@ -3,7 +3,9 @@
   <div class="content-container d-flex flex-column">
     <div class="title-content width-100">
       <div class="div-title">
-        <ion-label class="title">{{publicationTitle}}</ion-label>
+        <ion-label class="title">{{publicationTitle}}</ion-label> <br>
+        <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
+        
       </div>
     </div>
 

src/app/pages/publications/new-publication/new-publication.page.scss

@@ -61,7 +61,7 @@ ion-toolbar{
   padding: 0 !important;
 }
 .div-title{
-  width: 270px;
+  width: 300px;
 /* padding: 0!important; */
 float: left;
 margin: 2.5px 0 0 5px;