diff --git a/src/activities/calendar/Calendar.qml b/src/activities/calendar/Calendar.qml --- a/src/activities/calendar/Calendar.qml +++ b/src/activities/calendar/Calendar.qml @@ -459,7 +459,7 @@ Bar { id: bar - content: BarEnumContent { value: help | home | level | activityConfig } + content: BarEnumContent { value: items.showTutorial ? (help | home) : (help | home | level | activityConfig) } onHelpClicked: { displayDialog(dialogHelp) } diff --git a/src/activities/calendar/calendar.js b/src/activities/calendar/calendar.js --- a/src/activities/calendar/calendar.js +++ b/src/activities/calendar/calendar.js @@ -91,7 +91,7 @@ items.calendar.visibleMonth = currentLevelConfig["visibleMonth"] monthSelected = currentLevelConfig["visibleMonth"] items.answerChoices.visible = (mode === "findDayOfWeek") ? true : false - items.okButton.visible = !items.answerChoices.visible + items.okButton.visible = !items.answerChoices.visible && !items.showTutorial currentDataSet = currentLevelConfig["questionAnswers"] currentDataSet = Core.shuffle(currentDataSet) items.score.numberOfSubLevels = currentDataSet.length diff --git a/src/activities/find_the_day/resource/1/Data.qml b/src/activities/find_the_day/resource/1/Data.qml --- a/src/activities/find_the_day/resource/1/Data.qml +++ b/src/activities/find_the_day/resource/1/Data.qml @@ -43,87 +43,100 @@ objective: qsTr("Find the date less than one month away") difficulty: 1 data: [ - { - "navigationBarVisible" : true, - "minimumDate": "2018-01-01", - "maximumDate": "2018-01-31", - "visibleMonth": 0, - "visibleYear": 2018, - "mode": "findYearMonthDay", - "questionsExplicitlyGiven": false, - "questionAnswers": { - "length": 5, - } - }, - { - "navigationBarVisible" : true, - "minimumDate": "2018-01-01", - "maximumDate": "2018-03-31", - "visibleMonth": 1, - "visibleYear": 2018, - "mode": "findYearMonthDay", - "questionsExplicitlyGiven": false, - "questionAnswers": { - "length": 5, - "maxOffset": 10 - } - }, - { - "navigationBarVisible" : true, - "minimumDate": "2018-01-01", - "maximumDate": "2018-03-31", - "visibleMonth": 1, - "visibleYear": 2018, - "mode": "findYearMonthDay", - "questionsExplicitlyGiven": false, - "questionAnswers": { - "length": 5, - "maxOffset": 20 - } - }, - { - "navigationBarVisible" : true, - "minimumDate": "2018-01-01", - "maximumDate": "2018-12-31", - "visibleMonth": 7, - "visibleYear": 2018, - "mode": "findDayOfWeek", - "questionsExplicitlyGiven": true, - "questionAnswers": [ - { - "question": qsTr("Find day of week 3 days after December 5."), - "answer": {"dayOfWeek": 6} - }, - { - "question": qsTr("Find day of week 12 days before November 12."), - "answer": {"dayOfWeek": 3} - }, - { - "question": qsTr("Find day of week 32 days after January 5."), - "answer": {"dayOfWeek": 2} - }, - { - "question": qsTr("Find day of week 5 days after February 23."), - "answer": {"dayOfWeek": 3} - }, - { - "question": qsTr("Find day of week 17 days before August 16."), - "answer": {"dayOfWeek": 1} + + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2018-01-31", + "visibleMonth": 0, + "visibleYear": 2018, + "mode": "findYearMonthDay", + "questionsExplicitlyGiven": false, + "questionAnswers": { + "length": 5, + } + }, + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2019-12-31", + "visibleMonth": 10, + "visibleYear": 2018, + "mode": "findYearMonthDay", + "questionsExplicitlyGiven": false, + "questionAnswers": { + "length": 5 + } + }, + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2018-03-31", + "visibleMonth": 1, + "visibleYear": 2018, + "mode": "findYearMonthDay", + "questionsExplicitlyGiven": false, + "questionAnswers": { + "length": 5, + "maxOffset": 10 + } + }, + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2018-03-31", + "visibleMonth": 1, + "visibleYear": 2018, + "mode": "findYearMonthDay", + "questionsExplicitlyGiven": false, + "questionAnswers": { + "length": 5, + "maxOffset": 20 + } + }, + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2018-12-31", + "visibleMonth": 7, + "visibleYear": 2018, + "mode": "findDayOfWeek", + "questionsExplicitlyGiven": true, + "questionAnswers": [ + { + "question": qsTr("Find day of week 3 days after December 5."), + "answer": {"dayOfWeek": 6} + }, + { + "question": qsTr("Find day of week 12 days before November 12."), + "answer": {"dayOfWeek": 3} + }, + { + "question": qsTr("Find day of week 32 days after January 5."), + "answer": {"dayOfWeek": 2} + }, + { + "question": qsTr("Find day of week 5 days after February 23."), + "answer": {"dayOfWeek": 3} + }, + { + "question": qsTr("Find day of week 17 days before August 16."), + "answer": {"dayOfWeek": 1} + } + ] + }, + { + "navigationBarVisible": true, + "minimumDate": "2018-01-01", + "maximumDate": "2018-05-31", + "visibleMonth": 1, + "visibleYear": 2018, + "mode": "findYearMonthDay", + "questionsExplicitlyGiven": false, + "questionAnswers": { + "length": 5, + "maxOffset": 30 } - ] - }, - { - "navigationBarVisible" : true, - "minimumDate": "2018-01-01", - "maximumDate": "2018-05-31", - "visibleMonth": 1, - "visibleYear": 2018, - "mode": "findYearMonthDay", - "questionsExplicitlyGiven": false, - "questionAnswers": { - "length": 5, - "maxOffset": 30 } - } ] }