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 bb48c9bfe..2c76c2c43 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -395,10 +395,12 @@ export class ViewEventPage implements OnInit {
setTimeout(() => {
/* this.loadEvent(); */
this.loadEvent()
- this.getAttachments()
+
}, 250);
this.isEventEdited = true;
}
+
+ this.getAttachments()
});
}
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 0d329d7cb..53281b4fd 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -16,6 +16,7 @@ import { environment } from 'src/environments/environment';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+import { momentG } from 'src/plugin/momentG';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -319,11 +320,23 @@ export class SearchPage implements OnInit {
*/
basicSearch() {
- if(this.type == "Agenda" ){
+ let searchDocumentDate
+
+ if (this.searchDocumentDate) {
+ searchDocumentDate = momentG(new Date(this.searchDocumentDate), 'yyyy-MM-dd')
+ }
+
+ searchDocumentDate;
+
+ if(this.searchSubject == '') {
+ this.searchSubject = undefined
+ }
+
+ if(this.type == "Agenda" ) {
this.showLoader = true;
- this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{
res.Categories.forEach( e => {
@@ -338,7 +351,7 @@ export class SearchPage implements OnInit {
this.reorderList(this.ordinance);
// hide show document
- if(this.searchDocuments.length >= 1){
+ if(this.searchDocuments.length >= 1) {
this.showDocuments = true;
} else {
this.showDocuments = false
@@ -366,8 +379,8 @@ export class SearchPage implements OnInit {
let counter = 0;
- this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
- ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
+ this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
+ ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -405,7 +418,7 @@ export class SearchPage implements OnInit {
}
});
- this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
res.Categories.forEach( e => {
@@ -448,7 +461,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
- this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -488,7 +501,7 @@ export class SearchPage implements OnInit {
}
});
- this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => {
res.Categories.forEach( e => {
@@ -543,7 +556,7 @@ export class SearchPage implements OnInit {
let counter = 0;
- this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
@@ -581,7 +594,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
- this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
@@ -632,7 +645,7 @@ export class SearchPage implements OnInit {
this.searchCategories = []
this.searchDocuments = []
- this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
@@ -683,7 +696,7 @@ export class SearchPage implements OnInit {
- this.search.basicSearchPublication(this.searchSubject, this.searchDocumentDate, this.searchSender
+ this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res => {
diff --git a/version/git-version.ts b/version/git-version.ts
index 476a81574..d120aadb3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "7f3cfdc55",
- "SHA": "7f3cfdc55eaf73f209eda70ac66421d005e406e2",
+ "shortSHA": "2f3810415",
+ "SHA": "2f38104155a4c697b74eb431a3ff564105c5cffc",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Fri Jun 9 12:02:11 2023 +0100'",
- "lastCommitMessage": "fix loader",
- "lastCommitNumber": "4957",
+ "lastCommitTime": "'Fri Jun 9 15:29:03 2023 +0100'",
+ "lastCommitMessage": "fix",
+ "lastCommitNumber": "4958",
"change": "",
- "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html",
+ "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/search/search.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file