Multiple datasets for money and smallnumbers activity
Needs ReviewPublic

Authored by AkshayCHD on Jun 16 2019, 10:17 AM.

Details

Reviewers
None
Group Reviewers
GCompris: Improvements
Maniphest Tasks
T10907: Multiple datasets for Number with Dice Activity
T10906: Multiple datasets for Money activity
T10905: Add multiple datasets to activities
Commits
R2:4a273792a4d1: money, fix layout issues and equalize number of levels
R2:b14654242fde: money_back, use only pocket currencies for paid amount instead of all available…
R2:3597496fb4b2: smallnumbers, add multiple datasets
R2:28669eaaa541: smallnumbers, add activity configuration to change dataset
R2:1638c1ec35f8: money_back, make evaluation of total money generic
R2:91d2c7d87d94: Merge branch 'gsoc_akshaychd_multiple_datasets' of git.kde.org:gcompris into…
R2:f48946126f4b: core, create separate function to load wordlist from JSON object
R2:9b8219a579ff: money, remove white spaces from activityconfig
R2:100bebaf1a25: money, move data to resource folder in multiple dataset format
R2:9262883d5a1d: money, add activity configuration to change dataset
R2:83734f3c6a40: money, update README
R2:1c001949cb96: smallnumbers, add objective text
R2:44409cb2107e: money and smallnumbers, fixed minor bugs
R2:a5962f4f5afc: money_back, add dataset number 2 and 3
R2:a57178ea9bc3: core, fix loop binding error in DialogChooseLevel.qml
R2:1ca3fa41ac59: money, add multiple dataset number 3
R2:f3bb9d075709: money_back_cents, add multiple datasets
R2:42494b23d770: money_cents, add multiple datasets
R2:118811214455: money, use best practices and make datasets more precise
R2:48899a8db0a2: money and smallnumbers, minor bug fixes as per reviews
Summary

All the activities to which multiple datasets have been added till now

  • Money
  • Smallnumbers

Diff Detail

Repository
R2 GCompris
Branch
gsoc_akshaychd_multiple_datasets
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 14008
Build 14026: arc lint + arc unit
AkshayCHD created this revision.Jun 16 2019, 10:17 AM
Restricted Application added a project: KDE Edu. · View Herald TranscriptJun 16 2019, 10:17 AM
Restricted Application added a subscriber: kde-edu. · View Herald Transcript
AkshayCHD requested review of this revision.Jun 16 2019, 10:17 AM
jjazeix added inline comments.
src/activities/money_back_cents/resource/2/Data.qml
28

up to

src/activities/money_back_cents/resource/3/Data.qml
28

up to

AkshayCHD retitled this revision from Multiple datasets GSoC to Multiple datasets for money and smallnumbers activity.Sat, Jun 22, 5:23 AM
AkshayCHD updated this revision to Diff 60278.Sat, Jun 22, 5:24 AM

smallnumbers, add objective text

AkshayCHD updated this revision to Diff 60280.Sat, Jun 22, 5:46 AM
This comment was removed by AkshayCHD.
This revision was not accepted when it landed; it landed in state Needs Review.Sat, Jun 22, 5:58 AM
This revision was automatically updated to reflect the committed changes.
AkshayCHD updated this revision to Diff 60282.Sat, Jun 22, 6:34 AM

Added objective text,
Fixed minor bugs as per reviews

AkshayCHD marked 2 inline comments as done.Sat, Jun 22, 6:35 AM
AkshayCHD reopened this revision.Wed, Jun 26, 11:24 AM
AkshayCHD updated this revision to Diff 60687.Wed, Jun 26, 11:31 AM
  • money, move data to resource folder in multiple dataset format
  • money, add multiple dataset number 3
  • money_back, add dataset number 2 and 3
  • money_back_cents, add multiple datasets
  • money_cents, add multiple datasets
  • money_back, make evaluation of total money generic
  • money_back, use only pocket currencies for paid amount instead of all available currencies
  • money, fix layout issues and equalize number of levels
  • core, fix loop binding error in DialogChooseLevel.qml
  • money, use best practices and make datasets more precise
  • smallnumbers, add multiple datasets
  • core, create separate function to load wordlist from JSON object
  • money and smallnumbers, fixed minor bugs
  • smallnumbers, add objective text
  • Merge branch 'gsoc_akshaychd_multiple_datasets' of git.kde.org:gcompris into gsoc_akshaychd_multiple_datasets
  • money, fix bug regarding currency symbol size

