corretion on interceptor

This commit is contained in:
Eudes Inácio
2023-12-07 07:01:05 +01:00
39 changed files with 760 additions and 568 deletions
-2
View File
@@ -508,7 +508,6 @@ div ion-raw > ul > li {
font-family: Roboto;
font-weight: bold;
color: var(--title-text-color);
max-width: 250px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -519,7 +518,6 @@ div ion-raw > ul > li {
overflow: hidden !important;
text-overflow: ellipsis !important;
font-size: rem(17);
max-width: 250px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+21 -21
View File
@@ -92,7 +92,7 @@ export class EventsPage implements OnInit {
private changeProfileService: ChangeProfileService,
public TaskService: TaskService
) {
window['zipPhoneCallback'] = function (zipphone) {
var frame = document.getElementById('home-iframe');
if(frame) {
@@ -113,7 +113,7 @@ export class EventsPage implements OnInit {
}
ngAfterViewInit(): void {
this.loadAllTask();
@@ -123,9 +123,9 @@ export class EventsPage implements OnInit {
this.dynamicSearch()
}
})
this.dynamicSearch()
}
ngOnDestroy() {
@@ -161,20 +161,20 @@ export class EventsPage implements OnInit {
const ordinance = this.ordinance
if(this.showSearch && this.searchSubject) {
const AllProcess = this.TaskService.AllProcess.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
}).filter( task => this.TaskService.filter(task, this.filterName))
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
}
} else {
const AllProcess = this.TaskService.AllProcess
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
.filter( task => this.TaskService.filter(task, this.filterName))
@@ -205,7 +205,7 @@ export class EventsPage implements OnInit {
} catch(error) {}
}, 2000);
}
this.RefreshEvents();
this.LoadList();
this.loadAllTask();
@@ -218,7 +218,7 @@ export class EventsPage implements OnInit {
async RefreshEvents() {
this.currentEvent = "";
this.showLoader = true;
this.showAgendaLoader = true;
@@ -256,7 +256,7 @@ export class EventsPage implements OnInit {
let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
this.storage.get('events').then((events: any[] = []) => {
//
//
if(Array.isArray(events)) {
this.listToPresent = events
@@ -271,7 +271,7 @@ export class EventsPage implements OnInit {
} catch (error) {}
}
//
//
})
@@ -299,19 +299,19 @@ export class EventsPage implements OnInit {
changeProfile() {
if (this.profile == "mdgpr") {
//
//
this.profile = "pr";
this.RefreshEvents();
}
else {
//
//
this.profile = "mdgpr";
this.RefreshEvents();
}
}
async openEventDetail1(id: any) {
//
//
const modal = await this.modalController.create({
component: EventDetailPage,
@@ -328,7 +328,7 @@ export class EventsPage implements OnInit {
}
async openEventDetail(id: any) {
//
//
const modal = await this.modalController.create({
component: ViewEventPage,
@@ -338,7 +338,7 @@ export class EventsPage implements OnInit {
cssClass: 'view-event',
backdropDismiss: false
});
modal.onDidDismiss();
await modal.present();
@@ -358,7 +358,7 @@ export class EventsPage implements OnInit {
window['all-process-gabinete']()
}
}
sortArrayISODate(myArray: any) {
@@ -375,9 +375,9 @@ export class EventsPage implements OnInit {
}
goToAllTaskFilter(event: any) {
let navigationExtras: NavigationExtras = { queryParams: {
let navigationExtras: NavigationExtras = { queryParams: {
filter: event,
processes: true
processes: true
} }
@@ -407,4 +407,4 @@ export class EventsPage implements OnInit {
}
}
}
}
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { NotFoundPage } from './not-found.page';
const routes: Routes = [
{
path: '',
component: NotFoundPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class NotFoundPageRoutingModule {}
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { NotFoundPageRoutingModule } from './not-found-routing.module';
import { NotFoundPage } from './not-found.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
NotFoundPageRoutingModule
],
declarations: [NotFoundPage]
})
export class NotFoundPageModule {}
@@ -0,0 +1,9 @@
<ion-content class="d-flex justity-center align-center">
<div class="ion-justify-content-center justify-content-center align-center d-flex height-100 width-100">
<h4>
A Reencaminhar a página
</h4>
</div>
</ion-content>
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { NotFoundPage } from './not-found.page';
describe('NotFoundPage', () => {
let component: NotFoundPage;
let fixture: ComponentFixture<NotFoundPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ NotFoundPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(NotFoundPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
+22
View File
@@ -0,0 +1,22 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-not-found',
templateUrl: './not-found.page.html',
styleUrls: ['./not-found.page.scss'],
})
export class NotFoundPage implements OnInit {
constructor(
private router: Router,
private toastService: ToastService,
) { }
ngOnInit() {
this.router.navigate(['/home/events']);
this.toastService._badRequest("Página não encontrada. Contacte o suporte técnico")
}
}
@@ -10,6 +10,7 @@ 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'
import { VisibilityDirective } from 'src/app/services/directives/visibility1.directive';
export class LazyLoadImageHooks extends IntersectionObserverHooks {
setup(attributes: Attributes) {
attributes.offset = 10;
@@ -31,7 +32,7 @@ setup(attributes: Attributes) {
ShowMorePageModule,
],
exports: [ViewPublicationsPage],
declarations: [ViewPublicationsPage],
declarations: [ViewPublicationsPage, VisibilityDirective],
providers: [{provide: LAZYLOAD_IMAGE_HOOKS, useClass: LazyLoadImageHooks}]
})
export class ViewPublicationsPageModule {}
@@ -51,13 +51,30 @@
<img *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'image'" class="post-img"
[lazyLoad]="'data:image/jpg;base64,' + files.FileBase64">
<video *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
<video [appVisibility]="onVisibilityChange" *ngIf="checkFileType.checkFileType(files.FileExtension ) == 'video'" class="post-video" controls="controls" preload="metadata"
webkit-playsinline="webkit-playsinline">
<source src="{{'data:video/mp4;base64,' + files.FileBase64}}" type="video/mp4">
</video>
</div>
</swiper-slide>
<div class="swiper-button-next"
style="
position: absolute;
background: red;
top: 50%;
">
<div>arrow-left</div>
</div>
<div class="slides-per-view"
style="
position: absolute;
background: red;
top: 50%;
">
<div>arrow-rights</div>
</div>
</swiper-container>
<!-- <div *ngIf="publication.FileExtension == 'mp4'"
(click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" class="post-video">
@@ -291,3 +291,11 @@ swiper-slide video {
justify-content: center;
background: black;
}
.swiper-container::part(button-next) {
display: none !important;
.swiper-button-next {
display: none !important;
}
}
@@ -70,6 +70,12 @@ export class ViewPublicationsPage implements OnInit {
/* this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement) */
setTimeout(() => {
console.log(this.VideoManager.nativeElement)
}, 2000)
this.createPublicationList()
this.getFromDB();
@@ -111,6 +117,15 @@ export class ViewPublicationsPage implements OnInit {
console.log(this.publicationFolderService.publicationList[this.folderId])
}
onVisibilityChange = (e: boolean) => {
console.log("nice to have", e)
if(!e) {
/* this.stopVideo() */
}
}
ngOnChanges() {
if (typeof (this.folderId) == 'object') {
@@ -233,10 +248,28 @@ export class ViewPublicationsPage implements OnInit {
const findIndex = this.publicationFindIndex(publicationId, folderId)
const found = this.publicationIsPresent(publicationId, folderId)
if (!found) {
this.publicationFolderService.publicationList[folderId].push(publicationDetails)
} else {
this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
let a: any = Object.assign({},this.publicationFolderService.publicationList[folderId][findIndex])
let b: any = Object.assign({}, publicationDetails)
a.Files = a.Files.length
b.Files = b.Files.length
if(JSON.stringify(a) != JSON.stringify(b)) {
// console.log({a, b})
this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
} else {
// console.log({publicationDetails})
}
}
}