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

show all options to event to approve

Browse Source
This commit is contained in:
Peter Maquiran
2024-07-12 10:23:02 +01:00
parent 186324832d
commit da8ac83a5b
9 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+1 -1
View File
@@ -45,7 +45,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { CalendarState, selectEventSource } from 'src/app/services/Repositorys/Agenda/agenda-memory-source.service';
import { Store } from '@ngrx/store';
import { NotificationRepositoryService } from 'src/app/module/notification/data/notification-repository.service';
import { Unsubscribable } from '../../../../android/app/build/intermediates/assets/debug/public/assets/dexie/dist/dexie';
// import { Unsubscribable } from '../../../../android/app/build/intermediates/assets/debug/public/assets/dexie/dist/dexie';
@Component({
selector: 'app-agenda',
templateUrl: './agenda.page.html',
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+4 -6
View File
@@ -8,11 +8,9 @@
</div>
<div class="buttons">
<button *ngIf="activityInstanceName == 'Aprovar evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Enviar para Revisão</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>
<button *ngIf="activityInstanceName != 'Aprovar evento'" class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>
<button class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
<button class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
<button class="btn-cancel" shape="round" (click)="emendarTask()">Enviar para Revisão</button>
<button class="btn-delete" shape="round" (click)="rejeitar()">Eliminar</button>
</div>
</ion-content>
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+2 -2
View File
@@ -150,10 +150,10 @@ export class EventActionsPopoverPage implements OnInit {
let body = { "serialNumber": this.serialNumber, "action": "Descartar" }
const loader = this.toastService.loading();
const result = await this.agendaDataRepository.eventToaprovalStatus(this.serialNumber, 'Declined', '')//.subscribe((value) => {
const result = await this.agendaDataRepository.deleteEvent(this.serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
this.TaskService.loadEventosParaAprovacao()
this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
this.httpErrorHandle.httpsSucessMessagge('delete event')
this.goBack();
} else {
console.log('reject event error: ', result.error)