@echarruau can you please check the difficulty of the datasets and set the corresponding levels in "stars"?
For example, for money_back, at last level, Tux has 100€ and needs to buy 4 elements (21€, 59€, 50€ and 68€) and I'm not sure that it is not too complicated (at least for a 3 stars dataset).
Same for money_cents and money_cents_back where there are also cents (so 49.06€, 164.09€, 25.02€ and 545.08€ for example) which seems quite difficult without calculator

@AkshayCHD please add in the README where you took the new images and their licences.
Have you tested your changes on android (phone or tablet?) to know if the layout is still working?

src/activities/gletters/Gletters.qml
90

string?

118

parent.width * 0.3 seems to small, can you make it at least half of the screen?

src/activities/money/MoneyCore.qml
67

bool?

src/activities/smallnumbers2/resource/3/Data.qml
32

qsTr() missing for all

src/core/DialogChooseLevel.qml
207

just for my information, what do these changes fix?

AkshayCHD updated this revision to Diff 60901.Mon, Jul 1, 6:50 AM
  • money, add activity configuration to change dataset
  • smallnumbers, add activity configuration to change dataset
  • money and smallnumbers, minor bug fixes as per reviews
  • money, update README
  • money, remove white spaces from activityconfig
This revision was not accepted when it landed; it landed in state Needs Review.Mon, Jul 1, 6:52 AM
This revision was automatically updated to reflect the committed changes.
AkshayCHD marked an inline comment as done.
AkshayCHD marked 2 inline comments as done.Mon, Jul 1, 7:00 AM
AkshayCHD added inline comments.
src/activities/gletters/Gletters.qml
118

@jjazeix I tried using 0.5, but it looks to far stretched https://snag.gy/zfLn6A.jpg (using 0.5) https://snag.gy/Bkx1MZ.jpg (using 0.3) what do you say

src/core/DialogChooseLevel.qml
207

These changes fix the Binding loop error qrc:/gcompris/src/core/DialogChooseLevel.qml:211:17: QML Button: Binding loop detected for property "implicitHeight" . Since initially the height of datasetOptionsRow was depended on height of datasetVisibleButton explicitly and height of datasetVisibleButton was depended on height of datasetOptionsRow implicitly which resulted in a binding loop.

AkshayCHD reopened this revision.Mon, Jul 1, 7:01 AM
AkshayCHD updated this revision to Diff 60903.Mon, Jul 1, 7:02 AM
  • money, move data to resource folder in multiple dataset format
  • money, add multiple dataset number 3
  • money_back, add dataset number 2 and 3
  • money_back_cents, add multiple datasets
  • money_cents, add multiple datasets
  • money_back, make evaluation of total money generic
  • money_back, use only pocket currencies for paid amount instead of all available currencies
  • money, fix layout issues and equalize number of levels
  • core, fix loop binding error in DialogChooseLevel.qml
  • money, use best practices and make datasets more precise
  • smallnumbers, add multiple datasets
  • core, create separate function to load wordlist from JSON object
  • money and smallnumbers, fixed minor bugs
  • smallnumbers, add objective text
  • Merge branch 'gsoc_akshaychd_multiple_datasets' of git.kde.org:gcompris into gsoc_akshaychd_multiple_datasets
  • money, fix bug regarding currency symbol size
  • money, add activity configuration to change dataset
  • smallnumbers, add activity configuration to change dataset
  • money and smallnumbers, minor bug fixes as per reviews
  • money, update README
  • money, remove white spaces from activityconfig

@jjazeix Sorry for being a little late to reply, was having some trouble in adding activity config to gletters, as its subactivities had multiple datasets and it didn't. Finally figured it out, please have a look if I've done it correctly, also i really feel this workflow of adding activtity config is quite good, as previously there was alot of hassle to have separate configuration setting for subactivities, but now they can simply have there separate config files and even the datasets can be managed from the same place. Great effort :)

jjazeix added inline comments.Tue, Jul 2, 5:31 AM
src/activities/gletters/Gletters.qml
118

2 points to take in account:

  • how does it render on smaller screens (phones)
  • when it is translated, the text may be longer, does it take too much height and can it hide the dominoes for too much time?

@AkshayCHD I was trying to merge it on the multiple_dataset branch but I see wordsgame activity does not have the configuration, can you update it? It is a derivate of gletters

AkshayCHD updated this revision to Diff 61858.Tue, Jul 16, 12:57 PM
  • add activity config to wordsgame

@jjazeix I've added ActivityConfig to wordsgame activity.