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

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-30 17:14:59 +01:00
parent 0379b722cf 71ab74974d
commit f472d5ac0b
43 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/events/edit-event/edit-event.page.html
+1 -1
View File
@@ -66,7 +66,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/events/event-detail-modal/event-detail-modal.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/events/event-detail/event-detail.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/notifications.service.ts
+2
View File
@@ -140,6 +140,7 @@ export class NotificationsService {
this.eventtrigger.publishSomeData({
notification: "recive"
})
}
);
@@ -174,6 +175,7 @@ export class NotificationsService {
console.log(result);
this.storageService.store("Notifications", result)
src/app/services/processes.service.ts
+9
View File
@@ -487,4 +487,13 @@ export class ProcessesService {
return this.http.get<any>(`${geturl}`, options);
}
uploadFiles(file) {
const geturl = environment.apiURL + 'Tasks/AttachDocImage';
let options = {
headers: this.headers,
};
return this.http.post<any>(`${geturl}`,file, options);
}
}
src/app/services/task.service.ts
+3 -3
View File
@@ -311,9 +311,9 @@ export class TaskService {
async loadEventosParaAprovacao() {
this.showLoaderNum++
console.log('PR')
// PR dont have event to approve
if(this.SessionStore.user.Profile != 'PR') {
/* if(this.SessionStore.user.Profile != 'PR') { */
try {
for(let calendar of this.eventService.calendarNamesAry) {
if(calendar == 'Meu calendario') {
@@ -345,7 +345,7 @@ export class TaskService {
} catch (error) {
}
}
/* } */
this.showLoaderNum--