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

develop_bitOut

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-16 17:33:00 +01:00
parent eacd46e34a
commit d51aebe5a1
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+11 -10
View File
@@ -264,10 +264,10 @@
<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.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.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</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.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 </div>
@@ -306,12 +306,13 @@
<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.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.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</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.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 </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>
@@ -350,11 +351,11 @@
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"> <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 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.startMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
<div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div> <div *ngIf=" event.endMany && !event.middle" class="time-end labelb">Fim4</div>
<div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div> <div *ngIf="!event.endMany && !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 {{ event.startMany }} </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>
src/app/pages/agenda/agenda.page.ts
+7 -4
View File
@@ -794,11 +794,12 @@ export class AgendaPage implements OnInit {
// loop // loop
this.CalendarStore.pushEvent(eventsList, 'md'); this.CalendarStore.pushEvent(eventsList, 'md');
this.listToPresent = this.CalendarStore.eventSource this.listToPresent = this.CalendarStore.eventSource
this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
console.log(this.CalendarStore.eventSource)
// console.log('this.TimelineMDList', this.TimelineMDList); console.log('this.TimelineMDList', this.TimelineMDList)
this.myCal.update(); this.myCal.update();
this.myCal.loadEvents(); this.myCal.loadEvents();
@@ -841,10 +842,12 @@ export class AgendaPage implements OnInit {
this.CalendarStore.pushEvent(eventsList, 'pr'); this.CalendarStore.pushEvent(eventsList, 'pr');
this.listToPresent = this.CalendarStore.eventSource this.listToPresent = this.CalendarStore.eventSource
this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
console.log('this.TimelinePRList', this.TimelinePRList)
// //
this.myCal.update(); this.myCal.update();
src/app/services/agenda/list-box.service.ts
+3 -1
View File
@@ -144,9 +144,11 @@ export class ListBoxService {
if(this.CanPush(event, selectedDate)) days[day].push(event) if(this.CanPush(event, selectedDate)) days[day].push(event)
} }
} else {
if(this.CanPush(event, selectedDate) && diffDays != 2) days[day].push(event)
} }
// if(this.CanPush(event, selectedDate) && diffDays != 2) days[day].push(event) //
}) })
src/environments/environment.ts
+2 -2
View File
@@ -11,8 +11,8 @@ export const environment = {
// apiChatUrl: 'https://www.tabularium.pt/api/v1/', // apiChatUrl: 'https://www.tabularium.pt/api/v1/',
production: true, production: true,
domain: 'gabinetedigital.local', domain: 'gabinetedigital.local',
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local
defaultuserpwd: 'tabteste@006', //tabteste@006, defaultuserpwd: 'M@p2022', //tabteste@006,
chatOffline: true, chatOffline: true,
presidencia: false, presidencia: false,
}; };