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

make improvements

Browse Source
This commit is contained in:
Tiago Kayaya
2020-11-09 14:00:10 +01:00
parent d3dd83c8a8
commit 247c6e0a51
15 changed files with 217 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+39 -34
View File
@@ -18,46 +18,51 @@
</ion-header>
<ion-content>
<div [ngSwitch]="segment">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div [ngSwitch]="segment">
<ion-list *ngSwitchCase="'MDGPR'">
<div *ngIf="eventsMDGPRList">
<ion-list>
<ion-item-sliding>
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-{{event.workflowInstanceDataFields.Agenda}}">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
<ion-list>
<ion-item-sliding>
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-{{event.workflowInstanceDataFields.Agenda}}">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</div>
</ion-list>
<ion-list *ngSwitchCase="'PR'">
<ion-item-sliding *ngIf="eventsPRList">
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-{{event.workflowInstanceDataFields.Agenda}}">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
<div *ngIf="eventsPRList">
<ion-item-sliding>
<ion-item class="Rectangle" lines="none"
*ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
<div class="content-{{event.workflowInstanceDataFields.Agenda}}">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-item>
</ion-item-sliding>
</div>
</ion-list>
</div>
</ion-content>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+22 -54
View File
@@ -5,6 +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 '../../agenda/approve-event-modal/approve-event-modal.page';
import { NavigationEnd, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -13,6 +14,7 @@ import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-
})
export class EventListPage implements OnInit {
segment:string;
showLoader: boolean;
eventsPRList: any;
eventsMDGPRList: any;
eventPerson: EventPerson;
@@ -24,71 +26,29 @@ export class EventListPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
) { }
ngOnInit() {
this.LoadToApproveEvents();
this.segment = "MDGPR";
this.eventBody = {
BodyType: 'string',
Text: 'string',
}
this.eventPerson = {
EmailAddress: 'tiago.kayaya@hotmail.com',
Name: 'Tiago',
IsRequired: false,
}
this.eventsPRList = [
{
EventId: '1',
Subject: 'Reunião do Conselho de Ministros',
Body: this.eventBody,
Location: 'Luanda',
CalendarId: 'string',
CalendarName: 'Oficial',
StartDate: new Date,
EndDate: new Date,
EventType: 'Reunião',
Attendees: null,
IsMeeting: true,
IsRecurring: false,
AppointmentState: 2,
TimeZone: '',
Organizer: '',
Categories: null,
HasAttachments: false,
},
{
EventId: '1',
Subject: 'Viagem',
Body: this.eventBody,
Location: 'Luanda',
CalendarId: 'string',
CalendarName: 'Pessoal',
StartDate: new Date,
EndDate: new Date,
EventType: 'Reunião',
Attendees: null,
IsMeeting: true,
IsRecurring: false,
AppointmentState: 2,
TimeZone: '',
Organizer: '',
Categories: null,
HasAttachments: false,
},
]
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.LoadToApproveEvents();
}
});
}
LoadToApproveEvents(){
this.showLoader = true;
console.log(this.showLoader);
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
this.showLoader = false;
this.eventsPRList = res;
});
this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.eventsMDGPRList = res;
this.showLoader = false;
this.eventsMDGPRList = res;
});
}
async openApproveModal(eventSerialNumber){
@@ -105,5 +65,13 @@ export class EventListPage implements OnInit {
modal.onDidDismiss();
}
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
event.target.complete();
}, 2000);
}
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ExpedientTaskModalPage } from './expedient-task-modal.page';
const routes: Routes = [
{
path: '',
component: ExpedientTaskModalPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ExpedientTaskModalPageRoutingModule {}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-routing.module';
import { ExpedientTaskModalPage } from './expedient-task-modal.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ExpedientTaskModalPageRoutingModule
],
declarations: [ExpedientTaskModalPage]
})
export class ExpedientTaskModalPageModule {}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+9
View File
@@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>expedient-task-modal</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
View File
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { ExpedientTaskModalPage } from './expedient-task-modal.page';
describe('ExpedientTaskModalPage', () => {
let component: ExpedientTaskModalPage;
let fixture: ComponentFixture<ExpedientTaskModalPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ExpedientTaskModalPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(ExpedientTaskModalPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-expedient-task-modal',
templateUrl: './expedient-task-modal.page.html',
styleUrls: ['./expedient-task-modal.page.scss'],
})
export class ExpedientTaskModalPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts
+5
View File
@@ -11,7 +11,12 @@ const routes: Routes = [
{
path: 'expediente-detail',
loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule)
},
{
path: 'expedient-task-modal',
loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule)
}
];
@NgModule({