@@ -64,6 +62,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
+ (onTimeSelected)="onTimeSelected($event)"
+ (onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
@@ -113,6 +113,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
+ (onTimeSelected)="onTimeSelected($event)"
+ (onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
@@ -163,6 +165,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
+ (onTimeSelected)="onTimeSelected($event)"
+ (onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index de90a30bf..60b2c8470 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -27,6 +27,8 @@ export class AgendaPage implements OnInit {
};
selectedDate: Date;
+ eventSelectedDate: Date;
+ eventSelectedDate2: Date;
rangeStartDate: Date;
rangeEndDate: Date;
@@ -43,6 +45,7 @@ export class AgendaPage implements OnInit {
endTime: Date;
+
constructor(
private alertCtrl: AlertController,
@Inject(LOCALE_ID) private locale: string,
@@ -54,6 +57,8 @@ export class AgendaPage implements OnInit {
ngOnInit() {
//Inicializar segment
+ /* localStorage.setItem('test', this.eventSelectedDate.toString()); */
+
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == "/home/agenda") {
if (this.segment == null)
@@ -68,6 +73,8 @@ export class AgendaPage implements OnInit {
});
}
+
+
//Go to the next view of the calendar month/week/day
next(){
this.myCal.slideNext();
@@ -85,6 +92,15 @@ export class AgendaPage implements OnInit {
this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
}
+ onCurrentChanged = (ev: Date) => {
+ this.eventSelectedDate = ev;
+ };
+
+ 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;
this.rangeEndDate = ev.endTime;
@@ -95,6 +111,10 @@ export class AgendaPage implements OnInit {
async openCalModal() {
const modal = await this.modalCtrl.create({
component: CalModalPage,
+ componentProps:{
+ segment: this.segment,
+ eventSelectedDate: this.eventSelectedDate,
+ },
cssClass: 'cal-modal',
backdropDismiss: false
});
@@ -203,4 +223,6 @@ export class AgendaPage implements OnInit {
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
}
+
+
}
diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html
index ae29f4ead..588ec58c5 100644
--- a/src/app/pages/cal-modal/cal-modal.page.html
+++ b/src/app/pages/cal-modal/cal-modal.page.html
@@ -13,7 +13,7 @@
Assunto
-
+
Descrição
@@ -21,11 +21,11 @@
Localização
-
+
Selecione a Agenda
-
+
Pessoal
Oficial
@@ -40,21 +40,21 @@
- Data Início
- Data Início
+
Data Fim
-
- Intervenientes
+ Participantes
diff --git a/src/app/pages/cal-modal/cal-modal.page.ts b/src/app/pages/cal-modal/cal-modal.page.ts
index 71568bf16..38a4f48b6 100644
--- a/src/app/pages/cal-modal/cal-modal.page.ts
+++ b/src/app/pages/cal-modal/cal-modal.page.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, AfterViewInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
+import { Component, OnInit, AfterViewInit, Input } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
import { Event } from '../../models/event.model';
import { EventsService } from 'src/app/services/events.service';
@@ -9,6 +9,7 @@ import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
import { AttendeeModalPage } from '../events/attendee-modal/attendee-modal.page';
import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service';
+import { moveMessagePortToContext } from 'worker_threads';
@Component({
selector: 'app-cal-modal',
@@ -22,20 +23,84 @@ export class CalModalPage implements OnInit {
currentDate: new Date()
};
- viewTitle: string;
- postEvent: Event;
- modalReady = false;
-
eventAttendees: EventPerson[];
segment:string = "true";
+ selectedSegment: string;
+ selectedDate: Date;
- constructor(private modalCtrl: ModalController, private eventService: EventsService, private alertController:AlertService) {
+ viewTitle: string;
+ postEvent: Event;
+ eventBody: EventBody;
+ modalReady = false;
+
+ minDate: string;
+
+
+
+ @Input() teste: string;
+ passedInfo = null;
+
+ constructor(private modalCtrl: ModalController, private eventService: EventsService, private alertController:AlertService,
+ private navParams: NavParams) {
this.postEvent = new Event();
- this.postEvent.Body = { BodyType : "1", Text : ""};
-
+ this.eventBody = { BodyType : "1", Text : ""};
+ this.postEvent.Body = this.eventBody;
+
}
ngOnInit() {
+ this.selectedSegment = this.navParams.get('segment');
+ this.selectedDate = this.navParams.get('eventSelectedDate');
+
+ let selectedStartdDate = this.selectedDate;
+ let selectedEndDate = new Date(this.selectedDate);
+ /* Set + 30minutes to seleted datetime */
+ selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30)
+
+ this.minDate = this.selectedDate.toString();
+
+ if(this.selectedSegment != "Combinada"){
+ this.postEvent ={
+ EventId: '',
+ Subject: '',
+ Body: this.eventBody,
+ Location: '',
+ CalendarId: '',
+ CalendarName: this.selectedSegment,
+ StartDate: selectedStartdDate,
+ EndDate: new Date(selectedEndDate),
+ EventType: '',
+ Attendees: null,
+ IsMeeting: false,
+ IsRecurring: false,
+ AppointmentState: 0,
+ TimeZone: '',
+ Organizer: '',
+ Categories: null,
+ HasAttachments: false,
+ };
+ }
+ else{
+ this.postEvent ={
+ EventId: '',
+ Subject: '',
+ Body: this.eventBody,
+ Location: '',
+ CalendarId: '',
+ CalendarName: '',
+ StartDate: selectedStartdDate,
+ EndDate: new Date(selectedEndDate),
+ EventType: '',
+ Attendees: null,
+ IsMeeting: false,
+ IsRecurring: false,
+ AppointmentState: 0,
+ TimeZone: '',
+ Organizer: '',
+ Categories: null,
+ HasAttachments: false,
+ };
+ }
}
ngAfterViewInit(): void {
@@ -126,5 +191,8 @@ export class CalModalPage implements OnInit {
}
});
}
+example(){
+ console.log("Mensagem");
+}
}
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index 381618ab1..2e58fbda1 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -1,14 +1,14 @@
- Intervenientes
+ Participantes
- Necessários
+ Intervenientes
- Opcionais
+ Com Conhecimento
@@ -16,14 +16,14 @@
- Adicionar intervenientes
+ Adicionar participantes
- Delete
+ Apagar
diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html
index 1b49ea3dd..d63db75ce 100644
--- a/src/app/pages/events/event-detail/event-detail.page.html
+++ b/src/app/pages/events/event-detail/event-detail.page.html
@@ -93,9 +93,9 @@
Editar
- Intervenientes
+ Participantes
-
+
@@ -104,8 +104,12 @@
+
1">
+
+ Ver mais...
+
+
-
@@ -114,22 +118,37 @@
Anexos
-
-
-
-
-
-
-
-
-
- {{ att.Description }}
- {{ att.CreateDate }}
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ att.Description }}
+ {{ att.CreateDate }}
+
+
+
+
+
1">
+
+ Ver mais...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss
index 239c6d492..542a7d5fb 100644
--- a/src/app/pages/events/event-detail/event-detail.page.scss
+++ b/src/app/pages/events/event-detail/event-detail.page.scss
@@ -88,3 +88,7 @@ ion-card{
.attendees-icon{
font-size: 14px;
}
+.see-more-button{
+ text-transform: initial;
+ font-size: 16px;
+}
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index 2a2201bb5..fa20e5ec6 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -175,11 +175,9 @@ export class EventDetailPage implements OnInit {
}
loadAttachments()
- {
- console.log(this.pageId);
+ {
this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => {
this.loadedEventAttachments = attachments;
- console.log(attachments);
});
}
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index e9a14f772..72bfa3c5d 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -9,11 +9,6 @@
-
-
@@ -26,15 +21,6 @@
-
-
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index f476398ab..2ffeaac85 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -51,64 +51,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index dbbcf6072..32b0879e8 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -3,14 +3,11 @@
Gabinete Digital
-
+
-
-
+
+
+