New Services, New Login, Better things

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

@@ -210,7 +210,7 @@ export class AgendaPage implements OnInit {
     console.log(test);
     const defaultEndDate = new Date();
 
-    await this.eventService.allEvents().subscribe(
+    await this.eventService.getAllEvents("2020-01-01","2020-12-31").subscribe(
       response => {
         this.eventsList = response;
 

src/app/pages/cal-modal/cal-modal.page.html

@@ -13,21 +13,21 @@
   <div class="div-ion-content">
   <ion-item>
     <ion-label position="stacked">Assunto</ion-label>
-    <ion-input tpye="text" [(ngModel)]="postEvent.Subject"></ion-input>
+    <ion-input type="text" [(ngModel)]="postEvent.Subject"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label position="stacked">Descrição</ion-label>
-    <ion-input tpye="text" [(ngModel)]="postEvent.Body.Text"></ion-input>
+    <ion-input type="text" [(ngModel)]="postEvent.Body.Text"></ion-input>
   </ion-item>
   <ion-item>
     <ion-label position="stacked">Localização</ion-label>
-    <ion-input tpye="text" [(ngModel)]="postEvent.Location"></ion-input>
+    <ion-input type="text" [(ngModel)]="postEvent.Location"></ion-input>
   </ion-item>
-  <ion-item>
+  <!-- <ion-item>
     <ion-label position="stacked">Intervenientes</ion-label>
-    <ion-input tpye="text" [(ngModel)]="postEvent.RequiredAttendees.Name"></ion-input>
-  </ion-item>
-  <ion-list>
+    <ion-input type="text" [(ngModel)]="postEvent.RequiredAttendees.Name"></ion-input>
+  </ion-item> -->
+  <!-- <ion-list>
     <ion-radio-group value="biff">
       <ion-item class="radio-button" lines="none">
         <ion-label>Oficial</ion-label>
@@ -39,7 +39,14 @@
         <ion-radio [(ngModel)]="postEvent.CalendarName" slot="start" value="griff"></ion-radio>
       </ion-item>
     </ion-radio-group>
-  </ion-list>
+  </ion-list> -->
+  <ion-item>
+    <ion-label>Selecione o calendário</ion-label>
+    <ion-select  [(ngModel)]="postEvent.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>
+  </ion-item>
   <ion-item>
     <ion-label>Selecione o tipo de evento</ion-label>
     <ion-select  [(ngModel)]="postEvent.EventType" interface="action-sheet" class="custom-options" Cancel-text="Cancelar">
@@ -61,7 +68,7 @@
       displayFormat="D MMM YYYY H:mm"
       monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
   </ion-item>
-  <div class="div-attach">
+  <!-- <div class="div-attach">
     <ion-item>
       <ion-icon name="add" slot="end"></ion-icon>
       <ion-label class="attach-label">Anexos</ion-label>
@@ -74,7 +81,7 @@
         <ion-icon name="trash" slot="end"></ion-icon>
       </ion-item>
     </ion-list>
-  </div>
+  </div>-->
 </div>
 </ion-content>
 <ion-footer class="ion-no-border">

src/app/pages/cal-modal/cal-modal.page.ts

@@ -3,6 +3,7 @@ import { ModalController } from '@ionic/angular';
 
 import { Event } from '../../models/event.model';
 import { EventsService } from 'src/app/services/events.service';
+import { EventBody } from 'src/app/models/eventbody.model';
 
 @Component({
   selector: 'app-cal-modal',
@@ -17,32 +18,13 @@ export class CalModalPage implements AfterViewInit {
   };
   
   viewTitle: string;
-
-  public postEvent: Event = {
-    EventId: '',
-    Subject: '',
-    Body: null,
-    Location: '',
-    CalendarId: '',
-    CalendarName: '',
-    StartDate: '',
-    EndDate: '',
-    EventType: '',
-    RequiredAttendees: null,
-    OptionalAttendees: null,
-    HasAttachments: false,
-    IsMeeting: false,
-    IsRecurring: false,
-    AppointmentState: 0,
-    TimeZone: '',
-    Organizer: '',
-    Categories: null,
-    Attachments: null,
-  };
-
+  postEvent: Event;
   modalReady = false;
 
-  constructor(private modalCtrl: ModalController, private eventService: EventsService) { }
+  constructor(private modalCtrl: ModalController, private eventService: EventsService) { 
+      this.postEvent = new Event();
+      this.postEvent.Body = { BodyType : "1", Text : ""};
+  }
 
   ngOnInit() {
   }
@@ -54,11 +36,8 @@ export class CalModalPage implements AfterViewInit {
   }
 
   save(){
-    this.modalCtrl.dismiss({postEvent: this.eventService.AddEvent(this.postEvent)});
-    /* this.eventService.AddEvent(); */
-    console.log("created");
-    
-    
+    this.eventService.postEvent(this.postEvent, this.postEvent.CalendarName).subscribe();
+    this.modalCtrl.dismiss();
   }
 
   onViewTitleChanged(title){

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

@@ -15,7 +15,9 @@ export class EventDetailPage implements OnInit {
   loadedEvent: Event;
   eventItem: Observable<Event>;
 
-  constructor(private activatedRoute: ActivatedRoute, private eventsService: EventsService) { }
+  constructor(private activatedRoute: ActivatedRoute, private eventsService: EventsService) { 
+    this.loadedEvent = new Event();
+  }
 
   ngOnInit() {
     /* Emit new data when something changes */
@@ -38,7 +40,7 @@ export class EventDetailPage implements OnInit {
 
   Save()
   {
-    this.eventsService.PutEvent(this.loadedEvent).subscribe(response => 
+    this.eventsService.putEvent(this.loadedEvent, 2, 3).subscribe(response => 
       {
         this.loadedEvent = response;
       });  

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

@@ -13,7 +13,7 @@
       <ion-item class="ion-text-right" lines="none">
         <ion-label class="ion-text-wrap">
             <h3 class="header-medium"> {{greetting}} Sua Excelência <br />
-              Minístro Director do Gabinete do<br />
+              Ministro Director do Gabinete do<br />
               Presidente da República
             </h3>
           <p class="p-small">{{customDate}}</p>
@@ -41,11 +41,10 @@
   <!-- List of Text Items -->
   <div [ngSwitch]="segment">
     <ion-list *ngSwitchCase="'combinada'" >
-
-      <ion-item-group *ngIf="eventsList | async as events">
+      <ion-item-group>
         <ion-item-sliding>
           <ion-item lines="none" 
-          *ngFor="let event of events"
+          *ngFor="let event of eventsList"
           [routerLink]="['/home/events', event.EventId]">
             <div class="div-item">
               <div class="div-up">
@@ -77,12 +76,12 @@
     </ion-list>
   <!-- OFICIAL -->
     <ion-list *ngSwitchCase="'oficial'">
-      <ion-item-group>
+      <!-- <ion-item-group>
         <ion-item-sliding>
           <ion-item-divider>
             <ion-label>8:00 am</ion-label>
           </ion-item-divider>
-          <ion-item lines="none" *ngFor="let event of events">
+          <ion-item lines="none" *ngFor="let event of eventsList">
             <div class="div-item">
               <div class="div-up">
                 <div class="div-icon">
@@ -107,13 +106,13 @@
             </div>
           </ion-item>
         </ion-item-sliding>
-      </ion-item-group>
+      </ion-item-group> -->
     </ion-list>
 
       <ion-list *ngSwitchCase="'pessoal'">
-        <ion-item-group>
+        <!-- <ion-item-group>
           <ion-item-sliding>
-            <ion-item lines="none" *ngFor="let event of events">
+            <ion-item lines="none" *ngFor="let event of eventsList">
               <div class="div-item">
                 <div class="div-up">
                   <div class="div-icon">
@@ -138,8 +137,7 @@
               </div>
             </ion-item>
           </ion-item-sliding>
-        </ion-item-group>
-
+        </ion-item-group> -->
       </ion-list>
   </div>
 </ion-content>

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

@@ -1,10 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, LOCALE_ID } from '@angular/core';
 
 import { Event } from '../../models/event.model';
 import { EventsService } from 'src/app/services/events.service';
 import { Router } from '@angular/router';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { formatDate } from '@angular/common';
 
 
 @Component({
@@ -13,52 +13,54 @@ import { Observable } from 'rxjs';
   styleUrls: ['./events.page.scss'],
 })
 export class EventsPage implements OnInit {
+  /* Get current system date */
+  today = new Date();
+  
+  months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
+  days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
- /* Get current system date */
- today = new Date();
- months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
- days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
- customDate = this.days[this.today.getDay()]+ ", "
- + this.today.getDate() +" de "
- + ( this.months[this.today.getMonth()]);
- /* Setting appropriate greeting according to the time */
- grettings = ["Bom dia", "Boa tarde", "Boa noite"];
- greetting='';
-timeDate = this.today.getHours() + ":" + this.today.getMinutes();
-/* Set segment variable */
- segment:string;
+  customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
 
- events: Event[];
- eventsList: Observable<Event[]>;
+  /* Setting appropriate greeting according to the time */
+  grettings = ["Bom dia", "Boa tarde", "Boa noite"];
+  greetting='';
 
- constructor(private eventService: EventsService, private router: Router, public activatedRoute: ActivatedRoute) { }
+  timeDate = this.today.getHours() + ":" + this.today.getMinutes();
+  /* Set segment variable */
+  segment:string;
 
- ngOnInit() {
-   //Inicializar segment
-   this.segment = "combinada";
-   this.showGreeting();
-   /* Call Get events method */
-   this.eventsList = this.eventService.allEvents();/* .subscribe(prods=>console.log(prods)); */
- }
+  eventsList: Event[];
 
- showGreeting(){
-  if(this.today.getHours() >= 6 && this.today.getHours() < 12){
-    console.log(this.grettings[0]+this.today.getHours());
-    this.greetting = this.grettings[0];
+  constructor(private eventService: EventsService, private router: Router, public activatedRoute: ActivatedRoute) { }
+
+  ngOnInit() {
+    //Inicializar segment
+    this.segment = "combinada";
+    this.showGreeting();
+
+    /* Call Get events method */
+      this.eventService.getAllEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
+      .subscribe(response => {
+          this.eventsList = response;
+        }
+      );
   }
-  else if(this.today.getHours() >= 12 && this.today.getHours() < 18){
-   console.log(this.grettings[1]+this.today.getHours());
-   this.greetting = this.grettings[1];
-  }
-  else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */{
-   console.log(this.grettings[2]+this.today.getHours());
-   this.greetting = this.grettings[2];
 
+  showGreeting(){
+    if(this.today.getHours() >= 6 && this.today.getHours() < 12){
+      this.greetting = this.grettings[0];
+    }
+    else if(this.today.getHours() >= 12 && this.today.getHours() < 18){
+      this.greetting = this.grettings[1];
+    }
+    else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */{
+      this.greetting = this.grettings[2];
+    }
+  }
+
+  gotTo(){
+    this.router.navigate(['/home/events']);
   }
-}
-gotTo(ev){
-  this.router.navigate(['/home/events']);
-}
 
 }