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

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

Browse Source
This commit is contained in:
Hirondino Van-Dunem
2022-12-16 18:57:43 +01:00
parent c042b2d9a4 f33b02d67e
commit 096d017d43
13 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/event-list/event-list.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
Agenda de {{loggeduser.FullName}}
Meu Calendário
</ion-segment-button>
<ion-segment-button value="PR">
Calendário Partilhado
src/app/shared/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -176,7 +176,7 @@
</div>
<div class="container-div width-100">
<!-- <div class="container-div width-100">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -197,7 +197,7 @@
</div>
</div>
</div>
</div> -->
<div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex">
src/app/shared/agenda/new-event/new-event.page.ts
+3
View File
@@ -384,7 +384,10 @@ export class NewEventPage implements OnInit {
this.clearContact.emit();
this.setIntervenient.emit([]);
this.setIntervenientCC.emit([]);
// chat exit
this.backToChat.emit({roomId:this.roomId})
// agenda exit
this.cloneAllmobileComponent.emit({})
}
getRecurrenceTypes() {
src/app/shared/agenda/view-event/view-event.page.ts
+9 -4
View File
@@ -105,8 +105,11 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.getEvent(this.eventId).subscribe(res => {
const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText
this.loadedEvent = res;
// console.log(this.loadedEvent);
this.today = new Date(res.StartDate);
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
}, (error)=> {
@@ -124,13 +127,15 @@ export class ViewEventPage implements OnInit {
});
} else {
if(this.CalendarId) {
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText
this.loadedEvent = res;
this.today = new Date(res.StartDate);
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
}, (error)=> {
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -10,7 +10,7 @@
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR">
Agenda de {{loggeduser.FullName}}
Meu Calendário
</ion-segment-button>
<ion-segment-button value="PR">
Calendário Partilhado