All the activities to which multiple datasets have been added till now
- Money
- Smallnumbers
Details
Details
- Reviewers
jjazeix - Group Reviewers
GCompris: Improvements - Maniphest Tasks
- T10907: Multiple datasets for Number with Dice Activity
T10906: Multiple datasets for Money activity
T10905: [GSoC 2019] 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
Diff Detail
Diff Detail
- Repository
- R2 GCompris
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This comment was removed by AkshayCHD.
Comment Actions
- 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
Comment Actions
@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 ↗ | (On Diff #60901) | string? |
| 118 ↗ | (On Diff #60901) | 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 ↗ | (On Diff #60901) | qsTr() missing for all |
| src/core/DialogChooseLevel.qml | ||
| 207 ↗ | (On Diff #60901) | just for my information, what do these changes fix? |
Comment Actions
- 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
| src/activities/gletters/Gletters.qml | ||
|---|---|---|
| 118 ↗ | (On Diff #60901) | @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 ↗ | (On Diff #60901) | 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. |
Comment Actions
- 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
Comment Actions
@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 :)
| src/activities/gletters/Gletters.qml | ||
|---|---|---|
| 118 ↗ | (On Diff #60901) | 2 points to take in account:
|
Comment Actions
@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
| src/activities/gletters/gletters.js | ||
|---|---|---|
| 82 ↗ | (On Diff #60901) | @AkshayCHD The code misses starting and closing braces. Do add them. |
| 101 ↗ | (On Diff #60901) | @AkshayCHD The code misses starting and closing braces. Do add them. |
| 119 ↗ | (On Diff #60901) | @AkshayCHD The code misses starting and closing braces. Do add them. |
| src/activities/money/money.js | ||
| 69 ↗ | (On Diff #60901) | Remove the space between Function Name and Parameters. |
| 185 ↗ | (On Diff #60901) | @AkshayCHD The code misses starting and closing braces. Do add them. |