@@ -307,18 +307,18 @@
>
-
{{event.event.StartDate | date: 'HH:mm'}}
-
--
+
Início
+
{{event.event.StartDate | date: 'HH:mm'}}
-
{{event.event.EndDate | date: 'HH:mm'}}
-
--
+
Fim
+
{{event.event.EndDate | date: 'HH:mm'}}
Todo
o dia
@@ -350,18 +350,18 @@
-
{{event.event.StartDate | date: 'HH:mm'}}
-
--
+
Início
+
{{event.event.StartDate | date: 'HH:mm'}}
-
{{event.event.EndDate | date: 'HH:mm'}}
-
--
+
Fim
+
{{event.event.EndDate | date: 'HH:mm'}}
-
Todo
+
Todo {{ event.startMany }}
o dia
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 4bdc16d28..970c808a1 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -486,12 +486,12 @@ td.monthview-primary-with-event {
margin-right: 10px;
min-width: 33px;
.time-start{
- color: #797979 !important;
+ color: #797979 ;
font-family: Roboto;
font-size: 13px;
}
.time-end{
- color: #797979 !important;
+ color: #797979 ;
font-family: Roboto;
font-size: 13px;
}
@@ -913,4 +913,10 @@ $font-size: 11pt;
background: white !important;
color: black !important;
border-color: #f05d5e !important;
+}
+
+
+.labelb {
+ font-weight: 500;
+ color: red !important;
}
\ No newline at end of file
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 5abf6f7ee..8cfe4296f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -58,7 +58,8 @@
{{customDate}}
- das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
+ das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
+ {{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}}
Diário
Semanal
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 2a1dbfff2..a231701ee 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -326,6 +326,10 @@ export class ViewEventPage implements OnInit {
}
+ toDateString(e) {
+ return new Date(e).toDateString()
+ }
+
async editEventDetail() {
const modal = await this.modalController.create({
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 9dd8bda10..b16b1ef84 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -269,7 +269,7 @@
[selectedDate]="eventSelectedDate"
[eventAttendees]="contacts"
(onAddEvent)="closeNewEventComponentAndOpenChat($event)"
- (openAttendeesComponent)="closeNewEventComponentAndOpenChat($event)"
+ (openAttendeesComponent)="openAttendeesComponent($event)"
(backToChat)="backToChat($event)"
[style.display]="showNewEvent ? 'flex' : 'none'"
class=" height-100 flex-column">
@@ -278,7 +278,7 @@
[adding]="adding"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
- (closeComponent)="closeAttendeesComponent()"
+ (closeComponent)="openNewEventPage()"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
(setContact)="setContact($event)"
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index c1187bb8c..c2ddd9b0a 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -297,15 +297,19 @@ export class ChatPage implements OnInit {
}
}
- openNewEventPage(data: any) {
- this.taskParticipants = data.members.map((val) => {
- return {
- Name: val.name,
- EmailAddress: val.username + "@" + environment.domain,
- IsRequired: "true",
- }
- });
- this.groupRoomId = data.roomId;
+ openNewEventPage(data?) {
+
+ if(data) {
+ this.taskParticipants = data.members.map((val) => {
+ return {
+ Name: val.name,
+ EmailAddress: val.username + "@" + environment.domain,
+ IsRequired: "true",
+ }
+ });
+ this.groupRoomId = data.roomId;
+ }
+
this.closeAllDesktopComponents();
if (window.innerWidth < 701) {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 245be7d27..6e13d2471 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -151,7 +151,7 @@
Todas as tarefas
{{ getAllProcessCount }} Documentos
-
+
@@ -159,7 +159,7 @@
Eventos para Aprovação
{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos
-
+
-
-
-
-
-
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index e694d91e9..981ab189e 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -34,8 +34,6 @@ export class ListBoxService {
list(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all', rangeStartDate, randEndDate, {segment = 'Combinado', selectedDate= null}) {
- //
-
// // filter range
// if(selectedDate) {
// eventSource = eventSource.filter(data =>
@@ -67,35 +65,41 @@ export class ListBoxService {
display(list: CustomCalendarEvent[], profile, selectedDate) {
let days = {};
- list.forEach( (event:CustomCalendarEvent, index)=> {
+ list.forEach( (event:CustomCalendarEvent, index) => {
+
var startDate: any = new Date(event.start);
var endDate: any = this.dateService.EventEndDateTreatment({
- startTime: startDate,
+ startTime: startDate,
endTime: event.end
})
+
+
const day = this.dateService.getDay(event.start)
- event['manyDays'] = false
+ event['manyDays'] = !this.dateService.isSameDate(event.start, event.end)
event['todayOnly'] = this.dateService.isSameDate(event.start, event.end)
+
if(!days.hasOwnProperty(day)) {
days[day] = []
}
+ const diffDays = this.dateService.deferenceBetweenDays(endDate, startDate)
+
if (this.dateService.notSameDate(startDate, endDate)) {
- const diffDays = this.dateService.deferenceBetweenDays(endDate, startDate)
+
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
if (diffDays >= 1) {
- const StartEvent = this.transForm(event, {startMany: true,endMany: false, middle: false, profile})
+ const StartEvent = this.transForm(event, {startMany: true, endMany: false, middle: false, profile})
- if(this.push(event, selectedDate)) days[day].push(StartEvent)
+ if(this.CanPush(event, selectedDate)) days[day].push(StartEvent)
let i = 1;
@@ -120,13 +124,13 @@ export class ListBoxService {
startDate.getDate() != endDate.getDate())) {
// last push
- const EndEvent = this.transForm(event, {startMany: false,endMany: true, middle: false, profile})
- if(this.push(event, selectedDate)) days[otherDays].push(EndEvent)
+ const EndEvent = this.transForm(event, {startMany: false, endMany: true, middle: false, profile})
+ if(this.CanPush(event, selectedDate)) days[otherDays].push(EndEvent)
} else {
- const EndEvent = this.transForm(event, {startMany: false,endMany: true, middle: true, profile})
- if(this.push(event, selectedDate)) days[otherDays].push(EndEvent)
+ const EndEvent = this.transForm(event, {startMany: false,endMany: true, middle: true, profile})
+ if(this.CanPush(event, selectedDate)) days[otherDays].push(EndEvent)
}
}
@@ -134,33 +138,32 @@ export class ListBoxService {
} else {
- if(this.push(event, selectedDate)) days[day].push(event)
+ if(this.CanPush(event, selectedDate)) days[day].push(event)
}
} else {
- if(this.push(event, selectedDate)) days[day].push(event)
+ if(this.CanPush(event, selectedDate)) days[day].push(event)
}
}
- if(this.push(event, selectedDate)) days[day].push(event)
+ // if(this.CanPush(event, selectedDate) && diffDays != 2) days[day].push(event)
})
- // remove days that haven't event
- Object.entries(days).forEach(([index, value]) => {
- const _value: any = value
+ // remove days that haven't event
+ Object.entries(days).forEach(([index, value]) => {
+ const _value: any = value
- if(_value.length == 0) {
- delete days[index]
- }
+ if(_value.length == 0) {
+ delete days[index]
+ }
- })
+ })
return days
}
-
- push(event: any, selectedDate: Date) {
+ CanPush(event: any, selectedDate: Date) {
return new Date(event.start).getMonth() == selectedDate.getMonth() &&
new Date(event.start).getFullYear() == selectedDate.getFullYear() &&
@@ -187,28 +190,26 @@ export class ListBoxService {
return events;
}
-
- transForm(event: CustomCalendarEvent, {startMany, endMany, middle, profile}) {
- return Object.assign({}, {
- start: event.start,
- end: event.end,
- id: event.id,
- profile: profile,
- event: {
- Subject: event.event.Subject,
- StartDate: event.event.StartDate,
- EndDate: event.event.EndDate,
- Location: event.event.Location,
- EventId: event.event.EventId,
- CalendarName: event.event.CalendarName,
- CalendarId: event.event.CalendarId
- },
- Subject: event.event.Subject,
- startMany: false,
- endMany: true,
- middle: true
- })
- }
-
+ transForm(event: CustomCalendarEvent, {startMany, endMany, middle, profile}) {
+ return Object.assign({}, {
+ start: event.start,
+ end: event.end,
+ id: event.id,
+ profile: profile,
+ event: {
+ Subject: event.event.Subject,
+ StartDate: event.event.StartDate,
+ EndDate: event.event.EndDate,
+ Location: event.event.Location,
+ EventId: event.event.EventId,
+ CalendarName: event.event.CalendarName,
+ CalendarId: event.event.CalendarId
+ },
+ Subject: event.event.Subject,
+ startMany: startMany,
+ endMany: endMany,
+ middle: middle
+ })
+ }
}
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index d5c7fb2e3..137f98ba9 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -55,7 +55,7 @@
{{customDate}}
das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
- {{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}}
+ {{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}}
Diário
Semanal
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 445077bd5..6d33819f1 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -15,4 +15,5 @@ export const environment = {
defaultuserpwd: '', //tabteste@006,
chatOffline: true,
presidencia: false,
+ version: '1.0.1'
};