remove spacing from header and add in body of content

This commit is contained in:
tiago.kayaya
2021-12-10 16:08:36 +01:00
parent 7c7341b34b
commit fa0bb3c661
19 changed files with 84 additions and 58 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<ion-content id="timeline-conteiner agenda-container" class="timeline "> <ion-content id="timeline-conteiner agenda-container pt-20" class="timeline ">
<div class="d-flex container-wrapper"> <div class="d-flex container-wrapper">
<div class="calendar-timeline d-flex flex-column height-100 bg-blue"> <div class="calendar-timeline d-flex flex-column height-100 bg-blue">
+1 -1
View File
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content class="height-100"> <ion-content class="height-100 container-wrapper">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content> <ion-refresher-content>
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 pl-20 overflow-hidden"> <div class="main-content d-flex height-100 pl-20 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" > <div class="main-header" >
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header"> <div class="main-header">
@@ -2,7 +2,7 @@
<app-header > </app-header> <app-header > </app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header"> <div class="main-header">
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header"> <div class="main-header">
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content id="main-content" > <ion-content id="main-content" class="container-wrapper">
<div class="main-content d-flex height-100" *ngIf="loadedEvent" > <div class="main-content d-flex height-100" *ngIf="loadedEvent" >
<div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields"> <div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
<div class="header-content width-100 d-flex justify-space-between"> <div class="header-content width-100 d-flex justify-space-between">
@@ -6,7 +6,7 @@
<ion-menu-button></ion-menu-button> <ion-menu-button></ion-menu-button>
</div> </div>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;"> <div class="main-header" style="overflow: unset !important;">
@@ -6,7 +6,7 @@
<ion-menu-button></ion-menu-button> <ion-menu-button></ion-menu-button>
</div> </div>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;"> <div class="main-header" style="overflow: unset !important;">
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content class="height-100"> <ion-content class="height-100 container-wrapper">
<ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden"> <div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task"> <div class="content d-flex flex-column" *ngIf="task">
<div class="main-header "> <div class="main-header ">
@@ -126,6 +126,7 @@ export class PedidosPage implements OnInit {
async LoadList() { async LoadList() {
//Retirar esta chamada posteriormente - Eudes
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(async res => { this.processes.GetTasksList("Pedido de Parecer", false).subscribe(async res => {
this.skeletonLoader = true this.skeletonLoader = true
@@ -136,6 +137,8 @@ export class PedidosPage implements OnInit {
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
console.log(parecerPr);
this.skeletonLoader = false this.skeletonLoader = false
let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active") let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
@@ -145,8 +148,9 @@ export class PedidosPage implements OnInit {
allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => { allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1); const dateMonth = date.getMonth() + 1;
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let month = date.getMonth() + 1;
let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
@@ -183,8 +187,9 @@ export class PedidosPage implements OnInit {
res.forEach(element => { res.forEach(element => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1); //date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let month = date.getMonth() + 1;
let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
@@ -233,8 +238,9 @@ export class PedidosPage implements OnInit {
process.forEach((element) => { process.forEach((element) => {
if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") { if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1); //date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let month = date.getMonth() + 1;
let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
@@ -259,8 +265,9 @@ export class PedidosPage implements OnInit {
process.forEach((element) => { process.forEach((element) => {
if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") { if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1); //date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let month = date.getMonth() + 1;
let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = { let task = {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
@@ -2,7 +2,7 @@
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content class="container-wrapper">
<div class="d-md-none" *ngIf="hideRefreshBtn"> <div class="d-md-none" *ngIf="hideRefreshBtn">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content> <ion-refresher-content>
+2 -2
View File
@@ -9,8 +9,8 @@ export class CustomTaskPipe implements PipeTransform {
transform(fullTask): customTask { transform(fullTask): customTask {
let date = new Date(fullTask.taskStartDate); let date = new Date(fullTask.taskStartDate);
date.setMonth(date.getMonth() + 1); let month = date.getMonth() + 1;
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let taskDate = date.getFullYear() + "-" + month +"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
return { return {
"SerialNumber": fullTask.serialNumber, "SerialNumber": fullTask.serialNumber,
@@ -88,8 +88,9 @@ export class EventListPage implements OnInit {
if(allEvents.length > 0){ if(allEvents.length > 0){
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
} }
this.showLoader = false;
} }
this.showLoader = false;
} }
async openApproveModal(eventSerialNumber, data) { async openApproveModal(eventSerialNumber, data) {
@@ -95,6 +95,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element); let task: customTask = this.customTaskPipe.transform(element);
this.parecerList.push(task); this.parecerList.push(task);
}); });
this.pedidosstore.resetparecer(this.sortService.sortDate(this.parecerList, 'CreateDate')); this.pedidosstore.resetparecer(this.sortService.sortDate(this.parecerList, 'CreateDate'));
+1 -1
View File
@@ -3,7 +3,7 @@
.div-top-header{ .div-top-header{
margin: 0 em(20px); margin: 0 em(20px);
// background-color: #0782c9; // background-color: #0782c9;
padding-top: em(15px); //padding-top: em(15px);
border: 0!important; border: 0!important;
} }
+20 -3
View File
@@ -380,7 +380,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.desktop-search { .desktop-search {
padding-top: 0px !important; padding-top: 0px !important;
margin-top: 80px !important; margin-top: 100px !important;
position: relative !important; position: relative !important;
ion-backdrop { ion-backdrop {
@@ -794,8 +794,26 @@ ion-content {
app-header .header-container{ app-header .header-container{
background: var(--header-container-background) !important; background: var(--header-container-background) !important;
color: var(--headercolor); color: var(--headercolor);
margin-bottom: 20px
} }
app-events .init-event-header,
app-agenda ion-content .container-wrapper,
app-gabinete-digital .container-wrapper,
app-publications .container-wrapper,
app-chat .container-wrapper,
app-pedido .container-wrapper,
app-diploma .container-wrapper,
app-diploma-assinar .container-wrapper,
app-expediente-detail .container-wrapper,
app-expediente-pr .container-wrapper,
app-approve-event .container-wrapper,
app-despacho .container-wrapper,
app-despacho-pr .container-wrapper
{
padding-top: 20px !important;
--padding-top:20px !important;
}
} }
@media only screen and (min-width : 321px) { @media only screen and (min-width : 321px) {
@@ -1373,4 +1391,3 @@ $font-size: 11pt;
} }