diff --git a/package-lock.json b/package-lock.json index c050eb256..79e26565e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3440,9 +3440,9 @@ "dev": true }, "angular-tag-cloud-module": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.2.0.tgz", - "integrity": "sha512-F89pvDWmpy4VHMhw1CN5kSwiGjGhBIXS4ektJZraJTBwjxCf9GsTNiw0mjcMWpuqEIxccxcaN3kIx+Z+wvoV3Q==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.2.2.tgz", + "integrity": "sha512-lb/GeK5n0CDH3rjRC7PHBMgRcafc102sovfjyU3W05m9B8JELTDqk6jVEFqiCg+NbLy+zDm7g68Ij7k7LzxmAA==", "requires": { "tslib": "^2.0.0" }, diff --git a/package.json b/package.json index 042c9f13f..bc51da979 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "@ionic/pwa-elements": "^3.0.1", "@ionic/storage": "^2.3.1", "@logisticinfotech/ionic4-datepicker": "^1.4.4", + "angular-tag-cloud-module": "^5.2.2", "cordova-ios": "6.1.0", "cordova-plugin-camera": "^5.0.1", "cordova-plugin-file": "^6.0.2", diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 683cde2d8..c227681f4 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -24,15 +24,10 @@ Acções - - - Pesquisa - Chat - --> diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index bdab410f9..037bd502d 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -76,7 +76,7 @@ -
+

{{ category.Name }}

{{ category.Qtd }}
@@ -109,8 +109,8 @@

- - + +
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 8418b4a7e..3262d2a75 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -83,7 +83,7 @@ ion-slide{ border-radius: 15px; } - .button:hover{ + .active-category{ background-color: #42b9fe; color: white; p{ diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 0b6bf1c08..ba7165846 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -72,9 +72,9 @@ export class SearchPage implements OnInit { this.ordinance = orderBy; if(this.ordinance == 'recent'){ - this.showSearchDocuments = this.sortArrayISODate(this.searchDocuments); - } else { this.showSearchDocuments = this.sortArrayISODate(this.searchDocuments).reverse(); + } else { + this.showSearchDocuments = this.sortArrayISODate(this.searchDocuments) } } @@ -102,6 +102,8 @@ export class SearchPage implements OnInit { this.searchDocuments = this.sortArrayISODate(res.Documents); + this.reorderList(this.ordinance); + // hide show document if(this.searchDocuments.length >= 1){ this.showDocuments = true; @@ -130,6 +132,15 @@ export class SearchPage implements OnInit { } + activeCategoty(i){ + + this.searchCategories.forEach((e) => { + e['Active'] = false; + }) + + this.searchCategories[i]['Active'] = true; + } + clearInputRemetente(){ this.searchSender = ""; } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 597a17cd2..8792937f1 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V3/api/', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto',