diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 167c3f01f..6045e135c 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -62,7 +62,6 @@ (onEventSelected)="onEventSelected($event)" (onTitleChanged)="onViewTitleChanged($event)" (onRangeChanged)="onRangeChanged($event)" - (onTimeSelected)="onTimeSelected($event)" (onCurrentDateChanged)="onCurrentChanged($event)" queryMode="remote" startHour="6" @@ -113,7 +112,6 @@ (onEventSelected)="onEventSelected($event)" (onTitleChanged)="onViewTitleChanged($event)" (onRangeChanged)="onRangeChanged($event)" - (onTimeSelected)="onTimeSelected($event)" (onCurrentDateChanged)="onCurrentChanged($event)" queryMode="remote" startHour="6" @@ -125,6 +123,7 @@ [monthviewDisplayEventTemplate]="template" > + @@ -165,7 +164,6 @@ (onEventSelected)="onEventSelected($event)" (onTitleChanged)="onViewTitleChanged($event)" (onRangeChanged)="onRangeChanged($event)" - (onTimeSelected)="onTimeSelected($event)" (onCurrentDateChanged)="onCurrentChanged($event)" queryMode="remote" startHour="6" diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 60b2c8470..dbddb6457 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -96,10 +96,10 @@ export class AgendaPage implements OnInit { this.eventSelectedDate = ev; }; - onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { + /* onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0)); this.eventSelectedDate2 = ev.selectedTime; - }; + }; */ onRangeChanged (ev: { startTime: Date, endTime: Date }) { this.rangeStartDate = ev.startTime; diff --git a/src/app/pages/cal-modal/cal-modal.page.ts b/src/app/pages/cal-modal/cal-modal.page.ts index 8e09a8650..a42481611 100644 --- a/src/app/pages/cal-modal/cal-modal.page.ts +++ b/src/app/pages/cal-modal/cal-modal.page.ts @@ -138,7 +138,8 @@ export class CalModalPage implements OnInit { } close(){ - this.modalCtrl.dismiss(this.postEvent); + this.modalCtrl.dismiss(); + /* this.modalCtrl.dismiss(this.postEvent); */ } 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 index ef0e5eff1..72d024021 100644 --- 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 @@ -30,24 +30,8 @@
-
- - - - - -
- - - - - - - - -

@@ -55,15 +39,17 @@

-

- -

- - - + +

+ +

+

+
+
+

@@ -71,25 +57,12 @@

-

- -

- - - - - -

- -

-

- -

-

- -

+ + + +

diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4fb899a73..05a0eecbd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/', domain: 'gabinetedigital.local', - defaultuser: 'tiago.kayaya', + defaultuser: '', defaultuserpwd: 'tabteste@006' };