add interveninter button text change and text on agrupadores on inicio module

This commit is contained in:
Eudes Inácio
2023-06-10 10:00:02 +01:00
20 changed files with 73 additions and 56 deletions
@@ -90,7 +90,7 @@
</ion-buttons>
<ion-buttons class="flex-grow-1" slot="end">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Enviar</ion-label>
<ion-label>Adicionar</ion-label>
</button>
</ion-buttons>
</ion-toolbar>
+5 -5
View File
@@ -32,25 +32,25 @@
<div class="wrap d-flex float-left">
<div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
<!-- <p>correspondencia com prazo para hoje</p> -->
<p>Tarefas que terminam hoje</p>
<p>Correspondência com prazo para hoje</p>
<span>{{ TaskService.deadline }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('OverdueTasks')">
<!-- <p>correspondencia em atraso</p> -->
<p>Tarefas em atraso</p>
<p>Correspondência em atraso</p>
<span>{{ TaskService.overdueTasks }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('New')">
<!-- <p>Novas correspondencia</p> -->
<p>Novas tarefas</p>
<p>Novas Correspondência</p>
<span>{{ TaskService.new }}</span>
</div>
<div class="event-box pointer" (click)="goToAllTaskFilter('unread')">
<!-- <p>correspondencia não lidas</p> -->
<p>Tarefas não lidas</p>
<p>Correspondência não lida</p>
<span>{{ TaskService.unread }}</span>
</div>
</div>
@@ -186,7 +186,7 @@
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
<div class="text">A sua Agenda</div>
<div class="text">A sua agenda do dia</div>
</div>
<button title="Ir para a sua Agenda" class="btn-no-color" [routerLink]="['/home/agenda']">
<ion-icon
+2 -2
View File
@@ -577,8 +577,8 @@ ion-title{
}
.event-box {
background-color: #ffb81c2b;
width: 130px;
height: 73px;
width: 150px;
height: 90px;
margin:5px;
flex-direction: column;
display: flex;
@@ -8,7 +8,7 @@
</button>
</div>
<div class="header-title">
<label>Eventos para Aprovação </label>
<label>Eventos para Aprovação</label>
</div>
<div style="float:right" *ngIf="showFilter" class="d-flex align-center">
@@ -156,7 +156,7 @@ export class EventListPage implements OnInit {
this.eventsList = this.eventsList
this.showLoader = false;
this.eventoaprovacaostore.save(segment.OwnerUserId, this.eventsList)
this.eventoaprovacaostore.save(segment, this.eventsList)
}
this.showLoader = false;
@@ -235,6 +235,6 @@
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Enviar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Adicionar</button>
</div>
</ion-footer>
@@ -1,16 +1,16 @@
<!-- {{ NotificationsService.active }} -->
<ion-content class="height-100 container-wrapper">
<!-- <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)" *ngIf="refresh">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher> -->
</ion-refresher>
<div class="main-content d-flex height-100 border-t-radius">
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column width-md-40 flex-grow-1">
<ion-progress-bar type="indeterminate" *ngIf="TaskService.showLoader"></ion-progress-bar>
<div class="title-container">
<div class="title-container" >
<div class="title d-flex justify-center">
<ion-label *ngIf="hideRefreshBtn">Gabinete Digital</ion-label>
<div class="d-flex align-center cursor" *ngIf="!hideRefreshBtn && segmentVista == 'listview' ">
@@ -147,7 +147,7 @@
</div>
<div [ngSwitch]="segmentVista" class="overflow-y-auto">
<div #scroll [ngSwitch]="segmentVista" class="overflow-y-auto">
<!-- This is the list view -->
<div *ngSwitchCase="'listview'">
@@ -258,7 +258,7 @@
</div>
<!-- This is the box view -->
<div *ngSwitchCase="'boxview'" class="aside overflow-y-auto d-flex flex-wrap width-100 height-100">
<div *ngSwitchCase="'boxview'" class="aside d-flex flex-wrap width-100 height-100">
<div *ngIf="TaskService.loadCount" class="center-box">
<!-- List -->
@@ -1,4 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import {NavigationEnd, NavigationExtras, Router } from '@angular/router';
@@ -102,6 +102,11 @@ export class GabineteDigitalPage implements OnInit {
AllProcess = []
ordinance: string = 'old'
refresh = true
@ViewChild('scroll') scroll: ElementRef;
constructor(
private processesbackend: ProcessesService,
private modalController: ModalController,
@@ -191,7 +196,7 @@ export class GabineteDigitalPage implements OnInit {
reorderList(orderBy: string) {
this.changeTab()
this.ordinance = orderBy;
this.dynamicSearch();
@@ -256,9 +261,31 @@ export class GabineteDigitalPage implements OnInit {
});
this.hideRefreshButton();
// console.log(' this.scroll', this.scroll)
// this.scroll.nativeElement.addEventListener("scroll", ()=> {
// console.log('123')
// });
}
ngAfterViewInit(): void {
// We can access the TestComponent now that this portion of the view tree has been initiated.
const element = this.scroll.nativeElement
this.scroll.nativeElement.addEventListener("scroll", (e)=> {
this.changeTab()
});
}
changeTab() {
const element = this.scroll.nativeElement
if(element.scrollTop == 0 ) {
this.refresh = true
} else {
this.refresh = false
}
}
checkFilter() {