peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with Peter alterations

Browse Source
This commit is contained in:
Eudes Inácio
2022-12-16 15:59:16 +01:00
parent 2a47865c1f b5c34739fc
commit c46be817d9
10 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+16 -16
View File
@@ -264,18 +264,18 @@
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
<div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
<div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.middle" class="time-start"> Todo </div>
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
</div>
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
<div class="time-start">Todo</div>
<div class="time-start">Todo </div>
<div class="time-end text-center">o dia</div>
</div>
<div class="schedule-details">
@@ -307,18 +307,18 @@
>
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
<div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
<div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.middle" class="time-start"> Todo </div>
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
</div>
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
<div class="time-start">Todo</div>
<div class="time-start">Todo </div>
<div class="time-end">o dia</div>
</div>
<div class="schedule-details">
@@ -350,18 +350,18 @@
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)">
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
<div *ngIf="!event.endMany && !event.middle" class="time-star labelbt">Início</div>
<div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
<div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.middle" class="time-start"> Todo </div>
<div *ngIf="event.middle" class="time-start"> Todo {{ event.startMany }} </div>
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
</div>
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
<div class="time-start">Todo</div>
<div class="time-start">Todo </div>
<div class="time-end">o dia</div>
</div>
<div class="schedule-details">
src/app/pages/agenda/agenda.page.scss
+8 -2
View File
@@ -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;
}
src/app/pages/agenda/view-event/view-event.page.html
+2 -1
View File
@@ -58,7 +58,8 @@
<div class="content-details">
<ion-label>
<p>{{customDate}}</p>
<p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p>
<p *ngIf="loadedEvent.EventRecurrence">
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
src/app/pages/agenda/view-event/view-event.page.ts
+4
View File
@@ -326,6 +326,10 @@ export class ViewEventPage implements OnInit {
}
toDateString(e) {
return new Date(e).toDateString()
}
async editEventDetail() {
const modal = await this.modalController.create({
src/app/pages/chat/chat.page.html
+2 -2
View File
@@ -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)"
src/app/pages/chat/chat.page.ts
+13 -9
View File
@@ -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) {
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -8
View File
@@ -151,7 +151,7 @@
<p class="text-center exp-card-title ">Todas as tarefas</p>
<p class="text-center exp-card-content"> {{ getAllProcessCount }} <span class="title1">Documentos</span></p>
</div>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'" class="box-hover exp-card d-flex flex-column">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
@@ -159,7 +159,7 @@
<p class="text-center exp-card-title ">Eventos para Aprovação</p>
<p class="text-center exp-card-content">{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} <span class="title1">Documentos</span></p>
</div>
<div (click)="openExpedientListPage(); selectedElement='Correspondence'" [class.active]="selectedElement == 'Correspondence'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-correspondencia.svg"></ion-icon>
@@ -313,7 +313,6 @@
<div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
<div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
</div>
</ion-item>
<ion-item lines="none"
class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
@@ -333,15 +332,10 @@
<div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
<div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
</div>
</ion-item>
</ion-item-sliding>
</div>
</div>
</div>
</div>
src/app/services/agenda/list-box.service.ts
+48 -47
View File
@@ -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
})
}
}
src/app/shared/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -55,7 +55,7 @@
<ion-label>
<p>{{customDate}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.EndDate | date: 'dd/M/yy'}} </p>
<p *ngIf="loadedEvent.EventRecurrence">
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>