From e958210df04843c13d6712325c9352d961c32a1e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 25 Oct 2023 10:13:24 +0200 Subject: [PATCH] MOBILE-4362 workshop: Fix dimension number It displayed 01, 11, 21 instead of 1, 2, 3 --- src/addons/mod/workshop/services/workshop.ts | 12 +++++++----- .../mod/workshop/tests/behat/basic_usage.feature | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts index 5e551e376..a866a4c8e 100644 --- a/src/addons/mod/workshop/services/workshop.ts +++ b/src/addons/mod/workshop/services/workshop.ts @@ -1100,23 +1100,25 @@ export class AddonModWorkshopProvider { const args: string[] = field.name.split('_'); const name = args[0]; const idx = args[3]; - const idy = args[6] || false; + const idy = args[6]; + const idxNumber = parseInt(args[3], 10); + const idyNumber = parseInt(args[6], 10); - if (parseInt(idx, 10) + '' == idx) { + if (!isNaN(idxNumber)) { if (!parsedFields[idx]) { parsedFields[idx] = { - number: idx + 1, // eslint-disable-line id-blacklist + number: idxNumber + 1, // eslint-disable-line id-blacklist }; } - if (idy && parseInt(idy, 10) + '' == idy) { + if (!isNaN(idyNumber)) { if (!parsedFields[idx].fields) { parsedFields[idx].fields = []; } if (!parsedFields[idx].fields[idy]) { parsedFields[idx].fields[idy] = { - number: idy + 1, // eslint-disable-line id-blacklist + number: idyNumber + 1, // eslint-disable-line id-blacklist }; } parsedFields[idx].fields[idy][name] = field.value; diff --git a/src/addons/mod/workshop/tests/behat/basic_usage.feature b/src/addons/mod/workshop/tests/behat/basic_usage.feature index 9d6aee8f5..ad5a2ac4c 100644 --- a/src/addons/mod/workshop/tests/behat/basic_usage.feature +++ b/src/addons/mod/workshop/tests/behat/basic_usage.feature @@ -82,7 +82,7 @@ Feature: Test basic usage of workshop activity in app Then I should find "Task to do" within "Assess peers" "ion-item" in the app When I press "The Answer" in the app - And I press "Grade for Aspect 01" in the app + And I press "Grade for Aspect 1" in the app And I press "10 / 10" in the app And I press "Save" in the app Then I should find "Assessed submission" in the app