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
Status: Needs Review
Changes Done:
Apply the diff on multiple_dataset branch or pull the changes from the branch gsoc_akshaychd_calendar_multiple_datasets
No Linters Available |
No Unit Test Coverage |
Buildable 20141 | |
Build 20159: arc lint + arc unit |
src/activities/calendar/calendar.js | ||
---|---|---|
113 | Indentation | |
125 | Shouldn't Math.floor((maxMonth - minMonth)) be Math.floor(maxMonth - minMonth + 1)? Let's say minMonth is 3 and maxMonth is 5. I should get any random among 0, 1, 2 so that minMonth + Math.floor(Math.random() * Math.floor((maxMonth - minMonth))) can be anything between 3, 4, 5. But, Math.floor(Math.random() * Math.floor((maxMonth - minMonth))) limits the values among 0, 1 (as minMonth - maxMonth = 2 in our case). So you should probably do maxMonth - minMonth + 1? | |
128 | Same comment about choosing random value as above. |
I tested the patch on multiple_dataset branch, and noticed several issues.
In Find the date:
-some questions, the answer can not be entered (it is out of the accessible range)
Reproduced with first dataset at level 3 and 5 (see screenshots 1, 2 and 3)
-a question was twice the same, happened with second dataset at first level.
-some question did not accept the correct answer (see on screenshot 4 and 5, the answer to the question is correct and still the answer is not accepted).
In Calendar activity:
-At level 3, the questions mention the month and year which is not visible. Better do like in level 4 and say "of given month" instead.
Another note: the datasets have difficulty stars 1 and 3, while the activities initial difficulty level were 1 and 3 red stars (meaning level 4 and 6 respectively)
It would be better to adapt the stars of the datasets accordingly.
@timotheegiet Thanks for the review, I've updated the diff trying to resolve all the issues, can you try it out once again :)
Thanks, I tested again and can not replicate those issues anymore.
Good for me, waiting for @scagarwal and @amankumargupta to confirm it's ok for them too.
Changes done:
Thanks !
@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
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
I have created a new branch after applying the patch still it contains a lot of files. I would update it again once.
@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.
Commit | Tree | Parents | Author | Summary | Date |
---|---|---|---|---|---|
3ff6ea812e55 | e22e061ce92e | 83a9013dd436 | Deepak Kumar | typo fixed | Dec 19 2019, 5:39 PM |
83a9013dd436 | 30c00d64877b | cc8fa8766ca5 | Deepak Kumar | indentation fixed | Dec 19 2019, 5:26 PM |
cc8fa8766ca5 | 76d448b2df42 | d98a2831c715 | Akshay Kumar | Add multiple datasets to calendar activity (Show More…) | Dec 18 2019, 1:35 PM |
d98a2831c715 | 55f186fb8eb8 | 9a536bdfea05 | Johnny Jazeix | clockgame, add activity configuration to change dataset | Jun 8 2019, 6:36 PM |
9a536bdfea05 | 1c7536996ca3 | 94da1ac961d0 | Johnny Jazeix | core, for dialog activity config display the dataset first if comes from menu… (Show More…) | Jun 8 2019, 6:30 PM |
94da1ac961d0 | ff0fbd1a8ba9 | e3f60aac7386 | Johnny Jazeix | menu, enable activities with dataset or config when clicking the 'activity… (Show More…) | Jun 8 2019, 5:24 PM |
e3f60aac7386 | 7a2d072ed901 | db2d0d248913 | Johnny Jazeix | core, fix regression when quitting a dialog don't restart the activity | Jun 8 2019, 3:58 PM |
db2d0d248913 | cb8ae626a8c5 | 6e30cfc65849 | Johnny Jazeix | core, removing non working code for testing if opengl is available | May 28 2019, 4:18 PM |
6e30cfc65849 | 03c8c8398673 | a5a142749df2 | l10n daemon script | GIT_SILENT made messages (after extraction) | May 28 2019, 12:46 AM |
a5a142749df2 | d787def6b856 | 73a39f19f891 | Johnny Jazeix | lang, add lines at the end of files, remove empty zh_CN file | May 27 2019, 9:26 AM |
73a39f19f891 | 0a7e1f6cde8c | b469a230a83e | Johnny Jazeix | core, use isEmpty() instead of empty quotes | May 27 2019, 9:24 AM |
b469a230a83e | 8940b9493ee2 | f2fb500bc127 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours (Show More…) | May 27 2019, 3:06 AM |
f2fb500bc127 | 58d5fefd5c8c | 4bdad1cad033 | Johnny Jazeix | menu, rename experiment to sciences | May 26 2019, 1:34 PM |
4bdad1cad033 | 61e7aa52f0f3 | 95a8bfb186f4 | Johnny Jazeix | menu, add categories for activities to reduce the number of activities per… (Show More…) | May 1 2019, 8:53 PM |
95a8bfb186f4 | 1e89693c1302 | 4ee35bfc5bfe | l10n daemon script | GIT_SILENT made messages (after extraction) | May 13 2019, 12:50 AM |
4ee35bfc5bfe | 5237f79e163a | c743c58c4e97 | l10n daemon script | GIT_SILENT made messages (after extraction) | May 3 2019, 1:06 AM |
c743c58c4e97 | 2f8b3065a7f6 | 3aab54bfaed9 | Johnny Jazeix | tangram, split activity in two activities, one tangram specific and the other… (Show More…) | May 2 2019, 7:09 PM |
3aab54bfaed9 | 859023170114 | 0a55778e9591 | l10n daemon script | GIT_SILENT made messages (after extraction) | May 1 2019, 1:03 AM |
0a55778e9591 | 0fed8f285978 | 92e167b2efc2 | l10n daemon script | GIT_SILENT made messages (after extraction) | Apr 29 2019, 12:56 AM |
92e167b2efc2 | 46f5a5ad9ad7 | b6f740e5d911 | Johnny Jazeix | memory, fix texts outside cards | Apr 28 2019, 7:53 PM |
b6f740e5d911 | fa6e2c6e6bb8 | a9215589876e | Johnny Jazeix | lang, remove json files with no translation | Apr 28 2019, 12:19 PM |
a9215589876e | 976d6b8542c7 | fd96402c084b | Johnny Jazeix | lang, add newline at end of file + don't create po for file that have less than… (Show More…) | Apr 28 2019, 12:17 PM |
fd96402c084b | 554f36661902 | 534c3374515b | Deepak Kumar | numbers-odd-even, add tutorial to explain what are odd/even numbers | Apr 27 2019, 4:17 PM |
534c3374515b | 40d25e5a63ce | 04ea973f91e8 | l10n daemon script | GIT_SILENT made messages (after extraction) | Apr 25 2019, 1:04 AM |
04ea973f91e8 | 5a8feeece9d5 | 309feb9f7cef | l10n daemon script | GIT_SILENT Add new file (after extraction) | Apr 24 2019, 1:02 AM |
309feb9f7cef | 61ab9761ecd5 | 58c977666973 | l10n daemon script | GIT_SILENT made messages (after extraction) | Apr 24 2019, 1:02 AM |
58c977666973 | 700a750c199a | 5da758c6158d | Isabelle Le Nabat | categorisation, missing qsTr for colors category | Apr 23 2019, 9:21 PM |
5da758c6158d | b79a3054482f | 2fd48979ea4f | Yuri Chornoivan | Fix minor typos | Apr 22 2019, 5:07 AM |
2fd48979ea4f | ddae076e7a4a | 5b415ce4ca17 | Aman Kumar Gupta | programmingMaze, major improvements, code clean-up and refactoring | Apr 21 2019, 4:56 PM |
5b415ce4ca17 | 2e2679ec358b | e3922f9040d0 | Johnny Jazeix | programmingMaze, fish position is automatically computed depending on its… (Show More…) | Sep 16 2015, 7:33 PM |
e3922f9040d0 | 1467455919f1 | fff18954371a | siddhesh suthar | programmingMaze, initial version | Jul 4 2015, 4:46 PM |
fff18954371a | 7e776fa8d88b | bb33c15d9ff9 | Johnny Jazeix | core, reduce cpu consumption of menu (Bug 399114) by activating the particle… (Show More…) | Apr 21 2019, 2:32 PM |
bb33c15d9ff9 | d209637c0525 | 2507f35ea0e9 | Akshay Kumar | share, add a button to display again the instructions | Apr 21 2019, 12:52 PM |
2507f35ea0e9 | 5ec56dd9cc6c | 29c800ce2040 | Envel Kervoas | wordsgame, added Breton dataset by Envel Kervoas, Isabelle Le Nabat & Naig… (Show More…) | Apr 19 2019, 7:50 PM |
29c800ce2040 | d09261d84c55 | 83b25d8f5fc9 | Christophe Chabanois | algebra activities: replace the operator signs by the unicode signs | Apr 19 2019, 5:35 AM |
83b25d8f5fc9 | 976e77b7e84a | 9a7b7ffaaff6 | Timothée Giet | menu, fix warning when closing configuration page (Show More…) | Apr 18 2019, 6:29 PM |
9a7b7ffaaff6 | e107fef4e5c2 | 6027f65015cc | Johnny Jazeix | core, remove extra space preventing finding the language name Malayalam for the… (Show More…) | Apr 13 2019, 5:05 PM |
6027f65015cc | dc36a7b6d508 | e27ac5a01d13 | Aiswarya Kaitheri Kandoth | gletters, add ml dataset (Show More…) | Apr 13 2019, 1:30 PM |
e27ac5a01d13 | d79c5b915c42 | ab7c18c5ca9e | l10n daemon script | GIT_SILENT made messages (after extraction) | Apr 8 2019, 1:06 AM |
ab7c18c5ca9e | 8731612b5ec4 | 8b0d3b25fb71 | Johnny Jazeix | core, remove unnecessary condition | May 29 2019, 7:15 PM |
8b0d3b25fb71 | 88eefc3383f0 | e71085c1b419 | Johnny Jazeix | traffic, use DialogChooseLevel to display configuration instead of… (Show More…) | May 29 2019, 7:14 PM |
e71085c1b419 | f3ee0d88a177 | bb853c426b22 | Johnny Jazeix | reversecount, use DialogChooseLevel to display both datasets and configuration | May 29 2019, 7:03 PM |
bb853c426b22 | bb1675c72824 | ec53daf84dc1 | Johnny Jazeix | core, add configuration in the dialog containing datasets and separate it from… (Show More…) | May 28 2019, 4:27 PM |
ec53daf84dc1 | 47b5ced69dcd | 32c46ee8d40d | Johnny Jazeix | merge master | Apr 6 2019, 8:24 PM |
32c46ee8d40d | 15f6f3967cf2 | d505ebaefa83 646ee865a3ba | Johnny Jazeix | merge master | Apr 6 2019, 8:14 PM |
d505ebaefa83 | 0351af564640 | 63f3dae4a878 | Johnny Jazeix | core, add difficulty in settings page for datasets | Apr 6 2019, 8:06 PM |
63f3dae4a878 | 013654be4581 | a7ffb47fc0e5 | Johnny Jazeix | multiple_dataset, add Cancel/Save/Save and Play buttons to dialog | Apr 4 2019, 7:55 PM |
a7ffb47fc0e5 | 1860bc14121c | ef5b5e4a390d | Johnny Jazeix | menu, add a new button for activity configuration | Jan 16 2019, 9:17 PM |
ef5b5e4a390d | c1fe94612ee3 | 8797d7bcd2c2 | Johnny Jazeix | clockgame, add multiple dataset | Dec 21 2018, 1:50 PM |
8797d7bcd2c2 | d874df4fa644 | d8dab762fccc | Johnny Jazeix | docs, fix typos | Oct 9 2018, 7:04 PM |
d8dab762fccc | ca86a491c1b8 | aad6aa567c3c | Johnny Jazeix | menu, display difficulty if there are no datasets defined for activity | Oct 6 2018, 2:23 PM |
aad6aa567c3c | 9d16f6039d36 | 914d84714ef6 | Johnny Jazeix | multiple dataset, proof of concept | Sep 19 2018, 5:36 PM |