diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index e22c7f711..78c8864e2 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -460,18 +460,15 @@ export class EventsPage implements OnInit {
});
}
- goToEvent(eventId: any) {
- this.router.navigate(['/home/events', eventId, 'events']);
+ goToEvent(event: any) {
+ let navigationExtras: NavigationExtras = { queryParams: { CalendarId: event.CalendarId } }
+
+
+ this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras);
}
goToExpediente(SerialNumber: any) {
this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
- /* if (this.loggeduser.Profile == 'MDGPR') {
- this.router.navigate(['/home/events/expediente', SerialNumber, 'events']);
- }
- else if (this.loggeduser.Profile == 'PR') {
- this.router.navigate(['/home/events/expedientes-pr', SerialNumber, 'events']);
- } */
}
viewExpedientListPage() {
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index b0a6b8150..e1410f6c7 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -35,7 +35,6 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
- min="{{minDate}}"
max="2025">
@@ -43,7 +42,6 @@
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 34cd15c99..2fab89b7d 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -259,6 +259,7 @@ export class SearchPage implements OnInit {
if(this.type == "Agenda" ){
+ alert('agenda seach')
this.showLoader = true;
@@ -287,7 +288,8 @@ export class SearchPage implements OnInit {
this.loadWordCloud();
},error => {
- this.searchResult = "Registo não encontrado"
+ this.showLoader = false;
+ // this.searchResult = "Registo não encontrado"
console.log(error)
});
}
@@ -551,6 +553,11 @@ export class SearchPage implements OnInit {
this.loadWordCloud();
},error => {
+ counter++;
+
+ if(counter ==2){
+ this.showLoader = false;
+ }
this.searchResult = "Registo não encontrado"
console.log(error)
});
@@ -586,6 +593,7 @@ export class SearchPage implements OnInit {
this.showLoader = false;
this.loadWordCloud();
},error => {
+ this.showLoader = false;
this.searchResult = "Registo não encontrado"
console.log(error)
});
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index 826ca06c6..9f60cc61b 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -46,7 +46,6 @@
placeholder="Data inicio*"
[(ngModel)]="folder.DateBegin"
[disabled]="disabled"
- [min]="currentDate"
>
700) {
- return new Date(this.folder.DateBegin).toLocaleString('pt') < new Date(this.folder.DateEnd).toLocaleString("pt")? ['ok'] : []
+ var validado: boolean;
+
+ if (window.innerWidth <= 800) {
+ if ((this.folder.DateBegin < this.folder.DateEnd) && (new Date(this.folder.DateBegin).getTime() > this.currentDate.getTime())) {
+ validado = true;
+ }else{
+ validado = false;
+ }
+ return validado == true ? ['ok']: [];
} else {
return ['ok']
}