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

Merge with developer-c

Browse Source
This commit is contained in:
Eudes Inácio
2021-04-05 14:23:00 +01:00
parent 685321a5db 356732e919
commit a84fdfee68
305 changed files with 16924 additions and 3473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+47 -2
View File
@@ -1,6 +1,8 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { HomeGuard } from '../guards/home.guard';
import { GroupMessagesPage } from '../pages/chat/group-messages/group-messages.page';
import { MessagesPage } from '../pages/chat/messages/messages.page';
import { UserDataResolver } from '../resolvers/userData.resolver';
import { HomePage } from './home.page';
@@ -65,7 +67,15 @@ const routes: Routes = [
{
path:':eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
}
},
{
path: 'eventId/:caller',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
},
{
path: 'edit-event',
loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
},
]
},
{
@@ -150,7 +160,42 @@ const routes: Routes = [
{
path:'',
loadChildren: ()=> import('../pages/chat/chat.module').then(m => m.ChatPageModule)
}
},
{
path:'messages',
children: [
{
path:'',
loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule)
},
{
path:'contacts',
loadChildren: ()=> import('../shared/chat/messages/contacts/contacts.module').then(m => m.ContactsPageModule)
},
{
path:'contacts',
loadChildren: ()=> import('../pages/chat/messages/contacts/contacts.module').then(m => m.ContactsPageModule)
},
]
},
{
path:'group-messages',
children:[
{
path:'',
loadChildren: ()=> import('../pages/chat/group-messages/group-messages.module').then(m => m.GroupMessagesPageModule)
},
{
path:'group-contacts',
loadChildren: ()=> import('../shared/chat/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule)
},
{
path:'group-contacts',
loadChildren: ()=> import('../pages/chat/group-messages/group-contacts/group-contacts.module').then(m => m.GroupContactsPageModule)
},
]
},
]
},
]
src/app/home/home.page.html
+29 -32
View File
@@ -1,33 +1,30 @@
<ion-tabs class="tab">
<ion-tab-bar class="bottoms" slot="bottom">
<ion-tab-button tab="events">
<!-- <ion-icon name="home"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
<ion-badge color="danger">{{totalEvent}}</ion-badge>
<ion-label>Início</ion-label>
</ion-tab-button>
<ion-tab-button tab="agenda">
<!-- <ion-icon name="calendar"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
<ion-label>Agenda</ion-label>
</ion-tab-button>
<ion-tab-button tab="gabinete-digital">
<!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
<ion-badge color="danger">{{totalExpediente}}</ion-badge>
<ion-label>Gabinete</ion-label>
</ion-tab-button>
<ion-tab-button tab="publications">
<ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
<ion-label>Ações</ion-label>
</ion-tab-button>
<ion-tab-button tab="chat">
<ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
<ion-tab-bar class="bottoms" slot="bottom">
<ion-tab-button tab="events">
<!-- <ion-icon name="home"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
<ion-badge color="danger">{{totalEvent}}</ion-badge>
<ion-label>Início</ion-label>
</ion-tab-button>
<ion-tab-button tab="agenda">
<!-- <ion-icon name="calendar"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-calendar.svg"></ion-icon>
<ion-label>Agenda</ion-label>
</ion-tab-button>
<ion-tab-button tab="gabinete-digital">
<!-- <ion-icon name="file-tray-stacked"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-gabinete-inactive.svg"></ion-icon>
<ion-badge color="danger">{{totalExpediente}}</ion-badge>
<ion-label>Gabinete</ion-label>
</ion-tab-button>
<ion-tab-button tab="publications">
<ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
<ion-label>Acções</ion-label>
</ion-tab-button>
<ion-tab-button tab="chat">
<ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
src/app/home/home.page.scss
+10 -2
View File
@@ -1,7 +1,7 @@
ion-tab-bar{
--background: #f9f9f9;
--color: #061b52;
--background: #f9f9f9;
--color: #061b52;
}
// Badge
@@ -33,4 +33,12 @@ ion-badge {/* */
display: flex;
justify-content: space-around;
}
}
@media only screen and (min-width: 1366px) {
ion-tabs.tab .bottoms{
display: none;
}
}
src/app/home/home.page.ts
+22 -23
View File
@@ -2,20 +2,11 @@
///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
import { Component, OnInit, NgZone } from '@angular/core';
import { EventsService } from '../services/events.service';
import { formatDate } from '@angular/common';
import { Event } from '../models/event.model';
import { ProcessesService } from '../services/processes.service';
import { StorageService } from 'src/app/services/storage.service';
import { ModalController } from '@ionic/angular';
import { PublicationDetailPage } from '../../app/pages/publications/view-publications/publication-detail/publication-detail.page';
import { ViewPublicationsPage } from '../../app/pages/publications/view-publications/view-publications.page';
import { ExpedienteDetailPage } from '../../app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'
import { ViewEventPage } from '../../app/pages/agenda/view-event/view-event.page'
import { ApproveEventModalPage } from '../../app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page';
/* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */
import { Router } from '@angular/router';
import { MethodCall } from '@angular/compiler';
/* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */
@@ -33,7 +24,13 @@ export class HomePage implements OnInit {
totalExpediente = 0;
profile: string;
constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController) {
router.events.subscribe((val) => {
document.querySelectorAll('ion-modal').forEach((e)=>e.remove())
});
}
ngOnInit() {
this.mobileFirstTest()
@@ -61,7 +58,8 @@ export class HomePage implements OnInit {
this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
this.totalExpediente = result;
});
/*
PushNotifications.addListener('registrationError', (error: any) => {
alert('Error on registration: ' + JSON.stringify(error));
});
@@ -188,7 +186,7 @@ export class HomePage implements OnInit {
}
async openApproveModal(eventSerialNumber){
/* async openApproveModal(eventSerialNumber){
const modal = await this.modalController.create({
component: ApproveEventModalPage,
componentProps:{
@@ -200,9 +198,9 @@ export class HomePage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
} */
async viewEventDetail(eventId:any) {
/* async viewEventDetail(eventId:any) {
console.log(this.profile);
const modal = await this.modalController.create({
@@ -215,7 +213,7 @@ export class HomePage implements OnInit {
});
await modal.present();
modal.onDidDismiss();
}
} */
/* async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
@@ -256,7 +254,7 @@ export class HomePage implements OnInit {
async viewPublicationDetail(folderId) {
/* async viewPublicationDetail(folderId) {
const modal = await this.modalController.create({
component: PublicationDetailPage,
componentProps: {
@@ -267,15 +265,13 @@ export class HomePage implements OnInit {
});
await modal.present();
modal.onDidDismiss();
}
async viewPublications(folderId) {
} */
/* async viewPublications(folderId) {
const modal = await this.modalController.create({
component: ViewPublicationsPage,
/* enterAnimation,
leaveAnimation, */
enterAnimation,
leaveAnimation,
componentProps: {
item: folderId,
},
@@ -284,6 +280,9 @@ export class HomePage implements OnInit {
});
await modal.present();
modal.onDidDismiss();
}
} */
}