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

ITOTEAM-523 notification status

Browse Source
This commit is contained in:
Peter Maquiran
2024-06-27 16:53:45 +01:00
parent 78c13d1bfb
commit 11587cc944
23 changed files with 686 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+34 -9
View File
@@ -249,14 +249,31 @@
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent != true">
<div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
<div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
<div *ngIf="event.startMany" class="time-start labelb">Início</div>
<div *ngIf="event.endMany " class="time-end labelb">Fim</div>
<div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.endMany == false && event.middle == false || event.sameDay" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany == false && event.middle == false && event.eventTotalDuration>=1" class="time-start" style="color:red !important;">{{ event.duration }}</div>
<div *ngIf="event.startMany == false && event.middle == false && event.eventTotalDuration==0 || event.sameDay || event.endMany" class="time-end">
<span *ngIf="event.hasMany == true" >
{{event.event.EndDate | date: 'HH:mm'}}
</span>
<span *ngIf="event.manyDays == false">
{{event.event.EndDate | date: 'HH:mm'}}
</span>
</div>
<div *ngIf="event.startMany == false && event.middle == false && event.eventTotalDuration>=1 && event.endMany == false" class="time-end" style="color:red !important;"> {{ event.duration }} </div>
<div *ngIf="event.middle" class="time-start"> Todo </div>
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
<div *ngIf="event.middle" class="time-start">
<span style="color:red;" *ngIf="event.daysLeft >= 1">
{{ event.duration }}
</span>
</div>
</div>
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent == true">
@@ -264,11 +281,11 @@
<div *ngIf="event.middle" class="time-start">Todo </div>
<div *ngIf="event.middle" class="time-end text-center">o dia</div>
<div *ngIf="!event.middle && !(event.endMany && !event.middle)" class="time-start">Todo </div>
<div *ngIf="!event.middle && !(event.endMany && !event.middle)" class="time-end text-center">o dia </div>
<div *ngIf="!event.middle && !(event.endMany)" class="time-start">Todo </div>
<div *ngIf="!event.middle && !(event.endMany)" class="time-end text-center">o dia </div>
<div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.endMany" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="event.endMany" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
</div>
<div class="schedule-details">
@@ -276,7 +293,15 @@
<p class="m-0">{{event.event.Subject}}</p>
</div>
<div class="location">{{event.event.Location}} <span style="color:red;" *ngIf="event.daysLeft >= 2">{{ event.daysLeft }}</span> <span style="color:red;" *ngIf="event.event.IsAllDayEvent != true && event.endMany && !event.middle">24h</span> </div>
<div class="location">
{{event.event.Location}}
<!-- <span style="color:red;" *ngIf="event.daysLeft >= 1">
{{ event.duration }}
</span>
<span style="color:red;" *ngIf="event.event.IsAllDayEvent != true && event.endMany">
{{ event.duration }} h
</span> -->
</div>
<div class="font-13 calendar-owner"*ngIf="eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId) == 'Meu calendario'">{{SessionStore.user.FullName}} </div>
<ng-template #other_content>{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}</ng-template>
</div>
src/app/pages/agenda/agenda.page.ts
+18
View File
@@ -1254,6 +1254,24 @@ export class AgendaPage implements OnInit {
}
diffHours(date1Str: string, date2Str: string) {
// Convert string dates to Date objects
const date1: any = new Date(date1Str);
const date2: any = new Date(date2Str);
date1.setHours(0, 0, 0, 0); // Set hours, minutes, seconds, and milliseconds to 0
// Calculate the difference in milliseconds
const timeDifferenceMs = date2 - date1;
// Convert difference to hours
const hoursDifference = timeDifferenceMs / (1000 * 60 * 60);
return hoursDifference
}
shoeEventDay(events: any[]) {
if (this.segment == 'Combinado') {