Improve search

This commit is contained in:
Peter Maquiran
2021-07-26 11:34:46 +01:00
parent ff2d8aa43c
commit 3f007be25e
14 changed files with 87 additions and 55 deletions
+13
View File
@@ -12,6 +12,19 @@ import { NavigationExtras,Router,ActivatedRoute } from '@angular/router';
import { ToastService } from '../services/toast.service'; import { ToastService } from '../services/toast.service';
import { ToDayEventStorage } from '../store/to-day-event-storage.service'; import { ToDayEventStorage } from '../store/to-day-event-storage.service';
// import * as Sentry from "@sentry/browser";
// import { Integrations } from "@sentry/tracing";
// Sentry.init({
// dsn: "https://b374f7c7e09a49adb04197845ded60e9@o927946.ingest.sentry.io/5877459",
// integrations: [new Integrations.BrowserTracing()],
// // Set tracesSampleRate to 1.0 to capture 100%
// // of transactions for performance monitoring.
// // We recommend adjusting this value in production
// tracesSampleRate: 1.0,
// });
@Component({ @Component({
selector: 'app-home', selector: 'app-home',
templateUrl: './home.page.html', templateUrl: './home.page.html',
@@ -57,7 +57,7 @@
<div class="solid"></div> <div class="solid"></div>
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button> <button (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<!-- <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button> --> <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>0
</div> </div>
</div> </div>
@@ -1,9 +1,9 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border d-md-none">
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content class="height-100"> <ion-content class="height-100">
<div class="main-content d-flex height-100"> <div class="_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20">
<div class="content d-flex flex-column width-100"> <div class="content d-flex flex-column width-100">
<div class="main-header d-flex"> <div class="main-header d-flex">
<div class="title-content d-flex justify-between width-100"> <div class="title-content d-flex justify-between width-100">
@@ -44,6 +44,7 @@ export class ViewEventPage implements OnInit {
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
dicIndex = 0; dicIndex = 0;
isModal = false
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
@@ -68,6 +69,10 @@ export class ViewEventPage implements OnInit {
if(params["params"].caller){ if(params["params"].caller){
this.caller = (params["params"].caller); this.caller = (params["params"].caller);
} }
if(params["params"].isModal) {
this.isModal = params["params"].isModal
}
}); });
/* this.activatedRoute.queryParams.subscribe(params => { /* this.activatedRoute.queryParams.subscribe(params => {
@@ -77,6 +82,7 @@ export class ViewEventPage implements OnInit {
} }
}); */ }); */
alert('yes')
} }
ngOnInit() { ngOnInit() {
@@ -100,6 +106,10 @@ export class ViewEventPage implements OnInit {
} }
goBack() { goBack() {
if(this.isModal) {
this.close()
} else {
this.activatedRoute.paramMap.subscribe(params => { this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].caller == 'expediente'){ if(params["params"].caller == 'expediente'){
window.history.back(); window.history.back();
@@ -110,6 +120,8 @@ export class ViewEventPage implements OnInit {
}); });
} }
}
loadEvent() { loadEvent() {
const loader = this.toastService.loading(); const loader = this.toastService.loading();
this.eventsService.getEvent(this.eventId).subscribe(res => { this.eventsService.getEvent(this.eventId).subscribe(res => {
@@ -1,13 +1,18 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border d-md-none">
<app-header></app-header> <app-header></app-header>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="content-container"> <div class="content-container">
<div *ngIf="publication.Title != ''"> <div *ngIf="publication.Title != ''" class="d-flex flex-column">
<div class="title-content px-20 width-100" (click)="goBack()"> <div class="title-content px-20 width-100 ">
<div class="back-icon"> <div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div> </div>
<div class="div-title"> <div class="div-title">
@@ -15,12 +20,8 @@
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p> <p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
</div> </div>
</div> </div>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <div class="post-item overflow-y-auto">
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="post-item">
<div *ngIf="publication.FileBase64.length > 30" class="post-img"> <div *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)"> <img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
</div> </div>
@@ -32,9 +33,9 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="publication.Title == ''"> <div *ngIf="publication.Title == ''" class="d-flex flex-column">
<div class="title-content width-100"> <div class="title-content width-100">
<div class="back-icon"> <div class="back-icon cursor-pointer">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> <ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div> </div>
<div class="div-title"> <div class="div-title">
@@ -42,7 +43,7 @@
<p class="post-data"><ion-skeleton-text animated style="width: 20%;"></ion-skeleton-text></p> <p class="post-data"><ion-skeleton-text animated style="width: 20%;"></ion-skeleton-text></p>
</div> </div>
</div> </div>
<div class="post-item"> <div class="post-item overflow-y-auto">
<div class="post-img"> <div class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image"> <img src="/assets/icon/icon-no-image.svg" alt="image">
</div> </div>
@@ -17,6 +17,7 @@ export class PublicationDetailPage implements OnInit {
publicationId: string; publicationId: string;
folderId: string; folderId: string;
publication: Publication; publication: Publication;
isModal = false
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
@@ -83,14 +84,18 @@ export class PublicationDetailPage implements OnInit {
}); });
} }
close(){ close() {
this.modalController.dismiss(); this.modalController.dismiss();
} }
goBack(){ goBack() {
if(this.isModal) {
this.close()
} else {
this.router.navigate(['/home/publications', this.folderId]); this.router.navigate(['/home/publications', this.folderId]);
} }
}
async deletePost(){ async deletePost(){
+1 -1
View File
@@ -146,7 +146,7 @@
</div> </div>
</div> </div>
<ul> <ul>
<li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex"> <li *ngFor="let searchDocument of showSearchDocuments" (click)="viewDetail( searchDocument); selectItem(searchDocument)" class="d-flex cursor-pointer">
<div class="icon"> <div class="icon">
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' " <ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' "
src="assets/images/icons-search-document.svg"></ion-icon> src="assets/images/icons-search-document.svg"></ion-icon>
+3 -2
View File
@@ -570,7 +570,8 @@ export class SearchPage implements OnInit {
const modal = await this.modalCtrl.create({ const modal = await this.modalCtrl.create({
component: ViewEventPage, component: ViewEventPage,
componentProps:{ componentProps:{
eventId: Id eventId: Id,
isModal: true
}, },
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
}); });
@@ -596,6 +597,7 @@ export class SearchPage implements OnInit {
component: PublicationDetailPage, component: PublicationDetailPage,
componentProps:{ componentProps:{
publicationId: publicationId, publicationId: publicationId,
isModal: true
}, },
cssClass: 'publication-detail modal modal-desktop ', cssClass: 'publication-detail modal modal-desktop ',
//backdropDismiss: false //backdropDismiss: false
@@ -629,7 +631,6 @@ export class SearchPage implements OnInit {
} }
async openExpedientActionsModal(doc: any) { async openExpedientActionsModal(doc: any) {
let customTask = { let customTask = {
+1 -1
View File
@@ -63,7 +63,7 @@ export class HeaderPage implements OnInit {
component: SearchPage, component: SearchPage,
cssClass: classs, cssClass: classs,
componentProps: { componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect', type: type,
showSearchInput: showSearchInput, showSearchInput: showSearchInput,
select: false select: false
} }
@@ -8,8 +8,8 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class EventoaprovacaoStoreService { export class EventoaprovacaoStoreService {
// main data // main data
private _listpr: Event[] private _listpr: Event[] = []
private _listmd: Event[] private _listmd: Event[] = []
// local storage keyName // local storage keyName
private keyNamemd: string; private keyNamemd: string;
private keyNamepr: string; private keyNamepr: string;
+1 -1
View File
@@ -8,7 +8,7 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class ExpedientegdStoreService { export class ExpedientegdStoreService {
// main data // main data
private _list: Event[] private _list = []
// local storage keyName // local storage keyName
private keyName: string; private keyName: string;
private _count = 0 private _count = 0
+2 -2
View File
@@ -7,8 +7,8 @@ import { AES, enc, SHA1 } from 'crypto-js'
}) })
export class PedidosStoreService { export class PedidosStoreService {
private _listparecer: Event[] private _listparecer: Event[] = []
private _listdeferimento: Event[] private _listdeferimento: Event[] = []
// local storage keyName // local storage keyName
private keyNameparecer: string; private keyNameparecer: string;
private keyNamedeferiemnto: string; private keyNamedeferiemnto: string;
+1 -1
View File
@@ -8,7 +8,7 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class PendestesStoreService { export class PendestesStoreService {
// main data // main data
private _list: Event[] private _list = []
// local storage keyName // local storage keyName
private keyName: string; private keyName: string;
private _count = 0 private _count = 0
+2 -2
View File
@@ -4,8 +4,8 @@
export const environment = { export const environment = {
production: false, production: false,
//apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/', apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/', apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local', //gabinetedigital.local domain: 'gabinetedigital.local', //gabinetedigital.local