+
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index e012e58b1..20339aee5 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -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() { diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index 25f8101fe..f5927d526 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -1,40 +1,41 @@ - + + + + + +
-
-
-
- +
+
+
+ +
+
+ {{publication.Title}} +

{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}

+
-
- {{publication.Title}} -

{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}

+ +
+
+ image +
+
+ image +
+
+

{{publication.Message}}

+
- - - - - -
-
- image -
-
- image -
-
-

{{publication.Message}}

-
-
-
-
+
-
+
@@ -42,7 +43,7 @@

-
+
image
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 0066df0bc..f4bd2d690 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -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(){ diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 479cfb263..1d92a8d98 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -146,7 +146,7 @@
    -
  • +
  • diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 5f052511f..6f684159a 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -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 = { diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 4057b1b2d..80c979097 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -63,7 +63,7 @@ export class HeaderPage implements OnInit { component: SearchPage, cssClass: classs, componentProps: { - type: 'AccoesPresidenciais & ArquivoDespachoElect', + type: type, showSearchInput: showSearchInput, select: false } diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index 6cb188cf5..3bd1e8b8c 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -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; diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index 7866b6520..6167db1ba 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -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 diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts index 7bdfd10d3..877184fba 100644 --- a/src/app/store/pedidos-store.service.ts +++ b/src/app/store/pedidos-store.service.ts @@ -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; diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts index 30fc0d52c..798b2c151 100644 --- a/src/app/store/pendestes-store.service.ts +++ b/src/app/store/pendestes-store.service.ts @@ -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 diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3648e6bf2..57e33eb88 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -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