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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-09-02 13:19:50 +01:00
parent 3937c0c9c8
commit 1b49c11bb2
5 changed files with 49 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/messages/messages.page.ts
+4 -4
View File
@@ -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();
}
}); */
});
}
}
src/app/pages/publications/publications.module.ts
+2 -1
View File
@@ -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,
src/app/pages/publications/publications.page.html
+22 -48
View File
@@ -39,20 +39,23 @@
<div class="aside overflow-y-auto d-flex flex-wrap width-100">
<!-- <ion-list class="width-100"> -->
<ion-item-sliding disabled="{{showSlidingOptions}}" class="item width-100 cursor-pointer"
<ion-item-sliding disabled="{{showSlidingOptions}}" class="width-100 cursor-pointer"
*ngFor="let viagem of publicationTravelFolderService.list">
<ion-item lines="none"
class="item-hover width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-icon item-hover cursor-pointer">
class="item width-100 d-flex ion-no-border ion-no-margin ion-no-padding"
[class.item-active]="viagem.ProcessId == idSelected"
>
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-icon cursor-pointer">
<ion-icon slot="end" src='assets/images/icons-plane-active.svg'></ion-icon>
</div>
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5">De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}</p>
<p class="item-content-title my-10">{{viagem.Description}}</p>
<p class="item-content-detail my-5">{{viagem.Detail}}</p>
<p class="item-content-date my-5" [class.item-content-date-active]="viagem.ProcessId == idSelected">De {{getDate(viagem.DateBegin)}} a {{getDate(viagem.DateEnd)}}</p>
<p class="item-content-title my-10" [class.item-content-title-active]="viagem.ProcessId == idSelected">{{viagem.Description}}</p>
<p class="item-content-detail my-5" [class.item-content-detail-active]="viagem.ProcessId == idSelected">{{viagem.Detail}}</p>
</div>
<div (click)="openOptions(viagem.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
<div (click)="openOptions(viagem.ProcessId)" class="item-options d-none cursor-pointer" [class.item-options-active]="viagem.ProcessId == idSelected" autoHide="false">
<!-- <ion-icon src="assets/images/icons-menu.svg"></ion-icon> -->
<i class="fas fa-ellipsis-v"></i>
</div>
</ion-item>
<ion-item-options class="members-options" side="end">
@@ -68,38 +71,25 @@
</ion-item-option>
</ion-item-options>
</ion-item-sliding>
<!-- </ion-list> -->
<!-- <div class="item width-100 d-flex"
*ngFor="let viagem of publicationsTravelFolderList">
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-icon cursor-pointer">
<ion-icon slot="end" src='assets/images/icons-plane-active.svg'></ion-icon>
</div>
<div (click)="goToPublicationsList(viagem.ProcessId)" class="item-content flex-grow-1 cursor-pointer">
<p class="item-content-date my-5">De {{viagem.DateBegin}} a {{viagem.DateEnd}}</p>
<p class="item-content-title my-10">{{viagem.Description}}</p>
<p class="item-content-detail my-5">{{viagem.Detail}}</p>
</div>
<div (click)="openOptions(viagem.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div> -->
<ion-item-sliding disabled="{{showSlidingOptions}}" class="item width-100"
*ngFor="let evento of publicationEventFolderStorage.list"
>
<ion-item-sliding disabled="{{showSlidingOptions}}" class="width-100"
*ngFor="let evento of publicationEventFolderStorage.list">
<ion-item lines="none"
class="item-hover width-100 d-flex ion-no-border ion-no-margin ion-no-padding"
class="item cursor-pointer width-100 d-flex ion-no-border ion-no-margin ion-no-padding"
[class.item-active]="evento.ProcessId == idSelected"
(click)="goToPublicationsList(evento.ProcessId)">
<div class="item-icon2">
<ion-icon slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon>
</div>
<div class="item-content item-hover flex-grow-1">
<div class="item-content flex-grow-1">
<ion-label>
<p class="item-content-date">{{getDate(evento.DateBegin)}}</p>
<p class="item-content-title">{{evento.Description}}</p>
<p class="item-content-date" [class.item-content-date-active]="evento.ProcessId == idSelected">{{getDate(evento.DateBegin)}}</p>
<p class="item-content-title" [class.item-content-title-active]="evento.ProcessId == idSelected">{{evento.Description}}</p>
</ion-label>
</div>
<div (click)="openOptions(evento.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
<div (click)="openOptions(evento.ProcessId)" class="item-options d-none cursor-pointer" [class.item-options-active]="evento.ProcessId == idSelected" autoHide="false">
<!-- <ion-icon src="assets/images/icons-menu.svg"></ion-icon> -->
<i class="fas fa-ellipsis-v"></i>
</div>
</ion-item>
<ion-item-options class="members-options" side="end">
@@ -115,22 +105,6 @@
</ion-item-option>
</ion-item-options>
</ion-item-sliding>
<!-- <div class="item width-100 d-flex"
*ngFor="let evento of publicationsEventFolderList"
(click)="viewPublications(evento)">
<div class="item-icon2">
<ion-icon slot="end" src='assets/images/icons-nav-actions.svg'></ion-icon>
</div>
<div class="item-content flex-grow-1">
<ion-label>
<p class="item-content-date">{{evento.DateBegin}}</p>
<p class="item-content-title">{{evento.Description}}</p>
</ion-label>
</div>
<div (click)="openOptions(evento.ProcessId)" class="item-options d-none cursor-pointer" autoHide="false">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div> -->
</div>
</div>
src/app/pages/publications/publications.page.scss
+19 -9
View File
@@ -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{
src/app/pages/publications/publications.page.ts
+2
View File
@@ -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]);