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

save

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-16 18:16:19 +01:00
parent 991e29fc51
commit 6bec3c7f8b
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+13 -13
View File
@@ -264,11 +264,11 @@
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent"> <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início...</div> <div *ngIf="event.startMany && !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.endMany && !event.middle " class="time-end labelb">Fim</div>
<div *ngIf="!event.startMany && !event.middle" 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" class="time-end">{{event.event.EndDate | 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.middle" class="time-start"> Todo </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-end text-center"> o dia </div>
@@ -306,13 +306,12 @@
<div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)" <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
> >
<!-- Shared -->
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent"> <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="event.endMany && !event.middle" class="time-start labelb">Início</div> <div *ngIf="event.startMany && !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.endMany && !event.middle " class="time-end labelb">Fim</div>
<div *ngIf="event.startMany && !event.middle" 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 " class="time-end">{{event.event.EndDate | 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.middle" class="time-start"> Todo </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-end text-center"> o dia </div>
@@ -337,6 +336,7 @@
</div> </div>
</div> </div>
<!-- shared desktop -->
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' " > <div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' " >
<div *ngFor="let events of TimelinePRList | keyvalue;"> <div *ngFor="let events of TimelinePRList | keyvalue;">
@@ -352,12 +352,12 @@
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent"> <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
<div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div> <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
<div *ngIf="!event.startMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div> <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
<div *ngIf=" event.endMany && !event.middle" class="time-end labelb">Fim4</div> <div *ngIf="!(event.endMany && !event.middle) && !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.startMany && !event.middle) && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
<div *ngIf="event.middle" class="time-start"> Todo {{ event.startMany }} </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-end text-center"> o dia </div>
</div> </div>
src/app/pages/agenda/agenda.page.scss
+3 -3
View File
@@ -486,12 +486,12 @@ td.monthview-primary-with-event {
margin-right: 10px; margin-right: 10px;
min-width: 33px; min-width: 33px;
.time-start{ .time-start{
color: #797979 ; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: 13px;
} }
.time-end{ .time-end{
color: #797979 ; color: #797979 !important;
font-family: Roboto; font-family: Roboto;
font-size: 13px; font-size: 13px;
} }
@@ -916,7 +916,7 @@ $font-size: 11pt;
} }
.labelb { .labelb {
font-weight: 500; font-weight: 500;
color: red !important;
} }
src/app/pages/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -171,7 +171,7 @@
</div> </div>
</div> </div>
<div class="container-div width-100"> <!-- <div class="container-div width-100">
<div class="ion-item-class-2 d-flex"> <div class="ion-item-class-2 d-flex">
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -192,7 +192,7 @@
</div> </div>
</div> </div>
</div> </div> -->
<div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100"> <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex"> <div class="ion-item-class-2 d-flex">
src/app/shared/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -176,7 +176,7 @@
</div> </div>
<div class="container-div width-100"> <!-- <div class="container-div width-100">
<div class="ion-item-class-2 d-flex"> <div class="ion-item-class-2 d-flex">
<div class="ion-icon-class"> <div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -197,7 +197,7 @@
</div> </div>
</div> </div>
</div> </div> -->
<div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100"> <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex"> <div class="ion-item-class-2 d-flex">
src/app/shared/agenda/new-event/new-event.page.ts
+3
View File
@@ -376,7 +376,10 @@ export class NewEventPage implements OnInit {
this.clearContact.emit(); this.clearContact.emit();
this.setIntervenient.emit([]); this.setIntervenient.emit([]);
this.setIntervenientCC.emit([]); this.setIntervenientCC.emit([]);
// chat exit
this.backToChat.emit({roomId:this.roomId}) this.backToChat.emit({roomId:this.roomId})
// agenda exit
this.cloneAllmobileComponent.emit({})
} }
getRecurrenceTypes() { getRecurrenceTypes() {