Differential D22266 Diff 61234 src/activities/calendar/calendar.js

Changeset View

Standalone View

View Options

src/activities/calendar/calendar.js

Show All 34 Lines
35var daySelected = 1 35​var daySelected = 1
36var monthSelected = 2 36​var monthSelected = 2
37var yearSelected = 2018 37​var yearSelected = 2018
38var dayOfWeekSelected 38​var dayOfWeekSelected
39var minRange //sum of min. visible month and year on calendar for navigation bar next/prev button visibility. 39​var minRange //sum of min. visible month and year on calendar for navigation bar next/prev button visibility.
40var maxRange //sum of max. visible month and year on calendar for navigation bar next/prev button visibility. 40​var maxRange //sum of max. visible month and year on calendar for navigation bar next/prev button visibility.
41var correctAnswer 41​var correctAnswer
42var mode 42​var mode
43​var daysInMonths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
43 44​
44function start(items_, dataset_) { 45​function start(items_) {
45 items = items_ 46​ items = items_
46 dataset = dataset_.get() 47​ numberOfLevel = items.levels.length
47 numberOfLevel = dataset.length ​
48 currentLevel = 0 48​ currentLevel = 0
49 49​
50 if(Qt.locale(GCompris.ApplicationSettings.locale).firstDayOfWeek == Qml.Locale.Monday) { 50​ if(Qt.locale(GCompris.ApplicationSettings.locale).firstDayOfWeek == Qml.Locale.Monday) {
51 items.daysOfTheWeekModel.move(0, items.daysOfTheWeekModel.count - 1, 1) 51​ items.daysOfTheWeekModel.move(0, items.daysOfTheWeekModel.count - 1, 1)
52 } 52​ }
53 initLevel(); 53​ initLevel();
54} 54​}
55 55​
56function stop() { 56​function stop() {
57} 57​}
58 58​
59function initLevel() { 59​function initLevel() {
60 currentSubLevel = 1; 60​ currentSubLevel = 1;
61 items.bar.level = currentLevel + 1 61​ items.bar.level = currentLevel + 1
62 currentLevelConfig = dataset[currentLevel][0][0] 62​ currentLevelConfig = items.levels[currentLevel]
63 setCalendarConfigurations() 63​ setCalendarConfigurations()
64 initQuestion(); 64​ initQuestion();
65} 65​}
66 66​
67function nextLevel() { 67​function nextLevel() {
68 if(numberOfLevel <= ++currentLevel) { 68​ if(numberOfLevel <= ++currentLevel) {
69 currentLevel = 0 69​ currentLevel = 0
70 } 70​ }
Show All 16 Lines82function setCalendarConfigurations() {
87 items.calendar.minimumDate = currentLevelConfig["minimumDate"] 87​ items.calendar.minimumDate = currentLevelConfig["minimumDate"]
88 items.calendar.maximumDate = currentLevelConfig["maximumDate"] 88​ items.calendar.maximumDate = currentLevelConfig["maximumDate"]
89 items.calendar.visibleYear = currentLevelConfig["visibleYear"] 89​ items.calendar.visibleYear = currentLevelConfig["visibleYear"]
90 yearSelected = currentLevelConfig["visibleYear"] 90​ yearSelected = currentLevelConfig["visibleYear"]
91 items.calendar.visibleMonth = currentLevelConfig["visibleMonth"] 91​ items.calendar.visibleMonth = currentLevelConfig["visibleMonth"]
92 monthSelected = currentLevelConfig["visibleMonth"] 92​ monthSelected = currentLevelConfig["visibleMonth"]
93 items.answerChoices.visible = (mode === "findDayOfWeek") ? true : false 93​ items.answerChoices.visible = (mode === "findDayOfWeek") ? true : false
94 items.okButton.visible = !items.answerChoices.visible 94​ items.okButton.visible = !items.answerChoices.visible
95 currentDataSet = dataset[currentLevel][1] 95​ currentDataSet = currentLevelConfig["questionAnswers"]
96 currentDataSet = Core.shuffle(currentDataSet) 96​ currentDataSet = Core.shuffle(currentDataSet)
97 items.score.numberOfSubLevels = currentDataSet.length 97​ items.score.numberOfSubLevels = currentDataSet.length
98 items.score.currentSubLevel = currentSubLevel 98​ items.score.currentSubLevel = currentSubLevel
99} 99​}
100 100​
101​function isLeapYear(year) {
102​ if(year % 100 == 0 && year % 400 != 0) {
103​ return false
104​ } else if(year % 4 == 0) {
105​ return true
106​ } else {
107​ return false
108​ }
109​}
110​
111​function getDateInLongFormat(date) {
112​ var months = ["January","February","March","April","May","June","July",
jjazeixUnsubmitted
Done

qsTr() missing

jjazeix: qsTr() missing
scagarwalUnsubmitted
Done

Do maintain spaces between elements in an array. The formatting is wrong.

scagarwal: Do maintain spaces between elements in an array. The formatting is wrong.
113​ "August","September","October","November","December"];
amankumarguptaUnsubmitted
Done

Indentation

amankumargupta: Indentation
114​ return date.day.toString() + " " + months[date.month] + " " + date.year.toString() + "?";
jjazeixUnsubmitted
Done

this should be depending on the country. We may want to display month day year on some locales, it needs to be configurable for the translator (and have a comment)

jjazeix: this should be depending on the country. We may want to display month day year on some locales…
115​}
116​
117​function generateRandomYearMonthDay(minimumDate, maximumDate) {
118​ var minYear = Number(minimumDate.slice(0, 4))
119​ var maxYear = Number(maximumDate.slice(0, 4))
120​ var minMonth = Number(minimumDate.slice(5, 7))
121​ var maxMonth = Number(maximumDate.slice(5, 7))
122​ var minDate = Number(minimumDate.slice(8, 10))
123​ var maxDate = Number(maximumDate.slice(8, 10))
124​ var currentYear = minYear + Math.floor(Math.random() * Math.floor((maxYear - minYear)))
125​ var currentMonth = minMonth + Math.floor(Math.random() * Math.floor((maxMonth - minMonth)))
amankumarguptaUnsubmitted
Done

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?

amankumargupta: Shouldn't Math.floor((maxMonth - minMonth)) be Math.floor(maxMonth - minMonth + 1)? Let's say…
126​ var currentDate
127​ daysInMonths[1] = (isLeapYear(currentYear)) ? 29 : 28;
128​ currentDate = minDate + Math.floor(Math.random() * Math.floor((daysInMonths[currentMonth - 1] - minDate)))
amankumarguptaUnsubmitted
Done

Same comment about choosing random value as above.

amankumargupta: Same comment about choosing random value as above.
129​ return { year: currentYear, month: currentMonth - 1, day: currentDate }
130​}
131​
132​function addOffsetToCurrentDate(currentDate) {
133​ var maxOffset = currentLevelConfig.questionAnswers.maxOffset
134​ var offset = Math.floor(maxOffset / 2) + Math.floor(Math.random() * Math.floor(maxOffset))
135​ daysInMonths[1] = (isLeapYear(currentDate.year)) ? 29 : 28;
136​ var currentOffset = offset;
amankumarguptaUnsubmitted
Done

Why a new variable "currentOffset"? Why not directly use "offset"? It's not used anywhere in this function.

amankumargupta: Why a new variable "currentOffset"? Why not directly use "offset"? It's not used anywhere in…
137​ currentOffset += currentDate.day
138​ var answerDate = 1;
139​ var answerMonth = currentDate.month
140​ var answerYear = currentDate.year
141​ while(currentOffset > 0) {
142​ if(currentOffset - daysInMonths[answerMonth] > 0) {
143​ currentOffset -= daysInMonths[answerMonth]
144​ answerMonth++;
145​ } else {
146​ answerDate = currentOffset;
147​ currentOffset = 0
148​ }
149​ if(answerMonth > 12) {
150​ answerYear++;
151​ daysInMonths[1] = (isLeapYear(answerYear)) ? 29 : 28;
152​ answerMonth = 0;
153​ }
154​ }
155​ return { year: answerYear, month: answerMonth, day: answerDate, offset: offset }
156​}
157​
158​function getTemplateQuestionText(mode, date) {
159​ var questionText
160​ if(mode == "findDayOfWeek") {
jjazeixUnsubmitted
Done

no space before ?

jjazeix: no space before ?
161​ questionText = "What day of the week is on " + date.day.toString() + "?"
jjazeixUnsubmitted
Not Done

qsTr() + bad format
Can you please check if the format is the same if we change locale?

jjazeix: qsTr() + bad format Can you please check if the format is the same if we change locale?
AkshayCHDAuthorUnsubmitted
Not Done

@jjazeix When I change the locale only the names of months and years change, not the question text. As we used hardcoded strings for questions.

AkshayCHD: @jjazeix When I change the locale only the names of months and years change, not the question…
162​ } else if(mode == "findDay") {
163​ questionText = "Select day " + date.day.toString()
164​ } else if(mode == "findMonthOnly") {
165​ questionText = "Find month number " + (date.month + 1).toString()
166​ } else {
167​ if(date.offset) {
168​ questionText = "Find the date " + date.offset.toString() + " days after " + getDateInLongFormat(date);
amankumarguptaUnsubmitted
Done

Please add translators comment above explaining what the arguments will be. It'll be easier for them to understand while translating.

amankumargupta: Please add translators comment above explaining what the arguments will be. It'll be easier for…
169​ }
170​ else
171​ questionText = "Find the date " + getDateInLongFormat(date)
172​ }
173​ return questionText
174​}
175​
101function initQuestion() { 176​function initQuestion() {
102 if(currentDataSet.length < currentSubLevel) { 177​ if(currentDataSet.length < currentSubLevel) {
103 items.bonus.good("lion") 178​ items.bonus.good("lion")
104 } 179​ }
105 else { 180​ else {
181​ if(!currentLevelConfig.questionsExplicitlyGiven) {
182​ var randomDate = generateRandomYearMonthDay(currentLevelConfig.minimumDate, currentLevelConfig.maximumDate)
183​ items.score.currentSubLevel = currentSubLevel
184​ if(currentLevelConfig.mode == "findDayOfWeek") {
185​ var selectedDate = new Date(randomDate.year, randomDate.month - 1, randomDate.day)
186​ correctAnswer.dayOfWeek = Number(selectedDate.getDay())
187​ } else if(currentLevelConfig.mode == "findYearMonthDay" && currentLevelConfig.questionAnswers.maxOffset) {
188​ correctAnswer = addOffsetToCurrentDate(randomDate)
189​ randomDate.offset = correctAnswer.offset
190​ } else {
191​ correctAnswer = randomDate
192​ }
193​ items.questionItem.text = getTemplateQuestionText(currentLevelConfig.mode, randomDate)
194​ } else {
106 items.score.currentSubLevel = currentSubLevel 195​ items.score.currentSubLevel = currentSubLevel
107 items.questionItem.text = currentDataSet[currentSubLevel-1]["question"] 196​ items.questionItem.text = currentDataSet[currentSubLevel-1]["question"]
108 correctAnswer = currentDataSet[currentSubLevel-1]["answer"] 197​ correctAnswer = currentDataSet[currentSubLevel-1]["answer"]
109 } 198​ }
110} 199​ }
200​}
111 201​
112function updateScore(isCorrectAnswer) { 202​function updateScore(isCorrectAnswer) {
113 if(isCorrectAnswer) { 203​ if(isCorrectAnswer) {
114 items.questionDelay.start() 204​ items.questionDelay.start()
115 items.okButtonParticles.burst(20) 205​ items.okButtonParticles.burst(20)
116 items.score.playWinAnimation() 206​ items.score.playWinAnimation()
117 currentSubLevel++; 207​ currentSubLevel++;
118 } 208​ }
Show All 10 Lines216 if(mode === "findDayOfWeek") {
129 } 219​ }
130 } 220​ }
131 // For levels having question based on month only. 221​ // For levels having question based on month only.
132 else if(mode === "findMonthOnly") { 222​ else if(mode === "findMonthOnly") {
133 if(correctAnswer["month"].indexOf(monthSelected) >= 0) { 223​ if(correctAnswer["month"].indexOf(monthSelected) >= 0) {
134 isCorrectAnswer = true 224​ isCorrectAnswer = true
135 } 225​ }
136 } 226​ }
227​ // For levels having question based on day only.
228​ else if(mode === "findDay") {
229​ if(daySelected === correctAnswer["day"]) {
230​ isCorrectAnswer = true
231​ }
232​ }
137 // For levels having questions based on dayOfWeek, month and year. 233​ // For levels having questions based on dayOfWeek, month and year.
138 else if(mode !== "findDayOfWeek") { 234​ else {
139 if(monthSelected === correctAnswer["month"] && daySelected === correctAnswer["day"] && yearSelected === correctAnswer["year"]) { 235​ if(monthSelected === correctAnswer["month"] && daySelected === correctAnswer["day"] && yearSelected === correctAnswer["year"]) {
140 isCorrectAnswer = true 236​ isCorrectAnswer = true
141 } 237​ }
142 } 238​ }
143 updateScore(isCorrectAnswer) 239​ updateScore(isCorrectAnswer)
144} 240​}
145 241​