git apply D26252.diff
error: patch failed: src/activities/calendar/Calendar.qml:459
error: src/activities/calendar/Calendar.qml: patch does not apply
error: src/activities/find_the_day/resource/1/Data.qml: No such file or directory

Could you please provide a diff that works correctly from a fresh multiple_dataset branch when we apply it from directory gcompris?

In D26252#583919, @echarruau wrote:

git apply D26252.diff
error: patch failed: src/activities/calendar/Calendar.qml:459
error: src/activities/calendar/Calendar.qml: patch does not apply
error: src/activities/find_the_day/resource/1/Data.qml: No such file or directory

Could you please provide a diff that works correctly from a fresh multiple_dataset branch when we apply it from directory gcompris?

@echarruau Could you please try applying this diff to gsoc_akshaychd_calendar_multiple_dataset branch? As I have created a diff from this branch not from multiple_datasets.

I do not understand why we have a tutorial about leap year in this activity.

Could you do a sum up list of the changes you have done so that I can check them without forgetting anything?
Thanks.

Level 2 and 3 do not have any ok button. We will need them to be able to asses the pupils answers.

In D26252#583960, @echarruau wrote:

Could you do a sum up list of the changes you have done so that I can check them without forgetting anything?
Thanks.

I have added in the summary about the changes I have done.

In D26252#583961, @echarruau wrote:

Level 2 and 3 do not have any ok button. We will need them to be able to asses the pupils answers.

Could you please specify for which activity are you talking calendar or find_the day and for which difficulty level so that I can check and make the changes?
Thanks!

In D26252#583959, @echarruau wrote:

I do not understand why we have a tutorial about leap year in this activity.

It was created by akshay earlier. Do you want me to remove it?

I will see with Johnny.

Le sam. 28 déc. 2019 à 17:35, Deepak Kumar
<noreply@phabricator.kde.org> a écrit :

dekumar added a comment. View Revision

In D26252#583959, @echarruau wrote:

I do not understand why we have a tutorial about leap year in this activity.

It was created by akshay earlier. Do you want me to remove it?

REPOSITORY
R2 GCompris

REVISION DETAIL
https://phabricator.kde.org/D26252

To: dekumar, jjazeix
Cc: echarruau, kde-edu, narvaez, apol

In D26252#583980, @echarruau wrote:

I will see with Johnny.

Le sam. 28 déc. 2019 à 17:35, Deepak Kumar
<noreply@phabricator.kde.org> a écrit :

dekumar added a comment. View Revision

In D26252#583959, @echarruau wrote:

I do not understand why we have a tutorial about leap year in this activity.

It was created by akshay earlier. Do you want me to remove it?

REPOSITORY
R2 GCompris

REVISION DETAIL
https://phabricator.kde.org/D26252

To: dekumar, jjazeix
Cc: echarruau, kde-edu, narvaez, apol

Okay no problem. Let me know after discussion.

@jjazeix Can you please review this once? I am looking forward to implement multiple dataset to other activities too.
Thanks :)

diff looks good, but the branch can't be merged in this state, the tutorials need to be improved

In D26252#639661, @jjazeix wrote:

diff looks good, but the branch can't be merged in this state, the tutorials need to be improved

@jjazeix What are the changes that needs to be done to the tutorial? I can work on it for now.
Thanks!