confit

src/app/app.component.ts

@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 
 import { Platform } from '@ionic/angular';
-/* import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+/* import { SplashScreen } from '@ionic-native/splash-screen/ngx'; */
 import { StatusBar } from '@ionic-native/status-bar/ngx';
- */
+
 @Component({
   selector: 'app-root',
   templateUrl: 'app.component.html',
@@ -12,16 +12,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 export class AppComponent {
   constructor(
     private platform: Platform,
-   /*  private splashScreen: SplashScreen,
-    private statusBar: StatusBar */
+    /* private splashScreen: SplashScreen, */
+    private statusBar: StatusBar
   ) {
     this.initializeApp();
   }
 
   initializeApp() {
     this.platform.ready().then(() => {
-      /* this.statusBar.styleDefault();
-      this.splashScreen.hide(); */
+      this.statusBar.styleDefault();
+      /* this.splashScreen.hide(); */
     });
   }
 }

src/app/app.module.ts

@@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
 
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
-/* import { SplashScreen } from '@ionic-native/splash-screen/ngx';
-import { StatusBar } from '@ionic-native/status-bar/ngx'; */
+import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+import { StatusBar } from '@ionic-native/status-bar/ngx';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -47,8 +47,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
     HttpClientModule, 
     ],
   providers: [
-    /* StatusBar,
-    SplashScreen, */
+    StatusBar,
+    SplashScreen,
     HttpClientModule,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     InAppBrowser,

src/app/home/home.page.ts

@@ -9,10 +9,18 @@ import { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expedient
 import { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'
 import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
 
+<<<<<<< HEAD
 import { Plugins, PushNotificationActionPerformed } from '@capacitor/core';
+=======
+/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 import { Router } from '@angular/router';
 
+<<<<<<< HEAD
 const { PushNotifications, LocalNotificationAction } = Plugins;
+=======
+/* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
 @Component({
   selector: 'app-home',
@@ -28,12 +36,16 @@ export class HomePage implements OnInit {
   totalExpediente = 0;
   profile: string;
 
+<<<<<<< HEAD
   windowsWidth =  window.innerWidth;
 
   constructor(private ngZone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
+=======
+  constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
 
   ngOnInit() {
-    //Initialize profile as mdgpr
+/*     //Initialize profile as mdgpr
 
     let date = new Date();
     date.setMonth(date.getMonth() + 1);
@@ -57,21 +69,6 @@ export class HomePage implements OnInit {
     this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
       this.totalExpediente = result;
     });
-    /*
-        (PushNotifications as any).requestPermission().then(result => {
-          PushNotifications.register();
-        });
-    
-        PushNotifications.addListener(
-          'registration',
-          (token: PushNotificationToken) => {
-            alert('Push registration success, token: ' + token.value);
-            console.log('FIREBASE: ', token.value)
-            this.storageService.store(this.username,token.value);
-          },
-        );
-    
-        console.log(this.storageService.get(this.username)) */
 
     PushNotifications.addListener('registrationError', (error: any) => {
       alert('Error on registration: ' + JSON.stringify(error));
@@ -80,7 +77,7 @@ export class HomePage implements OnInit {
     PushNotifications.addListener('pushNotificationReceived', notification => {    
 
       //const isPushNotification = !!notification.title || !!notification.body;
-  
+
       // if this is a push notification received when the app is in the foreground on Android
       //if (isAndroid && isPushNotification) {
   
@@ -103,27 +100,6 @@ export class HomePage implements OnInit {
         console.log('Object: ', object);
         console.log('idObject: ', idObject);
 
-        /* if (service === "events") {
-          this.router.navigate(['/home/', service, idObject, 'home']);
-        } else if (service === "agenda") {
-          this.router.navigate(['/home/', service, idObject, 'home']);
-        } else  if (service === "gabinete-digital" && object != "expediente") {*/
-         // this.router.navigate(['/home/', service]);
-       // }
-
-        //if (service != null) {
-
-        /*const routeValue = {
-          "agenda": this.router.navigate(['/home/', service, idObject, 'home']),
-          "gabinete-digital": this.router.navigate(['/home/', service]),
-          "accoes": this.viewExpedientDetail(idObject),
-
-        }
-
-        const route = routeValue[service] && object  ;
-
-        service = "agenda" ? this.router.navigate(['/home/', service, idObject, 'home']) : */
-
           if (service === "agenda") {
             //this.router.navigate(['/home/', service, idObject, 'home']);
             this.viewEventDetail(idObject)
@@ -132,7 +108,7 @@ export class HomePage implements OnInit {
             this.viewExpedientDetail(idObject)
           } 
           else if (service === "gabinete-digital" && object === "event-list") {
-            /* this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])})  */
+            // this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])}) 
             this.openApproveModal(idObject);
           } 
           else if (service === "accoes" && object === "accao") {
@@ -142,42 +118,11 @@ export class HomePage implements OnInit {
             this.viewPublicationDetail(idObject)
           }
  
-
-
-
-        /*switch (service) {
-          case "events":
-            this.router.navigate(['/home/', service, idObject, 'home']);
-            break;
-          case "agenda":
-            this.router.navigate(['/home/', service, idObject, 'home']);
-            break;
-          case "gabinete-digital":
-            this.router.navigate(['/home/', service]);
-            break;
-          case "gabinete-digital-expediente":
-            this.router.navigate(['/home/gabinete-digital/', object, idObject, 'home']);
-            break;
-          case "": {
-
-            if(publicationId && processId != null) {
-              this.viewPublicationDetail(publicationId,processId)
-            }
-            if (folder.ProcessId != null) {
-              this.viewPublications(folder)
-            }
-          }
-
-          default:
-            this.router.navigate(['/home/']);
-        }*/
-
-
-
       },
-    );
+    ); */
   }
 
+<<<<<<< HEAD
 
 
 
@@ -199,8 +144,43 @@ export class HomePage implements OnInit {
           foreground: true,
         }
       ]
+=======
+  /* mobileFirstTest() {
+    this.zone.run(() => {
+      alert("Hello MobileFirst");
+      alert("Connecting to Server...");
+>>>>>>> 942d9528e40c789acd71990ac4a7388602c16e67
     });
-  }
+    WLAuthorizationManager.obtainAccessToken("").then(
+      (token) => {
+        console.log('-->  pingMFP(): Success ', token);
+        this.zone.run(() => {
+          alert("Yay!");
+          alert("Connected to MobileFirst Server");
+        });
+        var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
+          WLResourceRequest.GET
+        );
+
+        resourceRequest.setQueryParameter("name", "world");
+        resourceRequest.send().then(
+          (response) => {
+            // Will display "Hello world" in an alert dialog.
+            alert("Success: " + response.responseText);
+          },
+          (error) => {
+            alert("Failure: " + JSON.stringify(error));
+          }
+        );
+      }, (error) => {
+        console.log('-->  pingMFP(): failure ', error.responseText);
+        this.zone.run(() => {
+          alert("Bummer...");
+          alert("Failed to connect to MobileFirst Server");
+        });
+      }
+    );
+  } */
 
    async openApproveModal(eventSerialNumber){
     const modal = await this.modalController.create({
@@ -231,12 +211,33 @@ export class HomePage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async viewExpedientDetail(serialNumber:any) {
+  /* async viewExpedientDetail(serialNumber:any) {
     console.log(this.profile);
-    
+
+    const modal = await this.modalController.create({
+      component: ViewEventPage,
+      componentProps: {
+        eventId: eventId,
+      },
+      cssClass: 'modal',
+      backdropDismiss: false
+    });
+    await modal.present();
+    modal.onDidDismiss().then((res) => {
+      if (res) {
+        console.log(res);
+        //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+      }
+    });
+  }
+
+  async viewExpedientDetail(serialNumber: any) {
+    console.log(this.profile);
+    console.log("Expediente id: ", serialNumber);
+
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
-      componentProps:{
+      componentProps: {
         serialNumber: serialNumber,
         profile: this.profile,
       },
@@ -245,7 +246,7 @@ export class HomePage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss();
-  }
+  } */
 
 
 
@@ -263,8 +264,6 @@ export class HomePage implements OnInit {
   }
 
   async viewPublications(folderId) {
-
-
     const modal = await this.modalController.create({
       component: ViewPublicationsPage,
       /* enterAnimation,

src/app/models/despacho.model.ts

@@ -5,6 +5,7 @@ export class Despacho{
     DistributionType: string;
     CountryCode: string;
     Priority: string;
+    SubjectTypeId:string;
     UserEmail: string;
     UsersSelected: Participant[];
     DispatchFolder: Folder;

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();
-  });
-});

src/app/pages/chat/chat.page.ts

@@ -9,6 +9,7 @@ import { ContactsPage } from './messages/contacts/contacts.page';
 import { MessagesPage } from './messages/messages.page';
 import { NewGroupPage } from './new-group/new-group.page';
 import { NewchatPage } from './newchat/newchat.page';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-chat',
@@ -24,7 +25,7 @@ export class ChatPage implements OnInit {
   X_User_Id:any;
   X_Auth_Token:any;
   
-  loggedUser: any;
+  private loggedUser: any;
   /* Set segment variable */
   segment:string;
   allGroups: any[];
@@ -42,21 +43,29 @@ export class ChatPage implements OnInit {
     private chatService: ChatService,
     private modalController: ModalController,
     private authService: AuthService,
+    private storage:Storage,
 
     ) { 
       this.headers = new HttpHeaders();
-      this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
-      this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ');
+      /* this.headers = this.headers.set('X-User-Id', 'GqjNWiLrGEHRna7Zn');
+      this.headers = this.headers.set('X-Auth-Token', 'SJwIgtlqfloPK696fpc2VBvyDluipuIHKB_0Q6-9ycJ'); */
+      
     }
 
   ngOnInit() {
     this.segment = "Contactos";
+
     this.authService.userData$.subscribe((res:any)=>{
       this.loggedUser=res;
       console.log(this.loggedUser);
-      
     });
-    this.load();
+    this.storage.get('userDataKey').then(val=> {
+      let t = JSON.parse(unescape(atob(val)));
+      this.loggedUser=t;
+      this.load();
+    })
+
+   
   }
   
   onSegmentChange(){

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

@@ -87,9 +87,9 @@ export class EventsPage implements OnInit {
     this.profile = "mdgpr";
     console.log(this.profile);
 
-    this.storageService.get(AuthConnstants.USER).then(res=>{
+    /* this.storageService.get(AuthConnstants.USER).then(res=>{
       console.log(res);
-    });
+    }); */
 
     this.showGreeting();
 

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

@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
-import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
+import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
+
 
 @Component({
   selector: 'app-approve-event-modal',
@@ -15,36 +16,45 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class ApproveEventModalPage implements OnInit {
   event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
+  loadedEvent: any;
+  loadedAttachments: any;
+  serialNumber: string;
+  customDate: any;
+  today: any;
+
   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"];
 
-  
+
   constructor(
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
-    )
-    {
-      this.serialNumber = this.navParams.get('serialNumber');
-     }
+    private activatedRoute: ActivatedRoute,
+  ) {
+    this.activatedRoute.paramMap.subscribe(paramMap =>
+      {
+        if (!paramMap.has("serialNumber")){
+          return;
+        }
+        else{
+          this.serialNumber = paramMap.get('serialNumber'); 
+        }
+      });
+  }
 
   ngOnInit() {
     this.getTask();
     this.getAttachments();
   }
 
-  notImplemented(){
+
+  notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
@@ -55,7 +65,7 @@ export class ApproveEventModalPage implements OnInit {
 
   getTask(){
     this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
+      console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       console.log(new Date(this.today));
@@ -64,6 +74,7 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
+    console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -73,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
+    console.log('emendTask: ',serialNumber)
     /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
@@ -80,7 +92,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   rejectTask(serialNumber:string){
-  
+    console.log('rejectTask: ',serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -90,6 +102,7 @@ export class ApproveEventModalPage implements OnInit {
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      console.log('getAttachments: ',this.serialNumber)
       this.loadedAttachments = res;
       console.log(res);
     });

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

@@ -40,6 +40,7 @@
           <ion-item-sliding>
             <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

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

@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
 import { NavigationEnd, Router } from '@angular/router';
 
 @Component({

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

@@ -32,6 +32,18 @@
       </div>
     </div>
   </div>
+  <div class="container-div">
+    <div class="ion-item-class-2">
+      <div class="ion-icon-class">
+        <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+      </div>
+      <div class="ion-input-class">
+        <ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
+          <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
+        </ion-select>
+      </div>
+    </div>
+  </div>
 
   <div class="container-div">
     <div class="ion-item-class-2">

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

@@ -34,6 +34,7 @@ export class ExpedientTaskModalPage implements OnInit {
   taskDescription: string;
   user: string;
   loadedAttachments:any;
+  subjectTypes:any;
 
   postData: Despacho;
   dispatchFolder: Folder;
@@ -65,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit {
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
       this.postData.Priority = '99999861';
+      /* By Default TypeDeadline should be 'Economia' */
+      this.postData.SubjectTypeId = '99999844';
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio;
      }
@@ -79,7 +82,9 @@ export class ExpedientTaskModalPage implements OnInit {
     
     console.log(this.task.serialNumber);
     this.getAttachments();
-    
+
+    console.log(this.getSubjectType());
+  
   }
 
   close(){
@@ -89,6 +94,12 @@ export class ExpedientTaskModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
+  getSubjectType(){
+    this.processes.GetSubjectType().subscribe(res=>{
+      console.log(res);
+      this.subjectTypes = res;
+    });
+  }
   saveTask(){
     console.log(this.taskType);
     
@@ -100,6 +111,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -113,6 +125,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -124,6 +137,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -201,6 +215,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    console.log(this.task.serialNumber);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -22,18 +22,18 @@ import { momentG }  from 'src/plugin/momentG'
 export class ExpedienteDetailPage implements OnInit {
 
   task: any;
-  fulltask:any;
-  eventsList: Event[];  
-  serialnumber:string;
+  fulltask: any;
+  eventsList: Event[];
+  serialnumber: string;
   profile: string;
 
   constructor(private activateRoute: ActivatedRoute,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private iab: InAppBrowser,
     private attachments: AttachmentsService,
     private events: EventsService,
     private menu: MenuController,
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
     private alertService: AlertService) { 
@@ -46,7 +46,7 @@ export class ExpedienteDetailPage implements OnInit {
     console.log(this.serialnumber);
     
     this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')){
+      if (!paramMap.has('SerialNumber')) {
         return;
       }
       /* this.serialnumber = paramMap.get('SerialNumber'); */
@@ -58,8 +58,7 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
 
-  async LoadTaskDetail(serial:string)
-  {
+  async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -71,18 +70,16 @@ export class ExpedienteDetailPage implements OnInit {
       }
       this.fulltask = res;
       console.log(res);
-      
+
     });
   }
 
-  async LoadRelatedEvents(serial:string)
-  {
-    if (this.eventsList == null)
-    {
+  async LoadRelatedEvents(serial: string) {
+    if (this.eventsList == null) {
       this.attachments.getAttachmentsBySerial(serial).subscribe(res => {
         console.log(res);
-        res.forEach(att =>{
-          if (this.eventsList == null){
+        res.forEach(att => {
+          if (this.eventsList == null) {
             this.eventsList = new Array();
           }
           this.events.getEvent(att.ParentId).subscribe(event => {
@@ -101,13 +98,13 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   openMenu() {
-     this.menu.open();
+    this.menu.open();
   }
 
-  async openExpedientActionsModal(taskAction:any, task:any){
+  async openExpedientActionsModal(taskAction: any, task: any) {
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
-      componentProps:{
+      componentProps: {
         taskAction: taskAction,
         task: task,
       },
@@ -118,17 +115,17 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  discartExpedient(){
+  discartExpedient() {
     let body = { "serialNumber": this.serialnumber, "action": "Task Completed" }
     console.log(body);
     this.processes.PostTaskAction(body);
     this.router.navigate(['/home/gabinete-digital/expediente']);
   }
 
-  async openBookMeetingModal(task:any){
+  async openBookMeetingModal(task: any) {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
-      componentProps:{
+      componentProps: {
         task: task,
       },
       cssClass: 'book-meeting-modal',
@@ -138,12 +135,12 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async viewEventDetail(eventId:any) {
+  async viewEventDetail(eventId: any) {
     console.log(this.profile);
-    
+
     const modal = await this.modalController.create({
       component: ViewEventPage,
-      componentProps:{
+      componentProps: {
         eventId: eventId,
         profile: this.profile,
       },
@@ -151,8 +148,8 @@ export class ExpedienteDetailPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
+    modal.onDidDismiss().then((res) => {
+      if (res) {
       }
     });
   }

src/app/pages/login/login.page.ts

@@ -12,10 +12,10 @@ import { NotificationsService } from 'src/app/services/notifications.service';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Token } from '../../models/token.model';
 
-import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
+/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed } from '@capacitor/core';
 
 const { PushNotifications } = Plugins;
-
+ */
 
 
 @Component({
@@ -44,7 +44,7 @@ export class LoginPage implements OnInit {
 
   }
   //Function to validade the login inputs
-  validateInput() {
+  validateInput(){
     return (
       this.username.trim().length > 0
       && this.password.trim().length > 0
@@ -78,7 +78,7 @@ export class LoginPage implements OnInit {
     });
   }
 
-  storeUserIdANdToken() {
+  /* storeUserIdANdToken() {
 
    (PushNotifications as any).requestPermission().then(result => {
       PushNotifications.register();
@@ -94,18 +94,16 @@ export class LoginPage implements OnInit {
           this.storageService.get(AuthConnstants.USER).then(res => {
             console.log('USERID', res);
             const headers = { 'Authorization': 'Basic cGF1bG8ucGludG9AZ2FiaW5ldGVkaWdpdGFsLmxvY2FsOnRhYnRlc3RlQDAwNg==' };
-            const body = { UserId: res,
+            const body = {
+              UserId: res,
               TokenId: token.value,
               Status: 1,
-              Service: 1 };
+              Service: 1
+            };
 
-            this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body,{headers}).subscribe(data => {
+            this.http.post<Token>('https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/notifications/token', body, { headers }).subscribe(data => {
               console.log('TOKEN USER MIDLE', data);
             })
-            /*this.http.get<Token>('http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/notifications/user/'+res).subscribe(data => {
-              console.log('TOKEN USER MIDLE',data);
-            })*/
-
         });
 
         });
@@ -113,7 +111,7 @@ export class LoginPage implements OnInit {
       },
     );  
 
-  };
+  }; */
 
 
   async Login() {
@@ -129,7 +127,7 @@ export class LoginPage implements OnInit {
       }
       if (await this.authService.login(this.userattempt)) {
         this.loginRocketChat();
-        this.storeUserIdANdToken();
+        //this.storeUserIdANdToken();
 
         this.router.navigate(['/home/events']);
       }

src/app/services/auth.service.ts

@@ -35,7 +35,6 @@ export class AuthService {
 
     async login(user: User): Promise<boolean> {
       user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
-
       //if(!environment.production){
         localStorage.setItem('user', JSON.stringify(user) );
       //}
@@ -52,12 +51,9 @@ export class AuthService {
 
       result = await this.http.get<boolean>(service, options).toPromise();
       response = await this.http.post<any>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
-      /* this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{
-        this.storageService.store(AuthConnstants.USER, res);
-        this.ValidatedUser = user;
-        response = user;
-        console.log(user);
-      }); */
+
+      console.log(response);
+      
   
       if (result)
         {
@@ -86,23 +82,23 @@ export class AuthService {
     }
     //Get user Id | global object
     getUserId(){
-      this.storageService.get(AuthConnstants.USER).then(res=>{
+      /* this.storageService.get(AuthConnstants.USER).then(res=>{
         this.userId$.next(res);
-      });
+      }); */
     }
 
     getProfile(){
-    this.storageService.get(AuthConnstants.PROFILE).then(res=>{
+    /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{
       return res;
-    });
+    }); */
   }
 
     logoutChat(){
       //this.storageService.clear();
-      this.storageService.removeStorageItem(AuthConnstants.AUTH).then(res =>{
+      /* this.storageService.removeStorageItem(AuthConnstants.AUTH).then(res =>{
         this.userData$.next('');
         this.router.navigate(['']);
-      })
+      }) */
 
     }
 }

src/app/services/chat.service.ts

@@ -87,6 +87,7 @@ export class ChatService {
 
     //Load messages from roomId
     getAllDirectMessages(){
+      console.log(this.options);
       return this.http.get(environment.apiChatUrl+'im.list', this.options);
     }
     //Load messages from roomId

src/app/services/database.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DatabaseService } from './database.service';
+
+describe('DatabaseService', () => {
+  let service: DatabaseService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(DatabaseService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/database.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DatabaseService {
+
+  constructor() { }
+}

src/app/services/processes.service.ts

@@ -92,7 +92,7 @@ export class ProcessesService {
     
     let options = { 
       headers: this.headers, 
-      params: params 
+      params: params, 
     };
     return this.http.get<any>(`${geturl}`, options);
   }

src/app/services/storage.service.ts

@@ -1,21 +1,24 @@
 import { Injectable } from '@angular/core';
-import { Plugins } from '@capacitor/core';
-const { Storage } = Plugins;
+import { Storage } from '@ionic/storage';
+/* import { Plugins } from '@capacitor/core';
+const { Storage } = Plugins; */
 @Injectable({
   providedIn: 'root'
   })
   export class StorageService {
-  constructor() {}
+  constructor(private storage:Storage,) {}
 
   // Store the value
-  async store(storageKey: string, value: any) {
-  const encryptedValue = btoa(escape(JSON.stringify(value)));
-  await Storage.set({
-  key: storageKey,
-  value: encryptedValue
-  });
+  async store(key: string, value: any){
+    const encryptedValue = btoa(escape(JSON.stringify(value)));
+    await this.storage.set(key, encryptedValue);
   }
-
+  // Get the value
+  async get(key: string) {
+    const ret = await this.storage.get(key).then((val) => { return val; });
+    return JSON.parse(unescape(atob(ret)));
+  }
+/* 
   // Get the value
   async get(storageKey: string) {
   const ret = await Storage.get({ key: storageKey });
@@ -29,5 +32,5 @@ const { Storage } = Plugins;
   // Clear storage
   async clear() {
   await Storage.clear();
-  }
+  } */
 }