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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-22 15:17:35 +01:00
parent 1888fea538
commit 2ccb8638ac
5 changed files with 65 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+27 -4
View File
@@ -102,6 +102,24 @@ const routes: Routes = [
path: 'view-event',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
},
{
path:'event-list',
children: [
{
path:'',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
]
},
{
@@ -144,10 +162,15 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:':serialNumber',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
{
path: 'events-to-approve',
src/app/pages/agenda/agenda.page.ts
+2 -11
View File
@@ -1175,17 +1175,8 @@ export class AgendaPage implements OnInit {
async viewEventsToApprove(){
await this.cloneAllmobileComponent()
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
component: EventListPage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
} else {
// hide all components
this.cloneAllmobileComponent();
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+18 -4
View File
@@ -31,6 +31,7 @@ export class ApproveEventPage implements OnInit {
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
serialNumber:string;
caller:string;
@Input() InstanceId:string;
@Output() approveEventDismiss = new EventEmitter<any>();
@@ -51,27 +52,40 @@ export class ApproveEventPage implements OnInit {
private toastService: ToastService,
) {
this.activatedRoute.queryParams.subscribe(params => {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
if(params["params"].serialNumber) {
this.serialNumber = params["params"].serialNumber;
}
if(params["params"].caller){
this.caller = params["params"].caller;
}
});
/* this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialNumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}); */
}
ngOnInit() {
console.log(this.serialNumber);
console.log(this.caller);
this.getTask();
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
this.router.navigate(['/home',this.caller, 'event-list']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+18 -3
View File
@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -28,6 +28,7 @@ export class EventListPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
private activatedRoute: ActivatedRoute,
) { }
ngOnInit() {
@@ -81,7 +82,16 @@ export class EventListPage implements OnInit {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
if(this.router.url == '/home/agenda/event-list'){
//this.router.navigate(['/home/agenda']);
this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
}
else if(this.router.url == '/home/gabinete-digital/event-list'){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',serialNumber, 'gabinete-digital'])
}
//this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
}
doRefresh() {
@@ -94,7 +104,12 @@ export class EventListPage implements OnInit {
this.modalController.dismiss(null);
}
goBack(){
this.router.navigate(['/home/gabinete-digital']);
if(this.router.url == '/home/agenda/event-list'){
this.router.navigate(['/home/agenda']);
}
else if(this.router.url == '/home/gabinete-digital/event-list'){
this.router.navigate(['/home/gabinete-digital']);
}
}
src/app/shared/agenda/approve-event/approve-event.page.ts
-5
View File
@@ -147,10 +147,6 @@ export class ApproveEventPage implements OnInit {
});
return await popover.present();
}
openMenu() {
this.menu.open();
}
async emendTask(serialNumber:string){
console.log('Desktop');
@@ -228,5 +224,4 @@ export class ApproveEventPage implements OnInit {
}
}