+ class="item item-hover d-flex">
@@ -113,6 +113,7 @@
(showEmptyContainer)="showEmptyContainer()"
(showEmptyContainer)="showEmptyContainer()"
(openNewEventPage)="openNewEventPage($event)"
+ (getDirectMessages)="getDirectMessages($event)"
[style.display]="showMessages ? 'flex' : 'none'"
[roomId]="roomId"
[showMessages]="showMessages" #messagecontainer>
@@ -156,6 +157,7 @@
(openGroupContacts)="openGroupContactsPage($event)"
(openEditGroupPage)="openEditGroupPage($event)"
(openNewEventPage)="openNewEventPage($event)"
+ (getGroups)="getGroups($event)"
[style.display]="showGroupMessages ? 'flex' : 'none'"
class=" height-100 flex-column"
[roomId]="roomId" #messagecontainer>
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 9daa904a6..fba37f381 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -122,6 +122,7 @@ ion-content{
color: #fff;
}
}
+
.item-active{
color: #fff !important;
background-color: #42b9fe !important;
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 5b0b9d7fc..a9117c386 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -374,11 +374,11 @@ hideRefreshButton(){
});
}
- async getDirectMessages(){
+ async getDirectMessages(event?){
this.chatService.getAllDirectMessages().subscribe(async (res:any)=>{
- if(res.ims != 200){
+ if(res != 200){
console.log(res.ims);
this.userDirectMessages = res.ims.sort((a,b)=>{
var dateA = new Date(a._updatedAt).getTime();
@@ -391,12 +391,17 @@ hideRefreshButton(){
console.log("Timer message stop")
}
else {
+ console.log('TIMER');
//Check if modal is opened
if(this.segment == "Contactos" && this.showMessages != true){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve, 2000));
await this.getDirectMessages();
console.log('Timer contactos list running')
}
+ else{
+ console.log('No timer!');
+
+ }
}
}
else{
@@ -452,7 +457,7 @@ hideRefreshButton(){
});
}
- async getGroups(){
+ async getGroups(event?){
this.result = this.chatService.getAllPrivateGroups().subscribe(async (res:any)=>{
if(res.groups != 200){
@@ -474,7 +479,7 @@ hideRefreshButton(){
else {
//Check if modal is opened
if(this.segment == "Grupos" && this.showGroupMessages != true){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve, 2000));
await this.getGroups();
console.log('Timer groups list running')
}
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 7b388bd9e..c40abb91c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, } from '@angular/core';
import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 2b6880152..b0810150b 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1,6 +1,7 @@
import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { map } from 'rxjs/operators';
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
@@ -151,7 +152,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
loadMessages() {
this.showLoader = true;
const roomId = this.roomId
-
+
this.chatService.getRoomMessages(this.roomId).subscribe(res => {
/* console.log(res); */
this.messages = res['messages'].reverse();
@@ -254,8 +255,16 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
async serverLongPull() {
const roomId = this.roomId
+
+ /* this.chatService.getRoomMessages(roomId).subscribe(res=>{
+ console.log(res);
+
+ }) */
+
+
this.chatService.getRoomMessages(roomId).subscribe(async res => {
+
if (res == 502) {
// Connection timeout
// happens when the synchro was pending for too long
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 7ce9f393c..469840e51 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -47,7 +47,7 @@
-
@@ -94,7 +94,7 @@
-
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index 9434c2c5b..7e8af5266 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -81,7 +81,7 @@ ion-toolbar{
margin-right: 5px;
line-height: 25px;
}
-
+
.p-small{
font-size: 13pt;
margin-top: 13px;
@@ -90,7 +90,7 @@ ion-toolbar{
text-align: right;
/* color: #ffffff; */
}
-
+
/* CONTENT */
.item-list-small{
font-size: 14px;
@@ -98,14 +98,14 @@ ion-toolbar{
}
.ion-item-class{
padding: 0;
-
+
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
}
-
+
//DIV
.div-item-Oficial{
width: 100%;
@@ -146,7 +146,7 @@ ion-toolbar{
.div-icon ion-icon{
display: block;
margin: 0 auto;
-
+
}
.div-content-Oficial{
width: 85%;
@@ -312,7 +312,7 @@ ion-toolbar{
color: var(--white);
margin-right: 7px;
}
-
+
.meeting-description {
margin-top: 2px;
font-family: Roboto;
@@ -330,7 +330,6 @@ ion-toolbar{
.schedule {
max-width: 400px;
font-family: Roboto;
- padding: 20px;
background-color: white;
box-shadow: 0 0 10px 0 rgb(0 0 0 / 7%);
border: solid 1px #e9e9e9;
@@ -339,20 +338,25 @@ ion-toolbar{
display: flex;
flex-direction: column;
max-height: 100%;
+ overflow: auto;
+ padding-bottom: 25px;
.schedule-header{
display: flex;
margin-bottom: 20px;
justify-content: space-between;
+ padding: 20px 20px 0px 20px;
+
.title {
display: flex;
align-items: center;
+
.icon{
color: #e8e8e8;
height: 35px;
width: 35px;
margin-right: 10px;
- }
+ }
.text{
font-family: Roboto;
font-size: 20px;
@@ -368,10 +372,15 @@ ion-toolbar{
}
}
.content{
+ //padding: 0px 20px 20px 20px;
+ overflow: auto;
+
.item-exp{
overflow: auto;
- padding-top: 5px;
- padding-bottom: 5px;
+ //padding-top: 5px;
+ //padding-bottom: 5px;
+ padding: 5px 20px 5px 20px;
+ background-color: transparent !important;
}
ion-list{
padding: 0px;
@@ -389,6 +398,8 @@ ion-toolbar{
display: flex;
justify-content: space-between;
align-items: center;
+ --background: transparent !important;
+
.schedule-time{
margin-right: 10px;
.time-start{
@@ -418,7 +429,7 @@ ion-toolbar{
font-size: 13px;
color: black;
width: 100%;
-
+
}
.description{
width: 100%;
@@ -446,7 +457,7 @@ ion-toolbar{
padding-bottom: unset !important;
}
}
-
+
}
.resume{
@@ -484,7 +495,7 @@ ion-toolbar{
.content, .conteiner-box{
height: unset !important;
max-height: unset !important;
- }
+ }
}
@@ -512,4 +523,4 @@ ion-toolbar{
ion-title{
border: 1px solid red;
text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 5dae4bfa1..210a03648 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -39,7 +39,7 @@
@@ -89,7 +89,7 @@
-
+
@@ -98,7 +98,7 @@
{{ totalDocumentStore.count }} Documentos
-
+
@@ -106,7 +106,7 @@
{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos
-
+
-
+
@@ -124,7 +124,7 @@
{{pendentesstore.count}} Documentos
-
+
@@ -133,7 +133,7 @@
{{ despachoprstore.count }} Documentos
-
+
@@ -141,7 +141,7 @@
{{despachoStore.count}} Documentos
-
+
@@ -150,7 +150,7 @@
{{pedidosstore.countparecer}} Documentos
-
-->
-
+
-
+
@@ -193,7 +193,7 @@
{{ deplomasStore.deplomasReviewCount }} Documentos
-
+
@@ -202,7 +202,7 @@
{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 85eb31969..d4fba4516 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -154,9 +154,9 @@ ion-segment-button{
.exp-card-long{
cursor: pointer;
user-select: none;
- background: white;
+ //background: white;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
- background: white;
+ //Sbackground: white;
width: 360px;
margin: 7px 20px;
border-radius: 15px;
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 04e468f91..7e0284329 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -80,8 +80,8 @@ export class LoginPage implements OnInit {
let attempt = await this.authService.login(this.userattempt, {saveSession: false})
if (attempt) {
-
- if (attempt.UserId == SessionStore.user.UserId) {
+
+ if (attempt.UserId == SessionStore.user.UserId) {
await this.authService.SetSession(attempt, this.userattempt);
this.authService.loginChat(this.userattempt);
this.getToken();
@@ -113,7 +113,7 @@ export class LoginPage implements OnInit {
} else {
this.router.navigate(['/home/events']);
}
-
+
}
}
diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts
index 0a65732bf..dbb7e19a7 100644
--- a/src/app/pages/publications/publications.module.ts
+++ b/src/app/pages/publications/publications.module.ts
@@ -14,13 +14,14 @@ import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-a
import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edit-action.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
-
+ FontAwesomeModule,
PublicationsPageRoutingModule,
HeaderPageModule,
ViewPublicationsPageModule,
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 25305ce60..2d76756ae 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -39,20 +39,23 @@
-
+ class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"
+ [class.item-active]="viagem.ProcessId == idSelected"
+ >
-
De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}
-
{{viagem.Description}}
-
{{viagem.Detail}}
+
De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}
+
{{viagem.Description}}
+
{{viagem.Detail}}
-
-
+
+
+
@@ -68,38 +71,25 @@
-
-
-
+
+
- {{getDate(evento.DateBegin)}}
- {{evento.Description}}
+ {{getDate(evento.DateBegin)}}
+ {{evento.Description}}
-
-
+
+
+
@@ -115,22 +105,6 @@
-
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index 1a9c5cd92..9c7c8c04b 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -39,7 +39,7 @@ ion-toolbar{
margin-right: 10px;
}
}
-
+
ion-content{
// --background:#0782c9;
--border: none;
@@ -52,7 +52,7 @@ ion-toolbar{
overflow:hidden;
color:#000;
transform: translate3d(0, 1px, 0);
-
+
.title-content{
margin: 0px auto;
padding: 0 !important;
@@ -93,20 +93,25 @@ ion-toolbar{
}
.aside{
- padding: 0px 20px 0 20px !important;
+ //padding: 0px 20px 0 20px !important;
}
}
.content{
//border: 1px solid red;
}
}
+ ion-item{
+ --background: transparent;
+ }
.item{
width: 100% !important;
- padding: 0px !important;
+ padding: 0px 20px 0 20px !important;
border-bottom: 1px solid #ebebeb;
align-items: center;
justify-content: space-between;
flex-direction: row;
+ background-color: transparent;
+ overflow: auto;
.item-icon{
//margin-top: 28px;
@@ -129,6 +134,7 @@ ion-toolbar{
width: 100%;
padding: 15px 0 15px 10px;
overflow: auto;
+ margin-right: 5px;
p{
white-space: nowrap;
@@ -154,13 +160,24 @@ ion-toolbar{
margin: 0 !important;
padding: 0 !important;
}
+ .item-options{
+ color: #42b9fe;
+ width: 25px;
+ font-size: 20px;
+ }
+ .item-content-date-active, .item-content-title-active, .item-content-detail-active, .item-options-active{
+ color: #fff;
+ }
}
+ }
- .item-options{
+ .item-active{
+ background-color: #42b9fe !important;
+ color: #fff !important;
+ }
- width: 25px;
- font-size: 20px;
- }
+ .item:hover{
+ background-color: #e6f6ff75;
}
ion-item-options{
@@ -207,7 +224,7 @@ ion-toolbar{
margin: 12px;
border: 1px solid #d30a0a;
}
-
+
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 0c85a3de9..799c6f822 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -54,6 +54,7 @@ export class PublicationsPage implements OnInit {
//publication: object;
hideRefreshBtn = true;
showSlidingOptions = true;
+ idSelected: string;
constructor(
private router: Router,
@@ -213,6 +214,7 @@ export class PublicationsPage implements OnInit {
goToPublicationsList(folderId: string){
this.folderId = folderId
+ this.idSelected = folderId;
if( window.innerWidth <= 800){
this.router.navigate(['/home/publications',folderId]);
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 5807597a0..da624457b 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -106,7 +106,7 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
- this.toastService.successMessage('Publicaçao eliminada')
+ this.toastService.successMessage('Publicação eliminada')
} catch (error) {
this.toastService.badRequest('Publicaçao não eliminada')
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 9fa4d51f9..2b88e41e4 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -58,9 +58,9 @@ export class ViewPublicationsPage implements OnInit {
}
this.getPublicationDetail();
- setTimeout(() => {
+ setTimeout(() => {
this.getPublications();
- }, 3000);
+ }, 5000);
}
@@ -108,7 +108,7 @@ export class ViewPublicationsPage implements OnInit {
this.publicationList = new Array();
-
+
res.forEach(element => {
let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 8d21e8119..440a2e978 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -99,7 +99,7 @@ export class ChatService {
let opts = {
headers: this.headers,
- params: params
+ params: params,
}
return this.http.get(environment.apiChatUrl+'im.history', opts);
}
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 348467823..71ac37fc9 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -33,7 +33,7 @@
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 362468177..88f371032 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -41,6 +41,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
@Output() openGroupContacts:EventEmitter
= new EventEmitter();
@Output() openEditGroupPage:EventEmitter = new EventEmitter();
@Output() openNewEventPage:EventEmitter = new EventEmitter();
+ @Output() getGroups:EventEmitter = new EventEmitter();
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -457,8 +458,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
console.log("Timer message stop")
} else {
if(document.querySelector('app-group-messages')){
- await new Promise(resolve => setTimeout(resolve, 5000));
+ await new Promise(resolve => setTimeout(resolve,3000));
await this.serverLongPull();
+ this.getGroups.emit();
console.log('Timer message running')
}
else{
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index d3d9c75a3..b68c228c6 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -37,6 +37,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
@Input() showMessages:string;
@Output() openNewEventPage:EventEmitter = new EventEmitter();
+ @Output() getDirectMessages:EventEmitter = new EventEmitter();
synchro = synchro;
@@ -371,6 +372,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
if(document.querySelector('app-messages')){
await new Promise(resolve => setTimeout(resolve, 5000));
await this.serverLongPull();
+ this.getDirectMessages.emit();
console.log('Timer message running')
}
}
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 45c681abf..c1c5b30a6 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -28,7 +28,7 @@
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
index 0cbc30bb6..b33103830 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
@@ -36,12 +36,12 @@ ion-list{
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border:1px solid #e9e9e9 !important;
- background-color: #fff !important;
+ //background-color: #fff !important;
margin-bottom: 10px !important;
padding: 15px;
.item{
- background-color: var(--white);
+ //background-color: var(--white);
margin: 0 auto;
overflow: hidden;
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 5a42d4af1..36f91d6e7 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -18,18 +18,18 @@
refreshingText="A actualizar...">
-
-
+
+
= 1">
-
-
+
+
-
@@ -60,19 +60,19 @@
-
+
-
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
index 69e7608e5..517d76d7c 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
@@ -40,7 +40,7 @@
}
.ion-item-class{
padding: 0;
-
+
}
.label-text{
width: 100%;
@@ -52,7 +52,7 @@ ion-item{
--background: none;
}
.item {
- background-color: var(--white);
+ //background-color: var(--white);
margin: 0 auto;
overflow: hidden;
}
@@ -86,7 +86,7 @@ ion-item{
.div-icon ion-icon{
display: block;
margin: 0 auto;
-
+
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
@@ -166,7 +166,7 @@ ion-item{
.exp-workflow{
float: left;
margin: 0 !important;
-
+
.label{
border-radius: 15px;
background: #ffb703;
@@ -229,4 +229,4 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 06e93b8cf..056dec629 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -26,7 +26,7 @@
= 1">
@@ -63,7 +63,7 @@
@@ -94,15 +94,15 @@
-
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
index f93c4bd0f..6a305a0f1 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
@@ -25,7 +25,7 @@
}
.ion-item-class{
padding: 0;
-
+
}
.label-text{
width: 100%;
@@ -40,7 +40,7 @@ ion-item{
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//Sborder: solid 1px #e9e9e9;
- background-color: var(--white);
+ //background-color: var(--white);
margin: 0 auto;
//padding: 10px;
overflow: hidden;
@@ -75,7 +75,7 @@ ion-item{
.div-icon ion-icon{
display: block;
margin: 0 auto;
-
+
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
@@ -157,7 +157,7 @@ ion-item{
.exp-workflow{
float: left;
margin: 0 !important;
-
+
.label{
border-radius: 15px;
background: #ffb703;
@@ -220,4 +220,4 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index 8890497cd..c3d4f6f0c 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -32,7 +32,7 @@
@@ -66,7 +66,7 @@
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index b85b72640..8c128bda1 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -9,13 +9,13 @@
-
+
= 1">
@@ -47,15 +47,15 @@
-
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
index 706482f8a..cd1087582 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
@@ -25,7 +25,7 @@
}
.ion-item-class{
padding: 0;
-
+
}
.label-text{
width: 100%;
@@ -75,7 +75,7 @@ ion-item{
.div-icon ion-icon{
display: block;
margin: 0 auto;
-
+
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
@@ -102,7 +102,7 @@ ion-item{
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border:1px solid #e9e9e9 !important;
- background-color: var(--white);
+ //background-color: var(--white);
margin-bottom: 10px !important;
padding: 15px;
}
@@ -156,7 +156,7 @@ ion-item{
.exp-workflow{
float: left;
margin: 0 !important;
-
+
.label{
border-radius: 15px;
background: #ffb703;
@@ -219,4 +219,4 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index 621163895..05473058e 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -17,13 +17,13 @@
refreshingText="A actualizar...">
-
+
=0">
-
@@ -55,15 +55,15 @@
-
Lista vazia
-
+
-
+
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
index 706482f8a..7eabe2f6c 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss
@@ -25,7 +25,7 @@
}
.ion-item-class{
padding: 0;
-
+
}
.label-text{
width: 100%;
@@ -40,7 +40,7 @@ ion-item{
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//Sborder: solid 1px #e9e9e9;
- background-color: var(--white);
+ //background-color: var(--white);
margin: 0 auto;
//padding: 10px;
overflow: auto;
@@ -53,6 +53,7 @@ ion-item{
margin: 10px 0 10px 0;
background: #dae3f3;
border-radius: 20px;
+ border: 1px solid red;
}
.div-content-pendentes{
width: 100%;
@@ -75,7 +76,7 @@ ion-item{
.div-icon ion-icon{
display: block;
margin: 0 auto;
-
+
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
@@ -102,7 +103,7 @@ ion-item{
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border:1px solid #e9e9e9 !important;
- background-color: var(--white);
+ //background-color: transparent;
margin-bottom: 10px !important;
padding: 15px;
}
@@ -156,7 +157,7 @@ ion-item{
.exp-workflow{
float: left;
margin: 0 !important;
-
+
.label{
border-radius: 15px;
background: #ffb703;
@@ -219,4 +220,4 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
index dcda5489b..1358175c1 100644
--- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html
@@ -5,7 +5,7 @@
= 0">
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 1887bb852..97a5a57bb 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -35,7 +35,7 @@
@@ -72,7 +72,7 @@
= 1">
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
index b8fbc29f0..a8b52045f 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
@@ -39,8 +39,8 @@ ion-item{
.item {
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
- //Sborder: solid 1px #e9e9e9;
- background-color: var(--white);
+ //border: solid 1px #e9e9e9;
+ //background-color: var(--white);
margin: 0 auto;
//padding: 10px;
overflow: hidden;
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 2708eed1d..6c0d2b66c 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -1,4 +1,4 @@
-