EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1352 from dpalou/MOBILE-2431 

Mobile 2431
main
Juan Leyva 2018-06-19 16:39:59 +02:00 committed by GitHub
parent 81e7898286 28a02ab3c1
commit b084a6a848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/addon/calendar/providers/calendar.ts
View File

@ -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);
});
});

2
src/addon/mod/data/components/index/addon-mod-data-index.html
View File

@ -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>

2
src/addon/mod/data/pages/edit/edit.html
View File

@ -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>

2
src/addon/mod/data/pages/entry/entry.html
View File

@ -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>

3
src/addon/mod/feedback/providers/prefetch-handler.ts
View File

@ -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$/;

1
src/addon/mod/quiz/lang/en.json
View File

@ -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",

2
src/addon/mod/workshop/assessment/accumulative/component/accumulative.html
View File

@ -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>

2
src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html
View File

@ -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>

2
src/addon/mod/workshop/components/index/addon-mod-workshop-index.html
View File

@ -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>

4
src/addon/mod/workshop/pages/assessment/assessment.html
View File

@ -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>

2
src/addon/mod/workshop/pages/submission/submission.html
View File

@ -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>