Status: Needs Review
Changes Done:
- Added multiple datasets to Calendar and find the day activity.
- Created a generic algorithm to generate template questions as per the parameters it is provided
levels added and indent fixed
Details
Details
- Reviewers
scagarwal amankumargupta timotheegiet jjazeix echarruau - Group Reviewers
GCompris GCompris: Improvements - Maniphest Tasks
- T10909: Multiple datasets for Calendar Activity
Apply the diff on multiple_dataset branch or pull the changes from the branch gsoc_akshaychd_calendar_multiple_datasets
Diff Detail
Diff Detail
- Repository
- R2 GCompris
- Branch
- gsoc_akshaychd_calendar_multiple_datasets
- Lint
No Linters Available - Unit
No Unit Test Coverage - Build Status
Buildable 20184 Build 20202: arc lint + arc unit
Comment Actions
Changes I have done:
- Added one level selection to find date in any month
- Made the okButton, level and activityConfig visible when there is no tutorial.
@jjazeix Please review it.
Thanks!
Comment Actions
@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?
Comment Actions
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!
Comment Actions
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!
Comment Actions
This is not based on the latest commit of the branch.
git checkout gsoc_akshaychd_calendar_multiple_datasets && git log --oneline | cat
Your branch is up to date with 'origin/gsoc_akshaychd_calendar_multiple_datasets'. 9fa1cdf2c calendar, resolve minor bugs 3cfe05f5d calendar, add full date format in find the day questions
Your branch:
git checkout arcpatch-D26176 && git log --oneline | cat
Already on 'arcpatch-D26176' eb359a5d1 Add multiple datasets to calendar activity 3cfe05f5d calendar, add full date format in find the day questions
It misses the last commit (9fa1cdf2c calendar, resolve minor bugs).
This comment was removed by dekumar.
Comment Actions
@jjazeix Sorry, I didn't checked that. I would apply that commit and update the diff again. Thanks!