Merge branch 'master' of https://bitbucket.org/equilibriumito/gabinete-digital

src/app/pages/agenda/agenda.page.scss

@@ -19,9 +19,11 @@
   .monthview-selected {
     background-color: lightskyblue !important;
   }
-  /* .item{
+  .item{
-    background: red !important;
+    /* background: red !important; */
-  } */
+    text-transform: capitalize;
+
+  }
   .input-wrapper{
     border-left: red !important;
     /* background: red; */
@@ -34,10 +36,6 @@
   border-radius: 15px;
 }
 
-.capitaliseText{
-    text-transform: capitalize;
-}
-
 
 
 /* TOGGLE button */

src/app/pages/events/attachments/attachments.page.ts

@@ -14,7 +14,11 @@ export class AttachmentsPage implements OnInit {
   loadedEventAttachments: Attachment[];
   pageId: string;
 
-  constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { }
+  constructor(
+    private attachamentsService: AttachmentsService, 
+    private activatedRoute: ActivatedRoute, 
+    private iab: InAppBrowser, 
+    private route: Router) { }
 
   ngOnInit() {
         /* Emit new data when something changes */
@@ -43,8 +47,8 @@ export class AttachmentsPage implements OnInit {
   }
 
   navigateBack(){
-    console.log(this.pageId);
     this.route.navigate(['/home/events',this.pageId]);
   }
 
+
 }

src/app/pages/events/attendee-modal/attendee-modal.page.html

@@ -31,7 +31,7 @@
     </ion-buttons>
     <ion-buttons slot="end">
       <ion-button (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>Adicionar</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>

src/app/pages/events/attendees/attendees.page.html

@@ -49,7 +49,7 @@
     <ion-title></ion-title>
     <ion-buttons slot="end">
       <ion-button (click)="save()">
-        <ion-label>Gravar</ion-label>
+        <ion-label>OK</ion-label>
         <ion-icon name="checkmark" slot="start"></ion-icon>
       </ion-button>
     </ion-buttons>

src/app/pages/events/event-detail/event-detail.page.html

@@ -18,8 +18,8 @@
       <ion-item-sliding>
         <form [formGroup]="ionicForm" novalidate>
           <ion-item>
-            <ion-label position="stacked">Assunto</ion-label>
+            <ion-label class="capitalizeText" position="stacked">Assunto</ion-label>
-            <ion-input [(ngModel)]="loadedEvent.Subject" formControlName="subject" type="text" required></ion-input>
+            <ion-input class="capitalizeText"  [(ngModel)]="loadedEvent.Subject" formControlName="subject" type="text" required></ion-input>
           </ion-item>
           <!-- Error messages -->
           <span class="error ion-padding" *ngIf="errorControl.subject.errors?.required">
@@ -28,15 +28,15 @@
         </form>
         <ion-item>
           <ion-label position="stacked">Descrição</ion-label>
-          <ion-input [(ngModel)]='loadedEvent.Body.Text'></ion-input>
+          <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Body.Text'></ion-input>
         </ion-item>
         <ion-item>
           <ion-label position="stacked">Localização</ion-label>
-          <ion-input [(ngModel)]='loadedEvent.Location'></ion-input>
+          <ion-input class="capitalizeText" [(ngModel)]='loadedEvent.Location'></ion-input>
         </ion-item>
         <ion-item>
           <ion-label position="stacked">Calendário</ion-label>
-          <ion-select placeholder="{{loadedEvent.CalendarName}}" [(ngModel)]="loadedEvent.CalendarName" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
+          <ion-select class="capitalizeText" placeholder="{{loadedEvent.CalendarName}}" [(ngModel)]="loadedEvent.CalendarName" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
             <ion-select-option Pessoal="Reunião">Pessoal</ion-select-option>
             <ion-select-option Oficial="Viagem">Oficial</ion-select-option>
           </ion-select>
@@ -101,7 +101,7 @@
                 <ion-list >
                   <ion-item class="attendees" lines="none" >
                       <ion-icon class="attendees-icon" name="person" slot="start"></ion-icon>
-                      <ion-label class="attendees-list">{{attendee.Name}}</ion-label> 
+                      <ion-label class="capitalizeText" class="attendees-list">{{attendee.Name}}</ion-label> 
                   </ion-item>
                 </ion-list>
               </div>
@@ -137,7 +137,7 @@
             </div>
           </div>
           <div *ngIf="loadedEventAttachments.length > 1">
-           <!--  <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
+            <!-- <ion-button class="see-more-button" fill="none" shape="round" [routerLink]="['/home/attachments', loadedEvent.EventId]">
               <ion-label color="secondary">Ver mais...</ion-label>
             </ion-button> -->
           </div>

src/app/pages/events/event-detail/event-detail.page.scss

@@ -92,3 +92,4 @@ ion-card{
   text-transform: initial;
   font-size: 16px;
 }
+

src/app/pages/events/event-detail/event-detail.page.ts

@@ -40,6 +40,7 @@ export class EventDetailPage implements OnInit {
     private modalCtrl: ModalController,
     private alertService: AlertService,
     private attachamentsService: AttachmentsService,
+    private route: Router,
     private iab: InAppBrowser) { 
     this.loadedEvent = new Event();
     this.loadedEvent.Body = new EventBody();
@@ -204,4 +205,7 @@ export class EventDetailPage implements OnInit {
      }, 2000);
 
   }
+  navigateTo(ev){
+    this.route.navigate(['/home/events',ev]);
+  }
 }

src/app/pages/events/events.page.html

@@ -72,7 +72,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -81,7 +81,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div *ngIf="event.HasAttachments" class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
@@ -105,7 +105,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate | date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -114,7 +114,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>
@@ -138,7 +138,7 @@
                   <ion-icon slot="start" name="reader"></ion-icon>
                 </div>
                 <div class="div-content-{{event.CalendarName}}">
-                  <h3>{{event.Subject}}</h3>
+                  <h3 class="capitalizeText">{{event.Subject}}</h3>
                   <p>{{event.StartDate | date: 'hh:mm' }} - {{event.EndDate | date: 'hh:mm'}}</p>
                 </div>
               </div>
@@ -147,7 +147,7 @@
                   <ion-icon class="ion-icon-location" slot="start" name="location"></ion-icon>
                 </div>
                 <div class="div-botton-middle">
-                  <p class="item-list-small">{{event.Location}}</p>
+                  <p class="item-list-small capitalizeText">{{event.Location}}</p>
                 </div>
                 <div class="div-botton-right">
                   <ion-icon class="ion-icon-attach" slot="end" name="attach-outline"></ion-icon>

src/theme/variables.scss

@@ -250,3 +250,6 @@
   --border-radius: 10px;
   padding: 25px;
 } */
+.capitalizeText{
+  text-transform: capitalize;
+}