From 65c4cabcbfc57581a65fab9e7d9ffdbaf11edd52 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Thu, 20 Aug 2020 14:28:50 +0100 Subject: [PATCH] New changes added + AddEvent method partially done --- src/app/home/home-routing.module.ts | 11 +++- src/app/pages/cal-modal/cal-modal.page.html | 23 +++---- src/app/pages/cal-modal/cal-modal.page.ts | 45 +++++++++----- .../gabinete-digital-menu.module.ts | 20 ------- .../gabinete-digital-menu.page.html | 53 ---------------- .../gabinete-digital-menu.page.scss | 29 --------- .../gabinete-digital-menu.page.ts | 19 ------ .../expediente-modal-routing.module.ts} | 6 +- .../expediente-modal.module.ts | 20 +++++++ .../expediente-modal.page.html | 60 +++++++++++++++++++ .../expediente-modal.page.scss | 0 .../expediente-modal.page.spec.ts} | 12 ++-- .../expediente-modal/expediente-modal.page.ts | 46 ++++++++++++++ .../expediente-detail-routing.module.ts | 17 ++++++ .../expediente-detail.module.ts | 20 +++++++ .../expediente-detail.page.html | 40 +++++++++++++ .../expediente-detail.page.scss | 14 +++++ .../expediente-detail.page.spec.ts | 24 ++++++++ .../expediente-detail.page.ts | 15 +++++ .../expediente/expediente-routing.module.ts | 4 ++ .../expediente/expediente.page.html | 14 +---- .../expediente/expediente.page.ts | 47 ++++++++++++++- .../gabinete-digital-routing.module.ts | 4 ++ src/app/services/events.service.ts | 45 ++++++++++++++ 24 files changed, 418 insertions(+), 170 deletions(-) delete mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts delete mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html delete mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss delete mode 100644 src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts rename src/app/pages/{gabinete-digital-menu/gabinete-digital-menu-routing.module.ts => gabinete-digital/expediente-modal/expediente-modal-routing.module.ts} (59%) create mode 100644 src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts create mode 100644 src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html create mode 100644 src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.scss rename src/app/pages/{gabinete-digital-menu/gabinete-digital-menu.page.spec.ts => gabinete-digital/expediente-modal/expediente-modal.page.spec.ts} (55%) create mode 100644 src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail-routing.module.ts create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.spec.ts create mode 100644 src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 1141748ab..559975cff 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -41,7 +41,16 @@ const routes: Routes = [ }, { path:':expedienteId', - loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule) + children: [ + { + path:'', + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule) + }, + { + path:':expediente-detailId', + loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule) + } + ] } ] }, diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html index f333d4dc5..fb2f1209c 100644 --- a/src/app/pages/cal-modal/cal-modal.page.html +++ b/src/app/pages/cal-modal/cal-modal.page.html @@ -13,36 +13,36 @@
Assunto - + Descrição - + Localização - + Intervenientes - + Oficial - + Pessoal - + Selecione o tipo de evento - + Reunião Viagem Conferência @@ -51,13 +51,13 @@ Data Início - Data Fim - @@ -65,14 +65,15 @@ Anexos -
+ Lei do orçamento geral do Estado - + +
diff --git a/src/app/pages/cal-modal/cal-modal.page.ts b/src/app/pages/cal-modal/cal-modal.page.ts index d198fcd8e..964ab7afc 100644 --- a/src/app/pages/cal-modal/cal-modal.page.ts +++ b/src/app/pages/cal-modal/cal-modal.page.ts @@ -1,6 +1,9 @@ import { Component, OnInit, AfterViewInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { Event } from '../../models/event.model'; +import { EventsService } from 'src/app/services/events.service'; + @Component({ selector: 'app-cal-modal', templateUrl: './cal-modal.page.html', @@ -15,22 +18,31 @@ export class CalModalPage implements AfterViewInit { viewTitle: string; - event = { - title: '', - desc: '', - place: '', - people: '', - group: '', - type: '', - frequency: '', - startTime: null, - endTime: null, - allDay: true + 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, }; modalReady = false; - constructor(private modalCtrl: ModalController) { } + constructor(private modalCtrl: ModalController, private eventService: EventsService) { } ngOnInit() { } @@ -42,7 +54,11 @@ export class CalModalPage implements AfterViewInit { } save(){ - this.modalCtrl.dismiss({event: this.event}) + this.modalCtrl.dismiss({postEvent: this.eventService.AddEvent(this.postEvent)}); + /* this.eventService.AddEvent(); */ + console.log("created"); + + } onViewTitleChanged(title){ @@ -50,7 +66,8 @@ export class CalModalPage implements AfterViewInit { } onTimeSelected(ev){ - this.event.startTime = new Date(ev.selectedTime); + /* this.postEvent.startTime = new Date(ev.selectedTime); */ + } close(){ diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts deleted file mode 100644 index f905980ac..000000000 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.module.ts +++ /dev/null @@ -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 { GabineteDigitalMenuPageRoutingModule } from './gabinete-digital-menu-routing.module'; - -import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - GabineteDigitalMenuPageRoutingModule - ], - declarations: [GabineteDigitalMenuPage] -}) -export class GabineteDigitalMenuPageModule {} diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html deleted file mode 100644 index 26d46c0a2..000000000 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.html +++ /dev/null @@ -1,53 +0,0 @@ - - - Gbinete Digital - - - - - - - Expediente - - - Correspondência - 1 - - - Pedidos de parecer - 1 - - - Pedidos de deferimento - 1 - - - - - - - Diplomas - - - Assinados pelo PR - 1 - - - Por validar (MDGPR) - 1 - - - - - - - Despachos Efectuados - - - Presidente da República - 1 - - - - - diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss deleted file mode 100644 index 32e2c25eb..000000000 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.scss +++ /dev/null @@ -1,29 +0,0 @@ -:host{ - ion-card-title{ - text-align: center; - } - - -ion-card{ - background-color: #d4d5ca; -} -ion-item{ - --ion-background-color:#dae3f3; - margin-bottom: 10px; - border-radius: 5px; - } - ion-button{ - color: #000; - --background:none; - --border-color: none; - --box-shadow:none; - } - ion-label{ - padding: 10px; - } -} -.ion-item-change-color{ - --ion-background-color:#fff2cc !important; - margin-bottom: 10px; - border-radius: 5px; -} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts b/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts deleted file mode 100644 index ab2a2ed1d..000000000 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-gabinete-digital-menu', - templateUrl: './gabinete-digital-menu.page.html', - styleUrls: ['./gabinete-digital-menu.page.scss'], -}) -export class GabineteDigitalMenuPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - - load(){ - - } - -} diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts similarity index 59% rename from src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts rename to src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts index daaf35d95..a109fe905 100644 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu-routing.module.ts +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; +import { ExpedienteModalPage } from './expediente-modal.page'; const routes: Routes = [ { path: '', - component: GabineteDigitalMenuPage + component: ExpedienteModalPage } ]; @@ -14,4 +14,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class GabineteDigitalMenuPageRoutingModule {} +export class ExpedienteModalPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts new file mode 100644 index 000000000..281bb0bbf --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ExpedienteModalPageRoutingModule } from './expediente-modal-routing.module'; + +import { ExpedienteModalPage } from './expediente-modal.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ExpedienteModalPageRoutingModule + ], + declarations: [ExpedienteModalPage] +}) +export class ExpedienteModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html new file mode 100644 index 000000000..1db40d94c --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.html @@ -0,0 +1,60 @@ + + + + + + + + Novo Processo + + + + + + + Assunto + + + + Remetentes + + + + + + + + Data + + +
+ + + Anexos + +
+ + + Lei do orçamento geral do Estado + + +
+ + + + + + + Cancelar + + + + {{ viewTitle }} + + + Guardar + + + + + diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.scss b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts similarity index 55% rename from src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts rename to src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts index 269c144fb..399b84a95 100644 --- a/src/app/pages/gabinete-digital-menu/gabinete-digital-menu.page.spec.ts +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { GabineteDigitalMenuPage } from './gabinete-digital-menu.page'; +import { ExpedienteModalPage } from './expediente-modal.page'; -describe('GabineteDigitalMenuPage', () => { - let component: GabineteDigitalMenuPage; - let fixture: ComponentFixture; +describe('ExpedienteModalPage', () => { + let component: ExpedienteModalPage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ GabineteDigitalMenuPage ], + declarations: [ ExpedienteModalPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(GabineteDigitalMenuPage); + fixture = TestBed.createComponent(ExpedienteModalPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts new file mode 100644 index 000000000..d7423ac0a --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts @@ -0,0 +1,46 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; + +@Component({ + selector: 'app-expediente-modal', + templateUrl: './expediente-modal.page.html', + styleUrls: ['./expediente-modal.page.scss'], +}) +export class ExpedienteModalPage implements OnInit { + + viewTitle: string; + + expediente = { + title: '', + desc: '', + }; + + modalReady = false; + + constructor(private modalCtrl: ModalController) { } + + ngOnInit() { + } + + ngAfterViewInit(): void { + setTimeout(()=>{ + this.modalReady = true; + }, 0); + } + + save(){ + this.modalCtrl.dismiss({event: this.expediente}) + } + + onViewTitleChanged(title){ + this.viewTitle = title; + } + + onTimeSelected(ev){ + + } + + close(){ + this.modalCtrl.dismiss(); + } +} diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail-routing.module.ts new file mode 100644 index 000000000..a788f0ef3 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ExpedienteDetailPage } from './expediente-detail.page'; + +const routes: Routes = [ + { + path: '', + component: ExpedienteDetailPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ExpedienteDetailPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts new file mode 100644 index 000000000..9463ce65e --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.module'; + +import { ExpedienteDetailPage } from './expediente-detail.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ExpedienteDetailPageRoutingModule + ], + declarations: [ExpedienteDetailPage] +}) +export class ExpedienteDetailPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html new file mode 100644 index 000000000..418fdda8e --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -0,0 +1,40 @@ + + + + + + Detalhes do Processo + + + + + + + Assunto + + + + Remetentes + + + + + + + + Data + + + + Documentos a Anexar + + + Lei do orçamento geral do Estado + + + +
+ Guardar +
+ + diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss new file mode 100644 index 000000000..1e03c67d9 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -0,0 +1,14 @@ +.event-detail-buttons{ + width: 80%; + margin: 10px auto; +} +.event-detail-buttons ion-button{ + width: 40%; +} +.ion-button-left{ + float: left; + background: none; +} +.ion-button-right{ + float: right; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.spec.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.spec.ts new file mode 100644 index 000000000..d612b3039 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ExpedienteDetailPage } from './expediente-detail.page'; + +describe('ExpedienteDetailPage', () => { + let component: ExpedienteDetailPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExpedienteDetailPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ExpedienteDetailPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts new file mode 100644 index 000000000..5ef391e05 --- /dev/null +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-expediente-detail', + templateUrl: './expediente-detail.page.html', + styleUrls: ['./expediente-detail.page.scss'], +}) +export class ExpedienteDetailPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts index 169b99fb7..0be785b8d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts @@ -7,6 +7,10 @@ const routes: Routes = [ { path: '', component: ExpedientePage + }, + { + path: 'expediente-detail', + loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule) } ]; diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index fa73adb5f..567e89ce1 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -24,7 +24,7 @@
- +

Reunião de Conselho de Ministros

 @@ -50,19 +50,9 @@
- - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index dcbfef3e2..afe89eb23 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,4 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { ModalController } from '@ionic/angular'; +import { ExpedienteModalPage } from '../expediente-modal/expediente-modal.page'; +import { CalendarComponent } from 'ionic2-calendar'; @Component({ selector: 'app-expediente', @@ -9,11 +13,50 @@ export class ExpedientePage implements OnInit { segment:string; - constructor() { } + @ViewChild(CalendarComponent) myCal: CalendarComponent; + + constructor(private router: Router,private modalCtrl: ModalController ) { } ngOnInit() { //Inicializar segment this.segment = "expediente"; } + async openExpedienteModal(){ + const modal = await this.modalCtrl.create({ + component: ExpedienteModalPage, + cssClass: 'expediente-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then((result) => { + if (result.data && result.data.event) { + let event = result.data.event; + if (event.allDay) { + let start = event.startTime; + event.startTime = new Date( + Date.UTC( + start.getUTCFullYear(), + start.getUTCMonth(), + start.getUTCDate() + ) + ); + event.endTime = new Date( + Date.UTC( + start.getUTCFullYear(), + start.getUTCMonth(), + start.getUTCDate() + 1 + ) + ); + } + /* Here you save the data entered */ + /* this.eventSource.push(result.data.event); */ + /* Here you load the data saved */ + /* this.myCal.loadEvents(); */ + } + }); + } } + \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts index d68940e22..69203e5af 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts @@ -10,6 +10,10 @@ const routes: Routes = [ }, { path: 'expediente', loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule) + }, + { + path: 'expediente-modal', + loadChildren: () => import('../../Pages/gabinete-digital/expediente-modal/expediente-modal.module').then( m => m.ExpedienteModalPageModule) } ]; diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 2a3d0d97d..a798f4d2e 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -6,6 +6,7 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; + @Injectable({ providedIn: 'root' }) @@ -69,6 +70,49 @@ export class EventsService { return this.http.get(`${url + ev}`, this.options) } + AddEvent(postEvent: any){ + const url = 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/api/calendar/PostEvent'; + const mydata = JSON.stringify({ + "AppointmentState":1, + "Body":{"BodyType":1,"Text":"Noooooo"}, + "CalendarId":"AAMkAGMwNTJiZDY2LTZjN2MtNDgzYS1hNzAzLTZhZWRhNTk3ZWNiMAAuAAAAAABgX8u97PeNQrYTHXctnZkcAQB4Hy3hTowgSI7Yp8YAVgKKAAACCd9zAAA=", + "EndDate":"8/16/2020 6:00:00 PM", + "EventType":"Single","HasAttachments":false, + "IsMeeting":true,"IsRecurring":false, + "Location":postEvent.Location, + "OptionalAttendees":null, + "Organizer":{"EmailAddress":"paulo.pinto@gabinetedigital.local","Name":"Paulo Pinto"}, + "RequiredAttendees":[{"EmailAddress":"Administrator@gabinetedigital.local","Name":"Administrator"},{"EmailAddress":"tiago.kayaya@gabinetedigital.local","Name":"Tiago Kayaya"}], + "StartDate":"8/14/2020 5:30:00 PM", + "Subject":postEvent.Subject, + "TimeZone":"(UTC+01:00) Centro-Oeste da África"}); + /* const options = { + method: 'post', + url: 'url', + headears: { + 'Authorization': 'Basic Z2FiaW5ldGVkaWdpdGFsLmxvY2FsXHBhdWxvLnBpbnRvOnRhYnRlc3RlQDAwNg==', + 'Content-Type': 'application/json' + }, + data: data + } */ + console.log(postEvent.Subject); + axios({ + method: 'post', + url: url, + data: mydata, + headers: {'Authorization': 'Basic Z2FiaW5ldGVkaWdpdGFsLmxvY2FsXHBhdWxvLnBpbnRvOnRhYnRlc3RlQDAwNg==', + 'Content-Type': 'application/json' } + }) + .then(function (response) { + //handle success + console.log(response); + }) + .catch(function (response) { + //handle error + console.log(response); + }); + } + getStaticEvent(eventId: string){ return { // The find() function looks for an event in a array and return true if found @@ -78,4 +122,5 @@ export class EventsService { }) }; } + }