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 branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/chatStorage

Browse Source
This commit is contained in:
Eudes Inácio
2022-01-06 17:32:10 +01:00
parent df76b7538c d22e602f13
commit 08306ef215
14 changed files with 125 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.html
+18 -13
View File
@@ -1,33 +1,38 @@
<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-tab-button tab="events" (click)="selectedTab('/home/events')">
<ion-icon *ngIf="tabButton.home" class="nav-icon" src="assets/icon/tab/icons-nav-home-selected.svg"></ion-icon>
<ion-icon *ngIf="!tabButton.home" class="nav-icon" src="assets/icon/tab/icons-nav-home.svg"></ion-icon>
<!-- <ion-badge color="danger">{{toDayEventStorage.eventsList.length + expedienteGdStore.count}}</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-tab-button tab="agenda" (click)="selectedTab('/home/agenda')">
<ion-icon *ngIf="tabButton.agenda" class="nav-icon" src="assets/icon/tab/icons-nav-agenda-selected.svg"></ion-icon>
<ion-icon *ngIf="!tabButton.agenda" class="nav-icon" src="assets/icon/tab/icons-nav-agenda.svg"></ion-icon>
<ion-label style="margin-bottom: 2px;" class="overflow-visible">Agenda</ion-label>
</ion-tab-button>
<ion-tab-button (click)="goto('/home/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>
<!-- (click)="goto('/home/gabinete-digital')" -->
<ion-tab-button tab="gabinete-digital" (click)="selectedTab('/home/gabinete-digital')">
<ion-icon *ngIf="tabButton.gabinete" class="nav-icon" src="assets/icon/tab/icons-nav-gabinete-selected.svg"></ion-icon>
<ion-icon *ngIf="!tabButton.gabinete" class="nav-icon" src="assets/icon/tab/icons-nav-gabinete.svg"></ion-icon>
<!-- <ion-badge color="danger" *ngIf="!p.userRole(['PR'])" >{{ documentCounterService.mdTotalDocument }}</ion-badge>
<ion-badge color="danger" *ngIf="p.userRole(['PR'])" >{{ documentCounterService.prTotalDocument }}</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-tab-button tab="publications" (click)="selectedTab('/home/publications')">
<ion-icon *ngIf="tabButton.actions" class="nav-icon" src="assets/icon/tab/icons-nav-actions-selected.svg"></ion-icon>
<ion-icon *ngIf="!tabButton.actions" class="nav-icon" src="assets/icon/tab/icons-nav-actions.svg"></ion-icon>
<ion-label style="margin-bottom: 2px;" class="overflow-visible">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-tab-button tab="chat" (click)="selectedTab('/home/chat')">
<ion-icon *ngIf="tabButton.chat" class="nav-icon" src="assets/icon/tab/icons-nav-chat-selected.svg"></ion-icon>
<ion-icon *ngIf="!tabButton.chat" class="nav-icon" src="assets/icon/tab/icons-nav-chat.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button>
</ion-tab-bar>
</ion-tabs>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
src/app/home/home.page.scss
+7 -3
View File
@@ -1,7 +1,11 @@
ion-tab-bar{
--background: #f9f9f9;
--color: #061b52;
--color: #797979;
}
ion-tab-button{
--color-selected: #061b52;
}
// Badge
@@ -18,7 +22,7 @@ ion-badge {/* */
/* display: inline-block;*/
min-width: 18px;
min-width: 18px;
font-size: $badge-font-size;
/* font-weight: $badge-font-weight;
line-height: 1;
@@ -41,4 +45,4 @@ ion-badge {/* */
ion-tabs.tab .bottoms{
display: none;
}
}
}
src/app/home/home.page.ts
+39 -1
View File
@@ -57,6 +57,13 @@ export class HomePage implements OnInit {
showAttendees: false,
showAttendeeModal: false
}
tabButton = {
home: false,
agenda: false,
gabinete: false,
actions: false,
chat: false,
}
eventToaprove: any = {
back: false,
serialNumber: "",
@@ -150,11 +157,42 @@ export class HomePage implements OnInit {
}
myWorker.postMessage('ali'); */
this.clearTabButtonSelection();
}
clearTabButtonSelection(){
this.tabButton.home = false;
this.tabButton.agenda = false;
this.tabButton.gabinete = false;
this.tabButton.actions = false;
this.tabButton.chat = false;
}
selectedTab(url?:string){
this.clearTabButtonSelection();
if(url =='/home/events'){
this.tabButton.home = true;
}
else if(url == '/home/agenda'){
this.tabButton.agenda = true;
}
else if(url =='/home/gabinete-digital'){
this.tabButton.gabinete = true;
}
else if(url =='/home/publications'){
this.tabButton.actions = true;
}
else if(url == '/home/chat'){
this.tabButton.chat = true;
}
else{
this.clearTabButtonSelection();
}
}
logDeviceInfo = async () => {
const info = await Device.getInfo();
console.log('Device info',info);
};
src/app/shared/header/header.page.ts
+19 -1
View File
@@ -99,7 +99,25 @@ export class HeaderPage implements OnInit {
}
locationPathname(): string {
return window.location.pathname
let path = window.location.pathname;
if(path.includes('/home/events')){
return '/home/events';
}
else if(path.includes('/home/agenda')){
return '/home/agenda';
}
else if(path.includes('/home/gabinete-digital')){
return '/home/gabinete-digital';
}
else if(path.includes('/home/publications')){
return '/home/publications';
}
else if(path.includes('/home/chat')){
return '/home/chat';
}
else{
return path;
}
}
async openSearch() {