peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +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/modals/delegar/delegar.page.ts
+3
View File
@@ -167,6 +167,7 @@ export class DelegarPage implements OnInit {
modal.onDidDismiss().then((data) => {
if(data) {
this.taskParticipants = []
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
@@ -179,6 +180,7 @@ export class DelegarPage implements OnInit {
await modal.present();
} else {
this.taskParticipants = []
this.showAttendees=true
}
}
@@ -234,6 +236,7 @@ export class DelegarPage implements OnInit {
dynamicSetIntervenient({taskParticipants}){
this.taskParticipants = taskParticipants;
this.showAttendees = false
}
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)
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+4 -6
View File
@@ -106,12 +106,10 @@
<div class="aside-right flex-column height-100">
<div class="aside-buttons" >
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Aprovar</button>
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" >Editar evento</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Enviar para Revisão</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" *ngIf="loadedEvent.activityInstanceName != 'Aprovar Evento'">Editar</button>
<button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" *ngIf="loadedEvent.activityInstanceName != 'Aprovar Evento'">Rejeitar</button>
<button (click)="rejeitar(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Eliminar</button>
</div>
</div>
</div>
@@ -126,7 +124,7 @@
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button hidden class="btn-delete" shape="round" (click)="rejeitar(loadedEvent.serialNumber)">Rejeitar</button>
<button hidden class="btn-delete" shape="round" (click)="rejeitar(loadedEvent.serialNumber)">Eliminar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+2 -3
View File
@@ -146,7 +146,6 @@ export class ApproveEventPage implements OnInit {
const result = await this.AgendaDataRepositoryService.approveEvent(serialNumber)//.subscribe(async (value) => {
if(result.isOk()) {
await this.processes.PostTaskAction(body).toPromise()
this.goBack();
this.httpErrorHandle.httpsSucessMessagge('Evento aprovação')
this.TaskService.loadEventosParaAprovacao();
@@ -221,9 +220,9 @@ export class ApproveEventPage implements OnInit {
const loader = this.toastService.loading()
/* await this.processes.PostTaskAction(body).toPromise(); */
const result = await this.AgendaDataRepositoryService.eventToaprovalStatus(serialNumber, 'Declined', '')//.subscribe((value) => {
const result = await this.AgendaDataRepositoryService.deleteEvent(serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
this.httpErrorHandle.httpsSucessMessagge('Rejeitar')
this.httpErrorHandle.httpsSucessMessagge('delete event')
this.TaskService.loadEventosParaAprovacao();
this.goBack();
} else {
src/app/shared/agenda/approve-event/approve-event.page.html
+8 -6
View File
@@ -116,12 +116,13 @@
</div>
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
<div class="aside-buttons">
<button full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
<button full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Enviar para Revisão</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Eliminar</button>
</div>
</div>
</div>
@@ -131,9 +132,10 @@
<ion-footer *ngIf="loadedEvent" class="display-none-{{showAside}} ion-no-border">
<div class="buttons">
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Enviar para Revisão</button>
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Enviar para Revisão</button>
<button class="btn-cancel" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<!-- <button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button> -->
</div>
</ion-footer>
src/app/shared/agenda/approve-event/approve-event.page.ts
+3 -2
View File
@@ -114,6 +114,7 @@ export class ApproveEventPage implements OnInit {
}
async approveTask(serialNumber: string) {
alert("lll")
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
const loader = this.toastService.loading()
@@ -143,10 +144,10 @@ export class ApproveEventPage implements OnInit {
const loader = this.toastService.loading()
const result = await this.agendaDataRepository.eventToaprovalStatus(serialNumber, 'Declined', "")//.subscribe((value) => {
const result = await this.agendaDataRepository.deleteEvent(serialNumber, true)//.subscribe((value) => {
if(result.isOk()) {
this.httpErroHandle.httpsSucessMessagge('Rejeitar');
this.httpErroHandle.httpsSucessMessagge('delete event');
this.TaskService.loadEventosParaAprovacao();
this.close()