From 6bfeef05de90ddab6f9755818bcdfb5bc5289d10 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Jun 2018 10:32:44 +0200
Subject: [PATCH 1/3] MOBILE-2431 ui: Add popover interface to all selects

---
 src/addon/mod/data/components/index/addon-mod-data-index.html | 2 +-
 src/addon/mod/data/pages/edit/edit.html                       | 2 +-
 src/addon/mod/data/pages/entry/entry.html                     | 2 +-
 .../assessment/accumulative/component/accumulative.html       | 2 +-
 .../addon-mod-workshop-assessment-strategy.html               | 2 +-
 .../workshop/components/index/addon-mod-workshop-index.html   | 2 +-
 src/addon/mod/workshop/pages/assessment/assessment.html       | 4 ++--
 src/addon/mod/workshop/pages/submission/submission.html       | 2 +-
 8 files changed, 9 insertions(+), 9 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 b87184715..8e52ff474 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
@@ -29,7 +29,7 @@
     <ion-item text-wrap *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
         <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ion-label>
         <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ion-label>
-        <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel">
+        <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel" interface="popover">
             <ion-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">{{groupOpt.name}}</ion-option>
         </ion-select>
     </ion-item>
diff --git a/src/addon/mod/data/pages/edit/edit.html b/src/addon/mod/data/pages/edit/edit.html
index 85b2fbcba..a345aa70c 100644
--- a/src/addon/mod/data/pages/edit/edit.html
+++ b/src/addon/mod/data/pages/edit/edit.html
@@ -13,7 +13,7 @@
         <ion-item text-wrap *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ion-label>
             <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ion-label>
-            <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel">
+            <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel" interface="popover">
                 <ion-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">{{groupOpt.name}}</ion-option>
             </ion-select>
         </ion-item>
diff --git a/src/addon/mod/data/pages/entry/entry.html b/src/addon/mod/data/pages/entry/entry.html
index 55db45b17..f01196d4d 100644
--- a/src/addon/mod/data/pages/entry/entry.html
+++ b/src/addon/mod/data/pages/entry/entry.html
@@ -17,7 +17,7 @@
         <ion-item text-wrap *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
             <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ion-label>
             <ion-label id="addon-data-groupslabel" *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ion-label>
-            <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel">
+            <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-data-groupslabel" interface="popover">
                 <ion-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">{{groupOpt.name}}</ion-option>
             </ion-select>
         </ion-item>
diff --git a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.html
index a65046ab6..919989570 100644
--- a/src/addon/mod/workshop/assessment/accumulative/component/accumulative.html
+++ b/src/addon/mod/workshop/assessment/accumulative/component/accumulative.html
@@ -5,7 +5,7 @@
     </ion-item>
     <ion-item *ngIf="edit && field.grades">
         <ion-label [core-mark-required]="true" stacked>{{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }}</ion-label>
-        <ion-select [(ngModel)]="selectedValues[n].grade">
+        <ion-select [(ngModel)]="selectedValues[n].grade" interface="popover">
             <ion-option *ngFor="let grade of field.grades" [value]="grade.value">{{grade.label}}</ion-option>
         </ion-select>
         <core-input-errors item-content *ngIf="fieldErrors['grade_' + n]" [errorText]="fieldErrors['grade_' + n]"></core-input-errors>
diff --git a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
index 26a10d6c8..5bfddf2e8 100644
--- a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
+++ b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
@@ -23,7 +23,7 @@
                 [maxSubmissions]="workshop.overallfeedbackfiles" [component]="component" [componentId]="componentId" [allowOffline]="true"></core-attachments>
             <ion-item *ngIf="edit && access && access.canallocate">
                 <ion-label stacked [core-mark-required]="true">{{ 'addon.mod_workshop.assessmentweight' | translate }}</ion-label>
-                <ion-select [(ngModel)]="weight">
+                <ion-select [(ngModel)]="weight" interface="popover">
                     <ion-option *ngFor="let w of weights" [value]="w">{{w}}</ion-option>
                 </ion-select>
             </ion-item>
diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
index c8a039a5b..2da593043 100644
--- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
@@ -154,7 +154,7 @@
             <ion-item text-wrap *ngIf="groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)">
                 <ion-label id="addon-workshop-groupslabel" *ngIf="groupInfo.separateGroups">{{ 'core.groupsseparate' | translate }}</ion-label>
                 <ion-label id="addon-workshop-groupslabel" *ngIf="groupInfo.visibleGroups">{{ 'core.groupsvisible' | translate }}</ion-label>
-                <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-workshop-groupslabel">
+                <ion-select [(ngModel)]="selectedGroup" (ionChange)="setGroup(selectedGroup)" aria-labelledby="addon-workshop-groupslabel" interface="popover">
                     <ion-option *ngFor="let groupOpt of groupInfo.groups" [value]="groupOpt.id">{{groupOpt.name}}</ion-option>
                 </ion-select>
             </ion-item>
diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html
index 704c9671a..d23cae4e7 100644
--- a/src/addon/mod/workshop/pages/assessment/assessment.html
+++ b/src/addon/mod/workshop/pages/assessment/assessment.html
@@ -45,7 +45,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="access.canallocate">
                 <ion-label stacked core-mark-required="true">{{ 'addon.mod_workshop.assessmentweight' | translate }}</ion-label>
-                <ion-select formControlName="weight" required="true">
+                <ion-select formControlName="weight" required="true" interface="popover">
                     <ion-option *ngFor="let w of weights" [value]="w">{{ w }}</ion-option>
                 </ion-select>
             </ion-item>
@@ -55,7 +55,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="access.canoverridegrades">
                 <ion-label stacked>{{ 'addon.mod_workshop.gradinggradeover' | translate }}</ion-label>
-                <ion-select formControlName="grade">
+                <ion-select formControlName="grade" interface="popover">
                     <ion-option *ngFor="let grade of evaluationGrades" [value]="grade.value">{{grade.label}}</ion-option>
                 </ion-select>
             </ion-item>
diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html
index 2a48dbbc9..edfc31592 100644
--- a/src/addon/mod/workshop/pages/submission/submission.html
+++ b/src/addon/mod/workshop/pages/submission/submission.html
@@ -83,7 +83,7 @@
             </ion-item>
             <ion-item text-wrap>
                 <ion-label stacked>{{ 'addon.mod_workshop.gradeover' | translate }}</ion-label>
-                <ion-select formControlName="grade">
+                <ion-select formControlName="grade" interface="popover">
                     <ion-option *ngFor="let grade of evaluationGrades" [value]="grade.value">{{grade.label}}</ion-option>
                 </ion-select>
             </ion-item>

From 7829ba2c8f979dda7890c0579598d32b2fcbed8c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Jun 2018 11:39:26 +0200
Subject: [PATCH 2/3] MOBILE-2431 feedback: Fix feedback prefetch handler name

---
 src/addon/mod/feedback/providers/prefetch-handler.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/addon/mod/feedback/providers/prefetch-handler.ts b/src/addon/mod/feedback/providers/prefetch-handler.ts
index a3200300f..31b2ba45a 100644
--- a/src/addon/mod/feedback/providers/prefetch-handler.ts
+++ b/src/addon/mod/feedback/providers/prefetch-handler.ts
@@ -26,7 +26,8 @@ import { CoreUserProvider } from '@core/user/providers/user';
  */
 @Injectable()
 export class AddonModFeedbackPrefetchHandler extends CoreCourseModulePrefetchHandlerBase {
-    name = 'feedback';
+    name = 'AddonModFeedback';
+    modName = 'feedback';
     component = AddonModFeedbackProvider.COMPONENT;
     updatesNames = /^configuration$|^.*files$|^attemptsfinished|^attemptsunfinished$/;
 

From 28a02ab3c13a6cdcbcdfd4c795495a39ce3f9a59 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 19 Jun 2018 16:38:01 +0200
Subject: [PATCH 3/3] MOBILE-2431 calendar: Fix update event notification time

---
 src/addon/calendar/providers/calendar.ts | 5 ++---
 src/addon/mod/quiz/lang/en.json          | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts
index 794818ff7..29681ac8e 100644
--- a/src/addon/calendar/providers/calendar.ts
+++ b/src/addon/calendar/providers/calendar.ts
@@ -592,9 +592,8 @@ export class AddonCalendarProvider {
                 return Promise.reject(null);
             }
 
-            event.notificationtime = time;
-
-            return site.getDb().insertRecord(AddonCalendarProvider.EVENTS_TABLE, event).then(() => {
+            return site.getDb().updateRecords(AddonCalendarProvider.EVENTS_TABLE, {notificationtime: time}, {id: event.id})
+                    .then(() => {
                 return this.scheduleEventNotification(event, time);
             });
         });
diff --git a/src/addon/mod/quiz/lang/en.json b/src/addon/mod/quiz/lang/en.json
index 9cb5add1e..3ed3286f9 100644
--- a/src/addon/mod/quiz/lang/en.json
+++ b/src/addon/mod/quiz/lang/en.json
@@ -32,7 +32,6 @@
     "gradehighest": "Highest grade",
     "grademethod": "Grading method",
     "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
-    "hasdatatosync": "This quiz has offline data to be synchronised.",
     "marks": "Marks",
     "mustbesubmittedby": "This attempt must be submitted by {{$a}}.",
     "noquestions": "No questions have been added yet",