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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-03-30 10:05:12 +01:00
parent 0d5e2c729a
commit 99986f737d
8 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.module.ts
+5
View File
@@ -26,6 +26,7 @@ registerLocaleData(localeDe);
import { CalendarModule, DateAdapter } from 'angular-calendar';
import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
@NgModule({
imports: [
CommonModule,
@@ -50,6 +51,10 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
ApproveEventComponent,
AttendeesPage,
AttendeeModalPage,
EventsToApprovePage,
],
entryComponents: [
EventsToApprovePage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [
src/app/pages/agenda/agenda.page.html
+9 -1
View File
@@ -368,9 +368,17 @@
(approveEventDismiss) = "approveEventDismiss($event)"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
>
</app-event-list>
<!-- <app-events-to-approve
[profile]="profile"
*ngIf="mobileComponent.showEventList"
class="d-flex height-100 flex-column"
(approveEventDismiss) = "approveEventDismiss($event)"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
>
</app-events-to-approve> -->
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -9
View File
@@ -4,16 +4,8 @@
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title">
<label>""Eventos para Aprovação</label>
<label>Eventos para Aprovação</label>
</div>
<!-- <ion-toolbar>
<ion-buttons slot="start">
<ion-back-button (click) ="close()"></ion-back-button>
</ion-buttons>
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
<ion-title>Eventos para Aprovação</ion-title>
</ion-toolbar> -->
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="MDGPR">
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -70,7 +70,7 @@
<!-- Aside right -->
<div class="aside-content d-none flex-column height-100">
<app-empty-container [texto]="emptyTextDescription" *ngIf="showEmptyContainer" class="d-flex height-100 flex-column"></app-empty-container>
<app-events-to-approve [segment]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
<app-events-to-approve [profile]="'MDGPR'" *ngIf="showEventsToApprove" class="d-flex height-100 flex-column"></app-events-to-approve>
<app-expedients (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showExpedients"></app-expedients>
<app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+5 -5
View File
@@ -83,7 +83,7 @@ export class GabineteDigitalPage implements OnInit {
}
ngOnInit() {
//Initialize profile as mdgpr
this.profile = "mdgpr";
this.profile = "MDGPR";
this.LoadCounts();
/* this.eventService.getAllMdEvents.subscribe(res=>{
console.log(res);
@@ -138,17 +138,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openEventsToApprovePage(segment:any){
openEventsToApprovePage(profile:any){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openEventsToApproveList(segment);
this.openEventsToApproveList(profile);
}
else{
this.showEventsToApprove = true;
}
}
async openEventsToApproveList(segment:any){
async openEventsToApproveList(profile:any){
this.closeAllDesktopComponent();
@@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
const modal = await this.modalController.create({
component: EventListPage,
componentProps:{
segment: segment,
segment: profile,
},
cssClass: classs,
backdropDismiss: false
src/app/shared/agenda/event-list/event-list.component.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<div class="header-content">
<div class="header-title">
<label>Eventos para Aprovação</label>
<label>1Eventos para Aprovação</label>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="profile">
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+2 -2
View File
@@ -2,7 +2,7 @@
<div class="title width-100">
<label>Eventos para Aprovação</label>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment [(ngModel)]="profile">
<ion-segment-button value="MDGPR">
Seu calendário
</ion-segment-button>
@@ -17,7 +17,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
<div class="main-content" [ngSwitch]="profile" *ngIf="eventsMDGPRList">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+2 -3
View File
@@ -23,7 +23,7 @@ export class EventsToApprovePage implements OnInit {
categories: string[];
serialnumber:string;
@Input() segment:string;
@Input() profile:string;
constructor(
private processes:ProcessesService,
@@ -35,9 +35,8 @@ S
ngOnInit() {
//this.segment = this.navParams.get('segment');
/* console.log(this.navParams.get('md')); */
console.log(this.segment);
console.log(this.profile);
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {