confit

src/app/pages/agenda/agenda-routing.module.ts

@@ -1,15 +1,16 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AgendaPage
-  },
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AgendaPage
+  },
+  {
     path: 'approve-event-modal',
-    path: 'approve-event-modal',
+    loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
   },
   {
     path: 'event-actions-popover',
@@ -32,10 +33,10 @@ const routes: Routes = [
     loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
   }
 
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AgendaPageRoutingModule {}

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

@@ -1,16 +1,21 @@
 import { Component, OnInit, ViewChild, Inject, LOCALE_ID, Input } from '@angular/core';
 import { CalendarComponent } from 'ionic2-calendar';
 import { AlertController, ModalController } from '@ionic/angular';
+import { formatDate } from '@angular/common';
 import { CalModalPage } from '../cal-modal/cal-modal.page';
 import { EventsService } from 'src/app/services/events.service';
 import { Event } from '../../models/event.model';
 import { Router, NavigationEnd } from '@angular/router';
 import { AlertService } from 'src/app/services/alert.service';
+<<<<<<< HEAD
 import { NewEventPage } from './new-event/new-event.page';
 import { ViewEventPage } from './view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG';
 import { DomSanitizer } from "@angular/platform-browser";
 
+=======
+import { momentG }  from 'src/plugin/momentG'
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
 import {
@@ -19,8 +24,15 @@ import {
   CalendarView,
   DAYS_OF_WEEK,
 } from 'angular-calendar';
+<<<<<<< HEAD
 import { CustomDateFormatter } from './custom-date-formatter.provider';
+=======
+
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
+import { CustomDateFormatter } from './custom-date-formatter.provider';
+import { ViewEventPage } from './view-event/view-event.page';
+import { NewEventPage } from './new-event/new-event.page';
 
 @Component({
   selector: 'app-agenda',
@@ -55,7 +67,6 @@ export class AgendaPage implements OnInit {
   showCalendar: boolean;
   calendarHeight: string;
 
-
   // for timeline
   events: CalendarEvent[] = [];
   // timeline filter
@@ -101,6 +112,7 @@ export class AgendaPage implements OnInit {
   startTime: Date;
   endTime: Date;
 
+<<<<<<< HEAD
 
   mobileComponent: any = {
     showAddNewEvent: false,
@@ -117,6 +129,8 @@ export class AgendaPage implements OnInit {
     saveData: {}
   }
 
+=======
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
   constructor( 
     private alertCtrl: AlertController,
     @Inject(LOCALE_ID) private locale: string,
@@ -211,7 +225,7 @@ export class AgendaPage implements OnInit {
 
   onCurrentChanged = (ev: Date) => {
     // timeline change date
-    this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy');
+    this.timelineDate = new Date(ev).toLocaleString();
     this.viewDate = new Date(ev);
     // calendar change date
     this.eventSelectedDate = new Date(ev);
@@ -222,15 +236,22 @@ export class AgendaPage implements OnInit {
 
   // changedate
   dropDownChangeDate(id: string){
-    const currentCandarDayYear = momentG(this.eventSelectedDate,'dd -- yyyy', 'pt');
+    /* const currentCandarDayYear = formatDate(this.eventSelectedDate,'dd -- yyyy', 'pt');
     const newDate = new Date(currentCandarDayYear.replace('--',id));
-    this.onCurrentChanged(newDate); 
+    this.onCurrentChanged(newDate); */
   }
 
+<<<<<<< HEAD
   onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
     console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
     this.eventSelectedDate2 = ev.selectedTime;
   }; 
+=======
+  /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
+        console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
+        this.eventSelectedDate2 = ev.selectedTime;
+    }; */
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
   onRangeChanged (ev: { startTime: Date, endTime: Date }) {
     this.rangeStartDate = ev.startTime;
@@ -389,11 +410,11 @@ export class AgendaPage implements OnInit {
     this.eventsList.forEach((element, eventIndex) => {
       
       // timeline start
-      const startHours =  momentG(new Date(element.StartDate), 'HH', 'pt');
-      const EndHours = momentG(new Date(element.EndDate), 'HH', 'pt');
+      const startHours =  new Date(element.StartDate).getHours().toLocaleString();
+      const EndHours = new Date(element.EndDate).getHours().toLocaleString();
 
-      const startHoursOtherFormate =  momentG(new Date(element.StartDate), 'HH:mm', 'pt');
-      const EndHoursOtherFormate = momentG(new Date(element.EndDate), 'HH:mm', 'pt');
+      const startHoursOtherFormate =  new Date(element.StartDate).getHours().toLocaleString()+':'+new Date(element.StartDate).getMinutes().toLocaleString();
+      const EndHoursOtherFormate = formatDate(new Date(element.EndDate), 'HH:mm', 'pt');
 
       if (element.CalendarName == calendarName) {
         this.events.push({
@@ -458,7 +479,7 @@ export class AgendaPage implements OnInit {
                 });
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
               
               this.myCal.update();
               this.myCal.loadEvents();
@@ -491,7 +512,7 @@ export class AgendaPage implements OnInit {
 
               });
 
-              this.timelineFilter(this.timelineFilterState);
+              // this.timelineFilter(this.timelineFilterState);
 
               this.myCal.update();
               this.myCal.loadEvents();

src/app/pages/agenda/approve-event-modal/approve-event-modal-routing.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ApproveEventModalPage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ApproveEventModalPageRoutingModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.module.ts

@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { ApproveEventModalPageRoutingModule } from './approve-event-modal-routing.module';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ApproveEventModalPageRoutingModule
-  ],
-  declarations: [ApproveEventModalPage]
-})
-export class ApproveEventModalPageModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss

@@ -1,141 +0,0 @@
-ion-content{
-  --padding-top:0px;
-  --padding-start: 20px;
-  --padding-end: 20px;
-  font-size: 18px;
-}
-ion-menu{
-  --height: 225px;
-}
-.header-content{
-  width: 360px;
-  overflow: auto;
-  margin: 25px auto;
-}
-.header-icon-left{
-  width: 36px;
-  font-size: 33px;
-  color: #42b9fe;
-  float: left;
-}
-.header-title{
-  width: 264px;
-  font-family: Roboto;
-  font-size: 25px;
-  margin: 0 5px 0 5px;
-  padding: 0;
-  color:#000;
-  float: left;
-}
-.header-icon-right{
-  width: 45px;
-  font-size: 45px;
-  float: left;
-  overflow: auto;
-}
-.upper-content{
-  margin-left: 50px;
-  overflow: auto;
-  font-size: 18px;
-
-  .content-location{
-    width: 360px;
-    margin: 0 auto;
-    padding: 0;
-    overflow: auto;
-  }
-
-  .location-detail{
-    width: 210px;
-    font-weight: 700;
-    font-size: 18px;
-    float: left;
-    margin: 5px 5px 5px 0px;
-  }
-  .button-calendar-type{
-      width: 91px;
-      --border-radius: 12.5px;
-      --background: #ffb703;
-      margin-left: 5px;
-      float: left;
-  }
-  .button-calendar-type ion-button{
-    height: 25px;
-  }
-  .button-edit-event {
-      width: 140px;
-      height: 44px;
-      border-radius: 22.5px;
-      --background: #e0e9ee;
-      --color:#061b52;
-  }
-  .content-details p{
-      font-size: 16px;
-  }
-}
-.middle-conten{
-  .middle-content h3, .middle-content p{
-    font-size: 16px;
-  }
-}
-
-.bottom-content{
-  width: 360px;
-  margin: 0 auto;
-  
-  .bottom-content h3{
-    font-size: 16px;
-    margin: 0 0 0 10px;
-  }
-  .attach-document{
-    font-size: 15px;
-    color: #0d89d1;
-    margin: 5px 5px 5px 10px;
-    padding: 5px;
-    float: left;
-  }
-  .attach-icon{
-    width: 37px;
-    font-size: 35px;
-    float: left;
-  }
-  .attach-title-item{
-    width: 100%;
-    font-size: 15px;
-    color:#0d89d1;
-  }
-  /* SPAN */
-  .span-left{
-    float: left;
-    font-size: 15x;
-  }
-  .span-right{
-  text-align: right;
-  float: right;
-  font-size: 13px;
-  }
-}
-
-.buttons{
-  width: 360px;
-  margin: 0 auto;
-}
-
-.button-options {
-    height: 44px;
-     --color: #42b9fe;
-     /* opacity: 0; */
-}
-.button-approve {
-  width: 140px;
-  height: 44px;
-  border-radius: 22.5px;
-  --background: #42b9fe;
-}
-.button-reject {
-  width: 140px;
-  height: 44px;
-  --color: #d30a0a;
-  border-radius: 22.5px;
-  --background: #ffe0e0;
-}

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.spec.ts

@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { IonicModule } from '@ionic/angular';
-
-import { ApproveEventModalPage } from './approve-event-modal.page';
-
-describe('ApproveEventModalPage', () => {
-  let component: ApproveEventModalPage;
-  let fixture: ComponentFixture<ApproveEventModalPage>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ApproveEventModalPage ],
-      imports: [IonicModule.forRoot()]
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(ApproveEventModalPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});