diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index aa8514512..a42600742 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -2,7 +2,7 @@ -
+
@@ -18,7 +18,7 @@
-
+
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 2b0d1f1b6..e64c1438e 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -2,8 +2,11 @@ padding: 5px 18px; padding-bottom: 2px; padding-top: 25px; + ion-form{ + width: 100%; + padding-right: 10px; + } .search-input-container{ - max-width: 309px; background-color: white; border-radius: 27.5px; border: solid 1px #ebebeb; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 1b7c67a0e..fa24ab761 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -17,7 +17,6 @@ export class SearchPage implements OnInit { // https params private searchSubject: string; - private advanceSearchSubject: string; private searchDocumentDate: string; private searchSender: string; private searchOrganicEntiry: string; @@ -28,8 +27,6 @@ export class SearchPage implements OnInit { showDocuments = false; showAdvanceSearch = false; - - options: CloudOptions = { // if width is between 0 and 1 it will be set to the width of the upper element multiplied by the value width: 1000, @@ -63,31 +60,13 @@ export class SearchPage implements OnInit { this.modalController.dismiss(); } + /** * @description Basic search */ basicSearch(){ - // search in API - this.search.basicSearch(this.searchSubject, "", "", "", "").subscribe(res=>{ - - // bind respose - this.searchCategories = res.Categories; - this.searchDocuments = res.Documents; - - // hide show document - if(this.searchDocuments.length >= 1){ - this.showDocuments = true; - } else { - this.showDocuments = false - } - - }); - } - - advanceSearch(){ - - this.search.basicSearch(this.advanceSearchSubject, this.searchDocumentDate, this.searchSender + this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId).subscribe(res=>{ // bind respose @@ -133,7 +112,7 @@ export class SearchPage implements OnInit { this.searchSender = ""; this.searchOrganicEntiry = ""; this.searchDocTypeId = ""; - this.advanceSearchSubject = ""; + this.searchSubject = ""; }