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

MOBILE-2764 assign: Display right decimal separator in gradebook grade

Browse Source
This commit is contained in:
Dani Palou 2018-11-29 12:43:07 +01:00
parent 62a37720da
commit 3931107c94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/addon/mod/assign/components/submission/submission.ts
View File

@ -506,7 +506,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
if (feedback.grade && feedback.grade.grade && !this.grade.grade) { if (feedback.grade && feedback.grade.grade && !this.grade.grade) {
const parsedGrade = parseFloat(feedback.grade.grade); const parsedGrade = parseFloat(feedback.grade.grade);
this.grade.grade = parsedGrade || parsedGrade == 0 ? parsedGrade : null; this.grade.grade = parsedGrade || parsedGrade == 0 ? parsedGrade : null;
this.grade.gradebookGrade = this.grade.grade; this.grade.gradebookGrade = this.utils.formatFloat(this.grade.grade);
this.originalGrades.grade = this.grade.grade; this.originalGrades.grade = this.grade.grade;
} }
} else { } else {
@ -829,11 +829,11 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy {
// Not using outcomes or scale, get the numeric grade. // Not using outcomes or scale, get the numeric grade.
if (this.grade.scale) { if (this.grade.scale) {
this.grade.gradebookGrade = this.gradesHelper.getGradeValueFromLabel( this.grade.gradebookGrade = this.utils.formatFloat(this.gradesHelper.getGradeValueFromLabel(
this.grade.scale, grade.gradeformatted); this.grade.scale, grade.gradeformatted));
} else { } else {
const parsedGrade = parseFloat(grade.gradeformatted); const parsedGrade = parseFloat(grade.gradeformatted);
this.grade.gradebookGrade = parsedGrade || parsedGrade == 0 ? parsedGrade : null; this.grade.gradebookGrade = parsedGrade || parsedGrade == 0 ? this.utils.formatFloat(parsedGrade) : null;
} }
this.grade.disabled = grade.gradeislocked || grade.gradeisoverridden; this.grade.disabled = grade.gradeislocked || grade.gradeisoverridden;

2
src/providers/utils/utils.ts
View File

@ -471,7 +471,7 @@ export class CoreUtilsProvider {
* @return {string} Locale float. * @return {string} Locale float.
*/ */
formatFloat(float: any): string { formatFloat(float: any): string {
if (typeof float == 'undefined') { if (typeof float == 'undefined' || float === null) {
return ''; return '';
} }