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

Update for table

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-01 15:45:30 +01:00
parent 80ffcbd5be
commit 61ffaf6db6
16 changed files with 371 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.module.ts
+2 -2
View File
@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
import { SplashScreen } from '@ionic-native/splash-screen/ngx';
// import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { StatusBar } from '@ionic-native/status-bar/ngx';
import { AppRoutingModule } from './app-routing.module';
@@ -48,7 +48,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
],
providers: [
StatusBar,
SplashScreen,
//SplashScreen,
HttpClientModule,
{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
InAppBrowser,
src/app/home/home.page.scss
+4 -3
View File
@@ -1,7 +1,7 @@
ion-tab-bar{
--background: #f9f9f9;
--color: #061b52;
--background: #f9f9f9;
--color: #061b52;
}
// Badge
@@ -37,7 +37,8 @@ ion-badge {/* */
@media only screen and (min-width: 1024px) {
ion-tabs.tab .bottoms{
// display: none;
display: none;
}
}
src/app/home/home.page.ts
-6
View File
@@ -3,12 +3,6 @@ import { EventsService } from '../services/events.service';
import { Event } from '../models/event.model';
import { ProcessesService } from '../services/processes.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';
src/app/pages/agenda/agenda.page.ts
+1 -1
View File
@@ -211,7 +211,7 @@ export class AgendaPage implements OnInit {
onCurrentChanged = (ev: Date) => {
// timeline change date
this.timelineDate = new Date(ev).toLocaleString();
this.timelineDate = momentG(new Date(ev),'dd MMMM yyyy');
this.viewDate = new Date(ev);
// calendar change date
this.eventSelectedDate = new Date(ev);
src/app/shared/header/header.page.html
+60 -18
View File
@@ -1,27 +1,69 @@
<ion-toolbar class="bg-blue">
<ion-grid>
<ion-row class="div-top-header ion-justify-content-between">
<ion-col>
<div (click)="openSearch()" class="div-search">
<ion-toolbar class="bg-blue pb-10">
<div class="mobile d-flex div-top-header justify-space-between">
<div (click)="openSearch()" class="div-search">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
</div>
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile">
<ion-icon *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</div>
<div class="desktop div-top-header">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="d-flex flex-1 pr-20 pl-50">
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/events')">
<ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
<span>Ínicio</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')" >
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="mr-20 d-flex align-center" (click)="changeRoute('/home/gabinete-digital')">
<ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/publications')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Ações</span>
</div>
<div class=" mr-20 d-flex align-center" (click)="changeRoute('/home/chat')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Chat</span>
</div>
</div>
<div class="d-flex">
<div (click)="openSearch()" class="div-search mr-10">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
</div>
</ion-col>
<ion-col>
<div class="div-logo">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
</ion-col>
<ion-col>
<div class="div-profile">
<ion-icon *ngIf="profile == 'mdgpr' " src='assets/images/icons-profile.svg'></ion-icon>
<ion-icon *ngIf="profile == 'pr' " src='assets/images/icons-profile-pr-header.svg'></ion-icon>
</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>
</div>
</ion-toolbar>
src/app/shared/header/header.page.scss
+19 -7
View File
@@ -1,21 +1,19 @@
@import '~src/function.scss';
.div-top-header{
margin: 0 auto;
margin: 0 em(20px);
background-color: #0782c9;
overflow: auto;
padding-top: em(15px);
border: 0!important;
.div-search{
font-size: 45px;
margin: 0 0 0 10px
ion-icon{
font-size: 45px;
}
}
.div-logo{
background: transparent;
width: em(140px);
margin: 0px auto;
margin-top: 5px;
justify-content: center;
display: flex;
}
@@ -25,8 +23,22 @@
}
.div-profile{
font-size: 45px;
margin-right: 10px;
justify-content: flex-end;
display: flex;
}
}
.desktop{
display: none;
}
@media only screen and (min-width: 1024px) {
.mobile{
display: none !important;
}
.desktop{
display: block;
}
}
src/app/shared/header/header.page.ts
+6 -1
View File
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { SearchPage } from 'src/app/pages/search/search.page';
import { Router } from '@angular/router';
@Component({
selector: 'app-header',
@@ -11,7 +12,8 @@ export class HeaderPage implements OnInit {
profile: string = 'mdgpr';
constructor(private modalController: ModalController) {
constructor(private modalController: ModalController,
private router: Router) {
window['header'] = (profile:string) => {
this.profile = profile;
@@ -32,4 +34,7 @@ export class HeaderPage implements OnInit {
return await modal.present();
}
changeRoute(path){
this.router.navigateByUrl(path)
}
}
src/app/shared/headers/header-no-search/header-no-search.page.html
+61 -18
View File
@@ -1,24 +1,67 @@
<ion-toolbar class="bg-blue">
<ion-grid>
<ion-row class="div-top-header ion-justify-content-between">
<ion-col>
<!-- <div (click)="openSearch()" class="div-search">
<ion-toolbar class="bg-blue pb-10">
<div class="mobile d-flex div-top-header justify-space-between">
<div (click)="openSearch()" class="div-search">
<!-- <ion-icon src='assets/images/icons-search.svg'></ion-icon> -->
</div>
<div class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="div-profile">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
</div>
</div>
<div class="desktop div-top-header">
<div class="d-flex justify-space-between align-center">
<div tab="events" class="div-logo height-fit-content">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
<div class="d-flex flex-1 pr-20 pl-50">
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/events')">
<ion-icon class="font-40" src='assets/images/icons-nav-home-active.svg'></ion-icon>
<span>Ínicio</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/agenda')" >
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
<span>Agenda</span>
</div>
<div class="mr-20 div-search d-flex align-center" (click)="changeRoute('/home/gabinete-digital')">
<ion-icon class="font-40" src='assets/images/icons-nav-home-dk.svg'></ion-icon>
<span>Gabinete</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/publications')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Ações</span>
</div>
<div class=" mr-20 div-search d-flex align-center" (click)="changeRoute('/home/chat')">
<ion-icon class="font-40" src='assets/images/icons-nav-a-es-inactive.svg'></ion-icon>
<span>Chat</span>
</div>
</div>
<div class="d-flex">
<!-- <div (click)="openSearch()" class="div-search mr-10">
<ion-icon src='assets/images/icons-search.svg'></ion-icon>
</div> -->
</ion-col>
<ion-col>
<div class="div-logo">
<img src='assets/images/logo-no-bg.png' alt='logo'>
</div>
</ion-col>
<ion-col>
<div (click)="openSearch()" class="div-profile">
<div class="div-profile">
<ion-icon src='assets/images/icons-profile.svg'></ion-icon>
</div>
</ion-col>
</ion-row>
</div>
</div>
</div>
</ion-grid>
</ion-toolbar>
src/app/shared/headers/header-no-search/header-no-search.page.scss
+17 -9
View File
@@ -1,21 +1,15 @@
@import '~src/function.scss';
.div-top-header{
margin: 0 auto;
margin: 0 em(20px);
background-color: #0782c9;
overflow: auto;
padding-top: em(15px);
border: 0!important;
.div-search{
font-size: 45px;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: em(140px);
margin: 0px auto;
margin-top: 5px;
justify-content: center;
display: flex;
}
@@ -25,8 +19,22 @@
}
.div-profile{
font-size: 45px;
margin-right: 10px;
justify-content: flex-end;
display: flex;
}
}
.desktop{
display: none;
}
@media only screen and (min-width: 1024px) {
.mobile{
display: none !important;
}
.desktop{
display: block;
}
}
src/app/shared/headers/header-no-search/header-no-search.page.ts
+7 -1
View File
@@ -3,6 +3,7 @@ import { AnimationController, ModalController } from '@ionic/angular';
import { SearchPage } from 'src/app/pages/search/search.page';
import { MenuController } from '@ionic/angular';
import { ProfileComponent } from './profile/profile.component';
import { Router } from '@angular/router';
@Component({
selector: 'app-header-no-search',
templateUrl: './header-no-search.page.html',
@@ -12,7 +13,8 @@ export class HeaderNoSearchPage implements OnInit {
constructor(private modalController: ModalController,
private menu: MenuController,
private animationController: AnimationController,) { }
private animationController: AnimationController,
private router: Router) { }
ngOnInit() {
}
@@ -53,4 +55,8 @@ export class HeaderNoSearchPage implements OnInit {
});
return await modal.present();
}
changeRoute(path){
this.router.navigateByUrl(path)
}
}