peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-06 09:26:31 +01:00
parent e2c247a52c
commit 8ced295f64
12 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<ion-header>
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar Evento</ion-label>
<ion-label class="title">Editar Evento com divisão</ion-label>
</div>
</div>
</ion-header>
src/app/pages/agenda/view-event/view-event.page.ts
+1 -2
View File
@@ -8,7 +8,6 @@ import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model';
import { EditEventPage } from '../edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EventEditPage } from '../../events/edit-event/edit-event.component';
import { ProcessesService } from 'src/app/services/processes.service';
@Component({
@@ -115,7 +114,7 @@ export class ViewEventPage implements OnInit {
}
const modal = await this.modalController.create({
component: EventEditPage,
component: EditEventPage,
componentProps: {
eventId: this.loadedEvent.EventId,
profile: this.profile,
src/app/pages/events/edit-event/app-edit-event-home.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button defaultHref="{{ backURL }}"></ion-back-button>
</ion-buttons>
<ion-title class="header-title">Visualizar Evento</ion-title>
<ion-title class="header-title">21Visualizar Evento</ion-title>
<ion-buttons slot="end">
<button (click)="deleteConfirm()" class="ion-icon-delete">
<ion-icon name="trash"></ion-icon>
src/app/pages/events/events-routing.module.ts
+34 -33
View File
@@ -1,37 +1,38 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EventsPage } from './events.page';
const routes: Routes = [
{
path: '',
component: EventsPage
},
{
path: 'event-detail',
loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
},
{
path: 'attachments',
loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
},
{
path: 'attendees',
loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule)
},
{
path: 'attendee-modal',
loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule)
},
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { EventsPage } from './events.page';
const routes: Routes = [
{
path: '',
component: EventsPage
},
{
path: 'event-detail',
loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule)
},
{
path: 'attachments',
loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule)
},
{
path: 'attendees',
loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule)
},
{
path: 'attendee-modal',
loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule)
},
{
path: 'event-detail-modal',
loadChildren: () => import('./event-detail-modal/event-detail-modal.module').then( m => m.EventDetailModalPageModule)
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class EventsPageRoutingModule {}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+1 -1
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Emendar1</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+2 -2
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Emendar1</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -93,7 +93,7 @@
</ion-menu-button>
</p>
<p>
<ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</ion-button>
<ion-button class="button-approve" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar1</ion-button>
</p>
</ion-item>
<ion-item hidden>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -1
View File
@@ -163,7 +163,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.closeAllDesktopComponent();
let classs;
if( window.innerWidth <= 1024){
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
src/app/shared/agenda/approve-event/approve-event.component.html
+1 -1
View File
@@ -21,7 +21,7 @@
<ion-list>
<ion-item (click)="approveTask(loadedEvent.serialNumber)">
<ion-icon name="checkmark-sharp"></ion-icon>
<ion-label>Aprovar</ion-label>
<ion-label>Aprovar3</ion-label>
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
src/app/shared/agenda/approve-event/approve-event.component.ts
+7 -3
View File
@@ -71,8 +71,12 @@ export class ApproveEventComponent implements OnInit {
})
}
approveTask(serialNumber:string){
this.approveEventDismiss.emit({
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.modalController.dismiss(serialNumber);
/* this.approveEventDismiss.emit({
"serialNumber": serialNumber,
"action": "Aprovar",
"saveData": {
@@ -80,7 +84,7 @@ export class ApproveEventComponent implements OnInit {
today: this.today,
customDate: this.customDate
}
});
}); */
}
emendTask(serialNumber:string){
src/app/shared/agenda/edit-event/edit-event.component.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="main-header">
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar Evento</ion-label>
<ion-label class="title">2Editar Evento</ion-label>
</div>
</div>
</div>
src/app/shared/agenda/event-list/event-list.component.html
+1 -1
View File
@@ -49,7 +49,7 @@
<ion-item
class=" ion-no-padding width-100"
*ngFor="let event of eventsPRList"
(click)="openApproveModal(event.serialNumber)">
(click)="openApproveModal(event.serialNumber, event)">
<div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+6 -2
View File
@@ -67,7 +67,7 @@ S
}
async openApproveModal(eventSerialNumber){
let classs;
if( window.innerWidth <= 1024){
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
@@ -81,7 +81,11 @@ S
cssClass: classs,
});
await modal.present();
modal.onDidDismiss();
modal.onDidDismiss().then((res) => {
console.log(res['data']);
this.LoadToApproveEvents();
});
}
doRefresh(event) {