diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index e4b35646b..f2eb86e87 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -2,7 +2,7 @@
+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index fc8bee16e..022fd0c0b 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -2,7 +2,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
index f70e98814..4f6a6ca7c 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -2,7 +2,7 @@
+
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index 28bbc19a8..beb25cf4c 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -2,7 +2,7 @@
+
+
+
-
-
-
\ No newline at end of file
+
diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts
index 3c75b2ef3..6ebb1169d 100644
--- a/src/app/pipes/custom-task.pipe.ts
+++ b/src/app/pipes/custom-task.pipe.ts
@@ -9,8 +9,8 @@ export class CustomTaskPipe implements PipeTransform {
transform(fullTask): customTask {
let date = new Date(fullTask.taskStartDate);
- 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();
return {
"SerialNumber": fullTask.serialNumber,
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 924755b02..c845496d0 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -88,8 +88,9 @@ export class EventListPage implements OnInit {
if(allEvents.length > 0){
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
+ this.showLoader = false;
}
- this.showLoader = false;
+
}
async openApproveModal(eventSerialNumber, data) {
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 409e85bf9..4f94cd6d0 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -95,6 +95,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element);
this.parecerList.push(task);
+
});
this.pedidosstore.resetparecer(this.sortService.sortDate(this.parecerList, 'CreateDate'));
@@ -114,7 +115,7 @@ export class PedidosPage implements OnInit {
this.deferimentoList.push(task);
});
-
+
this.pedidosstore.resetdeferimento(this.sortService.sortDate(this.deferimentoList, 'CreateDate'));
});
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index 24def0c06..e0114021b 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -3,7 +3,7 @@
.div-top-header{
margin: 0 em(20px);
// background-color: #0782c9;
- padding-top: em(15px);
+ //padding-top: em(15px);
border: 0!important;
}
diff --git a/src/global.scss b/src/global.scss
index 05174772d..1a8e0250a 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -380,7 +380,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.desktop-search {
padding-top: 0px !important;
- margin-top: 80px !important;
+ margin-top: 100px !important;
position: relative !important;
ion-backdrop {
@@ -751,9 +751,9 @@ app-header-no-search .ion-toolbar{
-
-
-
+
+
+
}
@@ -794,8 +794,26 @@ ion-content {
app-header .header-container{
background: var(--header-container-background) !important;
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) {
@@ -1346,7 +1364,7 @@ ngx-mat-datetime-content{
ion-content {
--background:transparent;
-
+
}
}
@@ -1362,15 +1380,14 @@ ngx-mat-datetime-content{
}
}
-
+
$font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
$font-size: 11pt;
ion-row ul > li{
font-family: $font-family;
font-size: $font-size;
-
+
}
-
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index a980387ca..6efae1d10 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -6,7 +6,7 @@
-
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 7e7fcfe71..a829e8d9c 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -6,7 +6,7 @@
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index bcdf3a838..3d76ebbd8 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -2,7 +2,7 @@
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index ed64311d0..9801094f5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -2,7 +2,7 @@
+
-
+
-
+
-
+
@@ -146,8 +146,8 @@
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 0f115b020..c48b45aff 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -126,6 +126,7 @@ export class PedidosPage implements OnInit {
async LoadList() {
+ //Retirar esta chamada posteriormente - Eudes
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(async res => {
this.skeletonLoader = true
@@ -136,6 +137,8 @@ export class PedidosPage implements OnInit {
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+ console.log(parecerPr);
+
this.skeletonLoader = false
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 => {
let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+ const dateMonth = date.getMonth() + 1;
+ let month = date.getMonth() + 1;
+ let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
@@ -165,7 +169,7 @@ export class PedidosPage implements OnInit {
this.addPedidoToDb(this.parecerList);
this.listToPresentparecerList = this.sortService.sortDate(this.parecerList, 'CreateDate')
- this.pedidosstorage.resetparecer(this.listToPresentparecerList);
+ this.pedidosstorage.resetparecer(this.listToPresentparecerList);
}
else if (this.segment == 'deferimento') {
@@ -183,8 +187,9 @@ export class PedidosPage implements OnInit {
res.forEach(element => {
let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+ //date.setMonth(date.getMonth() + 1);
+ let month = date.getMonth() + 1;
+ let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
@@ -233,8 +238,9 @@ export class PedidosPage implements OnInit {
process.forEach((element) => {
if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") {
let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+ //date.setMonth(date.getMonth() + 1);
+ let month = date.getMonth() + 1;
+ let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
@@ -259,8 +265,9 @@ export class PedidosPage implements OnInit {
process.forEach((element) => {
if (JSON.parse(element.workflowInstanceDataFields).Status == "Active") {
let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+ //date.setMonth(date.getMonth() + 1);
+ let month = date.getMonth() + 1;
+ let taskDate = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 9951a3376..151742973 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -2,7 +2,7 @@
+
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index cd8f0035e..d37b6ab0f 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -13,8 +13,8 @@
-
+
@@ -98,7 +98,7 @@
-
-
+
+
-
+
@@ -50,13 +50,13 @@
-
+
+
+
-
+
@@ -182,14 +182,14 @@
-
+
-
+
{{ searchDocument.Assunto}}
{{ searchDocument.appName}}
@@ -205,10 +205,10 @@