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

Merge branch 'develop' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/aganda-show-list-box

Browse Source
This commit is contained in:
Peter Maquiran
2022-07-04 19:22:52 +01:00
parent 744883bd6a 2531525cc3
commit bcf83782a2
18 changed files with 1210 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+1
View File
@@ -8,6 +8,7 @@
<div class="buttons">
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
<div class="solid"></div>
<button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
<ion-label>
<p>{{customDate}}</p>
<p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p>
<p *ngIf="loadedEvent.EventRecurrence">
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
src/app/pages/agenda/view-event/view-event.page.ts
+3 -1
View File
@@ -166,7 +166,9 @@ export class ViewEventPage implements OnInit {
window.history.back();
}
else {
this.router.navigate(['/home', params["params"].caller]);
// this.router.navigate(['/home', params["params"].caller]);
this.RouteService.goBack();
}
});
}