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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-13 15:19:10 +01:00
parent 89fa3d6ce7 088c1c3c44
commit bfcb3d0776
4 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
-40
View File
@@ -174,46 +174,6 @@
<!-- Timeline -->
<div class="height-100">
<div class="timeline-container height-100 d-flex pt-20 pl-20 pl-20 filter-{{segment}}" >
<!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1 d-md-none">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
[events]="events"
(eventClicked)="clearContact();eventClicked($event)"
>
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="loggeduser.Profile == 'MDGPR'">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
[events]="TimelineMD"
(eventClicked)="clearContact();eventClicked($event)"
>
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md" >
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
[events]="TimelinePR"
(eventClicked)="clearContact();eventClicked($event)"
>
</mwl-calendar-day-view>
</div> -->
<!-- <div class="ss-timeline timeline-mobile flex-grow-1 text-black d-md-none">
<div *ngFor="let events of TimelineMDList | keyvalue; let i = index ">
{{ i }}
<div *ngFor="let event of events">
{{ event.Subject}}
</div>
</div>
</div> -->
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto" >
<div *ngFor="let events of TimelineMDList | keyvalue;" >
src/app/pages/agenda/agenda.page.ts
+5 -4
View File
@@ -452,10 +452,11 @@ export class AgendaPage implements OnInit {
const endMinutes = new Date(endTime).getMinutes()
const endHours = new Date(endTime).getHours()
if (startTimeSamp < endTimeSamp && (endMinutes + endHours) == 0) {
if (startTimeSamp < endTimeSamp && (endMinutes + endHours) == 0) {
endTime = new Date(endTime);
endTime.setSeconds(endTime.getSeconds() - 1);
console.log('new date ======================================================')
return new Date(endTime)
} else {
return new Date(endTime)
@@ -965,8 +966,6 @@ export class AgendaPage implements OnInit {
startTime: startDate,
endTime: event.end
})
// console.log(event.end.toISOString() == endDate.toISOString())
const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0')
@@ -984,6 +983,8 @@ export class AgendaPage implements OnInit {
if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
console.log(new Date(startDate).toLocaleDateString(),'!=' , new Date(endDate).toLocaleDateString())
console.log(startDate.toISOString(),'iso' , endDate.toISOString() )
console.log(new Date(startDate).toLocaleTimeString('pt'),'time' , new Date(endDate).toLocaleTimeString('pt'))
// difference
const diffTime = Math.abs(endDate - startDate);
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
-1
View File
@@ -129,7 +129,6 @@ export class EventActionsPopoverPage implements OnInit {
try {
this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
this
this.goBack();
} catch (error) {
this.toastService.badRequest()