From 076b1a8be95f561763f3ef8df89acc94c5483d30 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Jan 2019 15:37:35 +0100
Subject: [PATCH 1/2] MOBILE-2795 database: Display found results number

---
 .../data/components/index/addon-mod-data-index.html | 13 ++++++++++---
 src/addon/mod/data/components/index/index.ts        | 11 +++++++++++
 src/addon/mod/data/lang/en.json                     |  1 +
 src/assets/lang/en.json                             |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html
index 166f9bfd1..94b658e30 100644
--- a/src/addon/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addon/mod/data/components/index/addon-mod-data-index.html
@@ -54,9 +54,16 @@
         {{ 'addon.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }}
     </div>
 
-    <ion-item class="item" *ngIf="search.searching && !isEmpty">
-        <a (click)="searchReset()">{{ 'addon.mod_data.resetsettings' | translate}}</a>
-    </ion-item>
+    <!-- Reset search. -->
+    <ng-container *ngIf="search.searching && !isEmpty">
+        <ion-item class="item" *ngIf="!foundRecordsData">
+            <a (click)="searchReset()">{{ 'addon.mod_data.resetsettings' | translate}}</a>
+        </ion-item>
+
+        <div class="core-success-card" *ngIf="foundRecordsData" (click)="searchReset()">
+            <p [innerHTML]="'addon.mod_data.foundrecords' | translate:{$a: foundRecordsData}"></p>
+        </div>
+    </ng-container>
 
     <div class="addon-data-contents addon-data-entries-{{data.id}}" *ngIf="!isEmpty">
         <style *ngIf="cssTemplate">
diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index e3863a39b..9e32c7afb 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -67,6 +67,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
     cssTemplate = '';
     extraImports = [AddonModDataComponentsModule];
     jsData;
+    foundRecordsData;
 
     protected syncEventName = AddonModDataSyncProvider.AUTO_SYNCED;
     protected entryChangedObserver: any;
@@ -263,6 +264,16 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                 AddonModDataProvider.PER_PAGE) < entries.totalcount;
             this.entriesRendered = '';
 
+            if (typeof entries.maxcount != 'undefined') {
+                this.foundRecordsData = {
+                    num: entries.totalcount,
+                    max: entries.maxcount,
+                    reseturl: '#'
+                };
+            } else {
+                this.foundRecordsData = undefined;
+            }
+
             if (!this.isEmpty) {
                 this.cssTemplate = this.dataHelper.prefixCSS(this.data.csstemplate, '.addon-data-entries-' + this.data.id);
 
diff --git a/src/addon/mod/data/lang/en.json b/src/addon/mod/data/lang/en.json
index 0f38a537f..036cc21e4 100644
--- a/src/addon/mod/data/lang/en.json
+++ b/src/addon/mod/data/lang/en.json
@@ -18,6 +18,7 @@
     "errormustsupplyvalue": "You must supply a value here.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
+    "foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
     "latlongboth": "Both latitude and longitude are required.",
     "menuchoose": "Choose...",
     "modulenameplural": "Databases",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 0e8b3fd8c..4029982e6 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -391,6 +391,7 @@
     "addon.mod_data.errormustsupplyvalue": "You must supply a value here.",
     "addon.mod_data.expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "addon.mod_data.fields": "Fields",
+    "addon.mod_data.foundrecords": "Found records: {{$a.num}}/{{$a.max}} (<a href=\"{{$a.reseturl}}\">Reset filters</a>)",
     "addon.mod_data.latlongboth": "Both latitude and longitude are required.",
     "addon.mod_data.menuchoose": "Choose...",
     "addon.mod_data.modulenameplural": "Databases",

From abed7712c93d5b57e3dbb803b0bcc7000e875c43 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Jan 2019 16:26:00 +0100
Subject: [PATCH 2/2] MOBILE-2795 database: Set placeholder to sort by

---
 src/addon/mod/data/pages/search/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addon/mod/data/pages/search/search.html b/src/addon/mod/data/pages/search/search.html
index 835a8ff00..000181e40 100644
--- a/src/addon/mod/data/pages/search/search.html
+++ b/src/addon/mod/data/pages/search/search.html
@@ -20,7 +20,7 @@
             </ion-item>
             <ion-item text-wrap>
                 <ion-label stacked>{{ 'core.sortby' | translate }}</ion-label>
-                <ion-select interface="action-sheet" name="sortBy" formControlName="sortBy">
+                <ion-select interface="action-sheet" name="sortBy" formControlName="sortBy" [placeholder]="'core.sortby' | translate">
                     <optgroup *ngIf="fieldsArray.length" label="{{ 'addon.mod_data.fields' | translate }}">
                         <ion-option *ngFor="let field of fieldsArray" [value]="field.id">{{field.name}}</ion-option>
                     </optgroup>