And maybe also, grey-out the filtered datasets to prevent them from being selected, and display a notification that a Difficulty filter is active (but that point is optional/to discuss).

PS: see this task with the general TODO for multi-dataset to see how it fits the whole design idea: https://phabricator.kde.org/T12632

I would really prefer to stick to "cumulative dataset" principle rather than "exclusive dataset".
The reason is to be able to have all datasets selected by default, to not force users to select datasets.

Thank you, pushed in https://commits.kde.org/gcompris/730ff4e546edb0227ff5f376ebc1feb77869c91e (I did the change @echarruau mentioned on difficulties)

On my side I do not see anything to correct so far. I think next test will be done by real pupils :) Great work!

I have made all the changes as requested.

• 24 four hours format reverted back

In D26549#592564, @jjazeix wrote:

In D26549#592563, @dekumar wrote:

In D26549#592560, @jjazeix wrote:

For the 24 hours, I would revert the change from this diff.
Multiple things need to be taken in account:

• Should the hint go to 24h (from 0h to 24h)?
• Should we display AM/PM for locale that use them instead of 13h->24h? ...

I think for 24 hrs format there is no AM/PM. As 20hr is equal to 8 pm using this format.
Let me know if you want me to remove 24hrs format from the diff for now.

For me, it needs more discussion on how to handle it in a clean way

In D26549#592563, @dekumar wrote:

In D26549#592560, @jjazeix wrote:

For the 24 hours, I would revert the change from this diff.
Multiple things need to be taken in account:

• Should the hint go to 24h (from 0h to 24h)?
• Should we display AM/PM for locale that use them instead of 13h->24h? ...

I think for 24 hrs format there is no AM/PM. As 20hr is equal to 8 pm using this format.
Let me know if you want me to remove 24hrs format from the diff for now.

In D26549#592560, @jjazeix wrote:

For the 24 hours, I would revert the change from this diff.
Multiple things need to be taken in account:

• Should the hint go to 24h (from 0h to 24h)?
• Should we display AM/PM for locale that use them instead of 13h->24h? ...

For the 24 hours, I would revert the change from this diff.
Multiple things need to be taken in account:

• Should the hint go to 24h (from 0h to 24h)?
• Should we display AM/PM for locale that use them instead of 13h->24h?

...
I think we should use https://doc.qt.io/qt-5/qml-qtqml-date.html to format the time correctly (but it is work for the other task)

• typo fixed

• goal modified

I have done the following changes:

1. Added the 24 hours format to some levels as discussed.
2. Made the minutes hand visible for all of the levels.

Can you modify the options messages to make them shorter. I commented two of them in the code.

I have added all the different configurations as defined for the dataset of clock-game.

I think the possibility to have non exclusif choice in multipledataset config menu will cause problems in smallnumbers where we want to follow a precise plan to teach/train numbers.

@jjazeix I have create a new diff D26252 as updating this diff might have again updates all of the files of my latest applied commits.
Thanks!

@jjazeix Sorry, I didn't checked that. I would apply that commit and update the diff again. Thanks!

In D26176#583589, @dekumar wrote:

In D26176#583251, @jjazeix wrote:

In D26176#583240, @dekumar wrote:

Can you please try once applying the patch to gsoc_akshaychd_calendar_multiple_datasets branch? As I have made changes and created a diff from this branch.
Thanks!

It's the branch we try to apply it

Hi, I tried to apply the patch by deleting the previous akshaychd_calendar branch by trying out these steps and didn't got any error:
git checkout -b gsoc_akshaychd_calendar_multiple_datasets origin/gsoc_akshaychd_calendar_multiple_datasets
arc patch D26176

Can you please check again once?
Thanks!

In D26176#583251, @jjazeix wrote:

In D26176#583240, @dekumar wrote:

Can you please try once applying the patch to gsoc_akshaychd_calendar_multiple_datasets branch? As I have made changes and created a diff from this branch.
Thanks!

It's the branch we try to apply it

In D26176#583240, @dekumar wrote:

Can you please try once applying the patch to gsoc_akshaychd_calendar_multiple_datasets branch? As I have made changes and created a diff from this branch.
Thanks!

In D26176#583146, @jjazeix wrote:

@dekumar the patch does not apply:
git apply calendar.patch
error: patch failed: src/activities/find_the_day/resource/1/Data.qml:43
error: src/activities/find_the_day/resource/1/Data.qml: patch does not apply

Can you please check why?

@dekumar the patch does not apply:
git apply calendar.patch
error: patch failed: src/activities/find_the_day/resource/1/Data.qml:43
error: src/activities/find_the_day/resource/1/Data.qml: patch does not apply

Thank you!
working: https://build.neon.kde.org/view/Snaps/job/bionic_release_extras_gcompris-qt_snap_amd64/
Fix pushed in https://cgit.kde.org/gcompris.git/commit/?id=3b0fcd2b2e0e9c4492a53c158879ba3b2664c528

• deleted extra empty file

• updated diff

@jriddell can you try with https://gcompris.net/download/qt/src/gcompris-qt-0.98.tar.xz when you have some time?
I've done 2 changes: first look in the default path for box2d and if not found, I remove the CMAKE_FIND_ROOT_PATH and look for it again.

Fixed the error, rephrased the objectives as well but now it is affecting redraw_symmetric activity. For redraw_symmetric it is looking for a data in src/activities/redraw_symmetric/resource folder but i want them to share data of redraw activity . can you help me in this?

Thanks for the patch.

Updating D26186: Added multilevel dataset in redraw and redraw_symmetrical activity

Changes I have done:

1. Added one level selection to find date in any month
2. Made the okButton, level and activityConfig visible when there is no tutorial.

@jjazeix Please review it.
Thanks!

@jjazeix Hi, I have tried again by creating a new branch it is still updating all the files.
I have made changes to find_the_day/resources/Data/1.qml and made the level,activityConfig visible only when there is no tutorial.

• reverted changes

In D22266#581303, @jjazeix wrote:

@dekumar it seems you didn't created the branch from Akshay's one, so the diff contains a lot of files that shouldn't be there.
The diff should only contain files from calendar and find_the_day activities.
To do so, checkout the good branch, and do a git checkout -b "your_branch" and update the diff here please

@dekumar it seems you didn't created the branch from Akshay's one, so the diff contains a lot of files that shouldn't be there.
The diff should only contain files from calendar and find_the_day activities.
To do so, checkout the good branch, and do a git checkout -b "your_branch" and update the diff here please

Changes done:

1. I have added a new level selection in Data/1.qml to select day from any months.
2. I have made the level selection and the activity config only visible when there is no tutorial.

Thanks !

Release published and announced :)

Tested on master, all works good :)

It's merged, please check the master branch to be sure it works fine :)

Since aman managed to fix the remaining bug, I'd say it's good to merge now.

I tried taking a look at it in the noon. What I figured out is, when the tracks are freshly appended (after the music reaches the end of the last track and the stop signal initiates the re-append of tracks), the 1st music indeed plays, but that's for a very small period of time. After all the songs are appended, I don't know why, but the stop signal of the audio element is triggered again for some reason. This causes the 2nd track to play. I can't see why it happens :/

Ok, the "missing track" issue is fixed, at the cost of bringing back the "restart needed to re-enable music if started without" bug.
As I noted in the commit comment, ideally fixing both would be best, but if not possible it's less bad to keep the restart-needed issue than the missing track one.

Ouch, actually I found a last remaining bug: when the music reaches the end of last track in the list, it restarts on track 2 instead of track 1... (it doesn't happen when using the "Next" button, only when playing normally).
I'll look at it.