diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 678d7e141..fdf2150ea 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -257,13 +257,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const roomId = this.roomId - this.chatService.getRoomMessages(roomId).subscribe(res=>{ + /* this.chatService.getRoomMessages(roomId).subscribe(res=>{ console.log(res); - }) + }) */ - /* this.chatService.getRoomMessages(roomId).subscribe(async res => { + this.chatService.getRoomMessages(roomId).subscribe(async res => { if (res == 502) { @@ -297,7 +297,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { //this.loadMessages() await this.serverLongPull(); } - }); */ + }); } } 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 081edd3a9..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" + > +
- -

{{viagem.Description}}

-

{{viagem.Detail}}

+ +

{{viagem.Description}}

+

{{viagem.Detail}}

-
- +
+ +
@@ -68,38 +71,25 @@ - - - + +
-
+
- -

{{evento.Description}}

+ +

{{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 8fc9f6a7d..9c7c8c04b 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -93,7 +93,7 @@ ion-toolbar{ } .aside{ - padding: 0px 20px 0 20px !important; + //padding: 0px 20px 0 20px !important; } } .content{ @@ -105,12 +105,13 @@ ion-toolbar{ } .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; @@ -133,6 +134,7 @@ ion-toolbar{ width: 100%; padding: 15px 0 15px 10px; overflow: auto; + margin-right: 5px; p{ white-space: nowrap; @@ -158,16 +160,24 @@ ion-toolbar{ margin: 0 !important; padding: 0 !important; } - } - - .item-options{ - - width: 25px; - font-size: 20px; + .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-active{ + background-color: #42b9fe !important; + color: #fff !important; + } + .item:hover{ - background-color: #e6f6ff75 !important; + background-color: #e6f6ff75; } ion-item-options{ 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]);