mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
change home layout
This commit is contained in:
@@ -22,12 +22,12 @@
|
||||
</ion-refresher>
|
||||
|
||||
|
||||
<div class="conteiner-box px-20 height-100">
|
||||
<div class="main-content ">
|
||||
<div class="box-container d-flex flex-wrap">
|
||||
<div class="conteiner-box pt-20 px-20 height-100">
|
||||
<div class="main-content height-100">
|
||||
<div class="box-container d-flex ">
|
||||
<div>
|
||||
<p class="time ion-text-left ">{{customDate}}</p>
|
||||
<div class="wrap d-flex">
|
||||
<div class="wrap d-flex float-left">
|
||||
<div class="event-box">
|
||||
<!-- <p>correspondencia com prazo para hoje</p> -->
|
||||
<p>Tarefas que terminam hoje</p>
|
||||
@@ -54,7 +54,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex width-100 schedule-container height-100">
|
||||
<div class="d-flex width-100 schedule-container">
|
||||
<div class="flex-1">
|
||||
|
||||
<div *ngIf="p.userPermission([p.permissionList.Agenda.access])" class="schedule height-100 schedule-1">
|
||||
@@ -178,7 +178,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="conteiner-box conteiner-box-mobile px-20 height-100" ng-swipe-up="swipe($event)">
|
||||
<div class="conteiner-box conteiner-box-mobile pt-20 px-20 height-100" ng-swipe-up="swipe($event)">
|
||||
<div *ngIf="p.userPermission([p.permissionList.Agenda.access])" class="schedule height-100">
|
||||
<ion-progress-bar type="indeterminate" *ngIf="showAgendaLoader"></ion-progress-bar>
|
||||
<div class="schedule-header">
|
||||
|
||||
@@ -527,6 +527,11 @@ ion-toolbar{
|
||||
display: flex !important;
|
||||
}
|
||||
|
||||
|
||||
.box-container {
|
||||
height: unset !important;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -558,9 +563,11 @@ ion-title{
|
||||
|
||||
.box-container {
|
||||
background-color: white;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.box-container {
|
||||
height: 100%;
|
||||
padding: 20px;
|
||||
border-radius: 20px;
|
||||
|
||||
@@ -599,12 +606,15 @@ ion-title{
|
||||
}
|
||||
|
||||
.main-content {
|
||||
flex-direction: column;
|
||||
// flex-direction: column;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.schedule-container {
|
||||
flex-grow: 1;
|
||||
overflow: auto;
|
||||
.schedule {
|
||||
box-shadow: unset !important;
|
||||
border: unset !important;
|
||||
|
||||
@@ -74,6 +74,7 @@ export class AuthService {
|
||||
this.SetSession(response, user)
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
this.httpErroHandle.httpStatusHandle(error)
|
||||
} finally {
|
||||
return response
|
||||
|
||||
@@ -1,11 +1,33 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { momentG } from 'src/plugin/momentG';
|
||||
import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
|
||||
import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
|
||||
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
|
||||
import { DespachoStore } from 'src/app/store/despacho-store.service';
|
||||
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
|
||||
import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
|
||||
import { PendentesStore } from 'src/app/store/pendestes-store.service';
|
||||
import { PedidosStore } from 'src/app/store/pedidos-store.service';
|
||||
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
|
||||
import { TotalDocumentStore } from 'src/app/store/total-document.service';
|
||||
import { DeplomasStore } from 'src/app/store/deplomas.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class TaskDeadlineService {
|
||||
|
||||
AllProcess = []
|
||||
expedientegbstore = ExpedienteGdStore;
|
||||
pendentesstore = PendentesStore;
|
||||
despachoStore = DespachoStore;
|
||||
eventoaprovacaostore = EventoAprovacaoStore;
|
||||
pedidosstore = PedidosStore;
|
||||
despachoprstore = DespachosprStore;
|
||||
totalDocumentStore = TotalDocumentStore
|
||||
deplomasStore = DeplomasStore
|
||||
|
||||
|
||||
constructor() { }
|
||||
|
||||
date(isoDateString:string) {
|
||||
@@ -19,4 +41,20 @@ export class TaskDeadlineService {
|
||||
|
||||
return creationDatePlus24h.getTime() > creationDate.getTime()
|
||||
}
|
||||
|
||||
|
||||
updateAllProcess() {
|
||||
this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any)
|
||||
.concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any)
|
||||
.concat(this.pendentesstore.list as any)).reverse()
|
||||
}
|
||||
|
||||
sortArrayISODate(myArray: any): any[] {
|
||||
// return myArray.sort(function (a, b) {
|
||||
// return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
|
||||
// });
|
||||
|
||||
return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate) - Date.parse(a.CreateDate || a.taskStartDate))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user