peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve search

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+13
View File
@@ -12,6 +12,19 @@ import { NavigationExtras,Router,ActivatedRoute } from '@angular/router';
import { ToastService } from '../services/toast.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({
selector: 'app-home',
templateUrl: './home.page.html',
src/app/modals/document-detail/document-detail.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
<div class="solid"></div>
<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)="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>
src/app/pages/agenda/view-event/view-event.page.html
+2 -2
View File
@@ -1,9 +1,9 @@
<ion-header class="ion-no-border">
<ion-header class="ion-no-border d-md-none">
<app-header></app-header>
</ion-header>
<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="main-header d-flex">
<div class="title-content d-flex justify-between width-100">
src/app/pages/agenda/view-event/view-event.page.ts
+20 -8
View File
@@ -44,6 +44,7 @@ export class ViewEventPage implements OnInit {
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
dicIndex = 0;
isModal = false
constructor(
private modalController: ModalController,
@@ -68,6 +69,10 @@ export class ViewEventPage implements OnInit {
if(params["params"].caller){
this.caller = (params["params"].caller);
}
if(params["params"].isModal) {
this.isModal = params["params"].isModal
}
});
/* this.activatedRoute.queryParams.subscribe(params => {
@@ -77,6 +82,7 @@ export class ViewEventPage implements OnInit {
}
}); */
alert('yes')
}
ngOnInit() {
@@ -100,14 +106,20 @@ export class ViewEventPage implements OnInit {
}
goBack() {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].caller == 'expediente'){
window.history.back();
}
else{
this.router.navigate(['/home',params["params"].caller]);
}
});
if(this.isModal) {
this.close()
} else {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].caller == 'expediente'){
window.history.back();
}
else{
this.router.navigate(['/home',params["params"].caller]);
}
});
}
}
loadEvent() {
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+29 -28
View File
@@ -1,40 +1,41 @@
<ion-header class="ion-no-border">
<ion-header class="ion-no-border d-md-none">
<app-header></app-header>
</ion-header>
<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 *ngIf="publication.Title != ''">
<div class="title-content px-20 width-100" (click)="goBack()">
<div class="back-icon">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<div *ngIf="publication.Title != ''" class="d-flex flex-column">
<div class="title-content px-20 width-100 ">
<div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="div-title">
<ion-label class="title"> {{publication.Title}}</ion-label>
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
</div>
</div>
<div class="div-title">
<ion-label class="title"> {{publication.Title}}</ion-label>
<p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
<div class="post-item overflow-y-auto">
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
<div class="post-description px-20">
<p>{{publication.Message}}</p>
</div>
</div>
</div>
<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="post-item">
<div *ngIf="publication.FileBase64.length > 30" class="post-img">
<img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
<div class="post-description px-20">
<p>{{publication.Message}}</p>
</div>
</div>
</div>
<div *ngIf="publication.Title == ''">
<div *ngIf="publication.Title == ''" class="d-flex flex-column">
<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>
</div>
<div class="div-title">
@@ -42,7 +43,7 @@
<p class="post-data"><ion-skeleton-text animated style="width: 20%;"></ion-skeleton-text></p>
</div>
</div>
<div class="post-item">
<div class="post-item overflow-y-auto">
<div class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+9 -4
View File
@@ -17,6 +17,7 @@ export class PublicationDetailPage implements OnInit {
publicationId: string;
folderId: string;
publication: Publication;
isModal = false
constructor(
private modalController: ModalController,
@@ -83,14 +84,18 @@ export class PublicationDetailPage implements OnInit {
});
}
close(){
close() {
this.modalController.dismiss();
}
goBack(){
this.router.navigate(['/home/publications', this.folderId]);
}
goBack() {
if(this.isModal) {
this.close()
} else {
this.router.navigate(['/home/publications', this.folderId]);
}
}
async deletePost(){
src/app/pages/search/search.page.html
+1 -1
View File
@@ -146,7 +146,7 @@
</div>
</div>
<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">
<ion-icon *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' "
src="assets/images/icons-search-document.svg"></ion-icon>
src/app/pages/search/search.page.ts
+3 -2
View File
@@ -570,7 +570,8 @@ export class SearchPage implements OnInit {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
eventId: Id
eventId: Id,
isModal: true
},
cssClass: 'modal modal-desktop',
});
@@ -596,6 +597,7 @@ export class SearchPage implements OnInit {
component: PublicationDetailPage,
componentProps:{
publicationId: publicationId,
isModal: true
},
cssClass: 'publication-detail modal modal-desktop ',
//backdropDismiss: false
@@ -629,7 +631,6 @@ export class SearchPage implements OnInit {
}
async openExpedientActionsModal(doc: any) {
let customTask = {
src/app/shared/header/header.page.ts
+1 -1
View File
@@ -63,7 +63,7 @@ export class HeaderPage implements OnInit {
component: SearchPage,
cssClass: classs,
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect',
type: type,
showSearchInput: showSearchInput,
select: false
}
src/app/store/eventoaprovacao-store.service.ts
+2 -2
View File
@@ -8,8 +8,8 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class EventoaprovacaoStoreService {
// main data
private _listpr: Event[]
private _listmd: Event[]
private _listpr: Event[] = []
private _listmd: Event[] = []
// local storage keyName
private keyNamemd: string;
private keyNamepr: string;
src/app/store/expedientegd-store.service.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class ExpedientegdStoreService {
// main data
private _list: Event[]
private _list = []
// local storage keyName
private keyName: string;
private _count = 0
src/app/store/pedidos-store.service.ts
+2 -2
View File
@@ -7,8 +7,8 @@ import { AES, enc, SHA1 } from 'crypto-js'
})
export class PedidosStoreService {
private _listparecer: Event[]
private _listdeferimento: Event[]
private _listparecer: Event[] = []
private _listdeferimento: Event[] = []
// local storage keyName
private keyNameparecer: string;
private keyNamedeferiemnto: string;
src/app/store/pendestes-store.service.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import { AES, enc, SHA1 } from 'crypto-js'
export class PendestesStoreService {
// main data
private _list: Event[]
private _list = []
// local storage keyName
private keyName: string;
private _count = 0
src/environments/environment.ts
+2 -2
View File
@@ -4,8 +4,8 @@
export const environment = {
production: false,
//apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V4/api/',
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
domain: 'gabinetedigital.local', //gabinetedigital.local