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

change home layout

Browse Source
This commit is contained in:
Peter Maquiran
2023-04-17 11:50:41 +01:00
parent 578b9a1252
commit 2c18fb4a20
6 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.html
+6 -6
View File
@@ -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">
src/app/pages/events/events.page.scss
+11 -1
View File
@@ -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;
src/app/services/auth.service.ts
+1
View File
@@ -74,6 +74,7 @@ export class AuthService {
this.SetSession(response, user)
}
} catch (error) {
console.log(error)
this.httpErroHandle.httpStatusHandle(error)
} finally {
return response
src/app/services/task-deadline.service.ts
+38
View File
@@ -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))
}
}
src/environments/environment.ts
+2 -1
View File
@@ -1,6 +1,7 @@
import { Environment } from './../app/models/envarioment'
import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
import { DevDev } from './suport/dev'
export const environment: Environment = doneITDev
export const environment: Environment = DevDev
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "f265bebe5",
"SHA": "f265bebe55b87ebc9e78ec786eaba80321305e0c",
"shortSHA": "578b9a125",
"SHA": "578b9a12520ef698f839e1b8b717dabc51fbb719",
"branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Apr 14 17:10:16 2023 +0100'",
"lastCommitMessage": "inicio",
"lastCommitNumber": "4904",
"change": "diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html\nindex 94f00c461..3711f99b2 100644\n--- a/src/app/pages/events/events.page.html\n+++ b/src/app/pages/events/events.page.html\n@@ -22,12 +22,12 @@\n </ion-refresher>\n \n \n- <div class=\"conteiner-box px-20 height-100\">\n- <div class=\"main-content \"> \n- <div class=\"box-container d-flex flex-wrap\">\n+ <div class=\"conteiner-box pt-20 px-20 height-100\">\n+ <div class=\"main-content height-100\"> \n+ <div class=\"box-container d-flex \">\n <div>\n <p class=\"time ion-text-left \">{{customDate}}</p>\n- <div class=\"wrap d-flex\">\n+ <div class=\"wrap d-flex float-left\">\n <div class=\"event-box\">\n <!-- <p>correspondencia com prazo para hoje</p> -->\n <p>Tarefas que terminam hoje</p>\n@@ -54,7 +54,7 @@\n </div>\n </div>\n \n- <div class=\"d-flex width-100 schedule-container height-100\">\n+ <div class=\"d-flex width-100 schedule-container\">\n <div class=\"flex-1\">\n \n <div *ngIf=\"p.userPermission([p.permissionList.Agenda.access])\" class=\"schedule height-100 schedule-1\">\n@@ -178,7 +178,7 @@\n </div>\n \n \n- <div class=\"conteiner-box conteiner-box-mobile px-20 height-100\" ng-swipe-up=\"swipe($event)\">\n+ <div class=\"conteiner-box conteiner-box-mobile pt-20 px-20 height-100\" ng-swipe-up=\"swipe($event)\">\n <div *ngIf=\"p.userPermission([p.permissionList.Agenda.access])\" class=\"schedule height-100\">\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showAgendaLoader\"></ion-progress-bar>\n <div class=\"schedule-header\">\ndiff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss\nindex 6cd61d272..3520d3685 100644\n--- a/src/app/pages/events/events.page.scss\n+++ b/src/app/pages/events/events.page.scss\n@@ -527,6 +527,11 @@ ion-toolbar{\n display: flex !important;\n }\n \n+\n+ .box-container {\n+ height: unset !important;\n+ }\n+\n }\n \n \n@@ -558,9 +563,11 @@ ion-title{\n \n .box-container {\n background-color: white;\n+ flex-direction: column;\n }\n \n .box-container {\n+ height: 100%;\n padding: 20px;\n border-radius: 20px;\n \n@@ -599,12 +606,15 @@ ion-title{\n }\n \n .main-content {\n- flex-direction: column;\n+ // flex-direction: column;\n+ width: 100%;\n }\n \n \n \n .schedule-container {\n+ flex-grow: 1;\n+ overflow: auto;\n .schedule {\n box-shadow: unset !important;\n border: unset !important;\ndiff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts\nindex 9333cfd6d..cfd8511c3 100644\n--- a/src/app/services/auth.service.ts\n+++ b/src/app/services/auth.service.ts\n@@ -74,6 +74,7 @@ export class AuthService {\n this.SetSession(response, user)\n }\n } catch (error) {\n+ console.log(error)\n this.httpErroHandle.httpStatusHandle(error)\n } finally {\n return response\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 2588b107b..16a865ce9 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,6 +1,7 @@\n import { Environment } from './../app/models/envarioment'\n import { oaprDev } from './suport/oapr'\n import { doneITDev } from './suport/doneIt'\n+import { DevDev } from './suport/dev'\n \n \n-export const environment: Environment = doneITDev\n\\ No newline at end of file\n+export const environment: Environment = DevDev\n\\ No newline at end of file",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: src/environments/suport/dev.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/environments/environment.ts",
"lastCommitTime": "'Mon Apr 17 11:42:46 2023 +0100'",
"lastCommitMessage": "add environment",
"lastCommitNumber": "4905",
"change": "",
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/task-deadline.service.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "peter.maquiran"
}