check notification and inactivity

This commit is contained in:
Peter Maquiran
2023-09-28 09:02:15 +01:00
parent b46d179dfe
commit 8de8a35bfc
11 changed files with 93 additions and 60 deletions
+14 -14
View File
@@ -94,7 +94,7 @@ export class LoginPage implements OnInit {
buttons: ['OK']
});
await alert.present();
}
@@ -121,12 +121,10 @@ export class LoginPage implements OnInit {
let attempt = await this.authService.login(this.userattempt, {saveSession: false})
const data = await this.authService.loginContenteProduction(this.userattempt, {saveSession: true})
loader.remove()
console.log('attempt', attempt)
if (attempt) {
if (attempt.UserId == SessionStore.user.UserId) {
@@ -135,23 +133,24 @@ export class LoginPage implements OnInit {
this.changeProfileService.run();
if(attempt.ChatData) {
await this.authService.loginToChatWs();
this.ChatService.setheader()
this.ChatSystemService.loadChat();
}
this.changeProfileService.runLogin();
this.getToken();
SessionStore.setInativity(true);
SessionStore.hasPassLogin = true;
this.goback();
} else {
this.RochetChatConnectorService.logout();
this.clearStoreService.clear();
this.ChatSystemService.clearChat();
@@ -165,9 +164,9 @@ export class LoginPage implements OnInit {
await this.authService.SetSession(attempt, this.userattempt);
CPSession.save(data)
this.changeProfileService.run();
if(attempt.ChatData) {
await this.authService.loginToChatWs();
this.ChatService.setheader();
@@ -182,14 +181,15 @@ export class LoginPage implements OnInit {
} else {
this.router.navigateByUrl('/pin', { replaceUrl: true });
}
} else {
this.router.navigate(['/home/events']);
}
SessionStore.hasPassLogin = true;
}
}/*
}/*
else{
this.toastService._badRequest('Ocorreu um problema por favor valide o username e password');
} */
@@ -9,7 +9,7 @@ import { ViewPublicationsPageRoutingModule } from './view-publications-routing.m
import { ViewPublicationsPage } from './view-publications.page';
import { Attributes, IntersectionObserverHooks, LazyLoadImageModule, LAZYLOAD_IMAGE_HOOKS } from 'ng-lazyload-image';
import { ShowMorePageModule } from 'src/app/shared/publication/view-publications/show-more/show-more.module'
export class LazyLoadImageHooks extends IntersectionObserverHooks {
setup(attributes: Attributes) {
attributes.offset = 10;
@@ -26,7 +26,9 @@ setup(attributes: Attributes) {
IonicModule,
ViewPublicationsPageRoutingModule,
LazyLoadImageModule
LazyLoadImageModule,
//page
ShowMorePageModule,
],
exports: [ViewPublicationsPage],
declarations: [ViewPublicationsPage],
@@ -26,17 +26,15 @@
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
</ion-refresher>
<div class="main-container background-white height-100 overflow-y-auto viewport-font-size">
<ion-content *ngIf="publicationFolderService.FolderDetails[folderId]">
<p class="px-20 item-content-detail font-14-em">{{publicationFolderService.FolderDetails[folderId].Detail}}</p>
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index"
(click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)"
>
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
<ion-card-content>
<div class="post-img">
<div class="post-img" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)">
<img [lazyLoad]="publication.FileBase64">
</div>
<div class="post-content">
@@ -47,7 +45,10 @@
<div class="post-data font-13-em">{{publication.DatePublication | date: 'dd-MM-yyyy HH:mm'}}</div>
</div>
<div class="post-description ">
<pre class="text font-14-em">{{publication.Message}}</pre>
<!-- <pre class="text font-14-em">{{publication.Message}}</pre> -->
<app-show-more
[text]=publication.Message
></app-show-more>
</div>
</div>
</ion-card-content>
@@ -3,7 +3,7 @@
:host{
background: transparent;
padding: 0!important;
}
}
ion-content{
--background: transparent;
--border-radius: 30px;
@@ -123,15 +123,23 @@
padding: 0!important;
}
.post-img{
width: 100%;
//height: 400px;
margin: 0 auto;
border-radius: 0px!important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
width: 100%;
height: 100%;
max-height: 400px;
min-height: 350px;
min-width: 350px;
margin: 5px auto;
border-radius: 0px !important;
overflow: hidden;
background-color: white;
display: flex;
justify-content: center;
align-items: center;
background: black;
}
.post-img img{
height: 100%;