diff --git a/src/activities/money/MoneyCore.qml b/src/activities/money/MoneyCore.qml index ba76b8cdd..3ab13bc28 100644 --- a/src/activities/money/MoneyCore.qml +++ b/src/activities/money/MoneyCore.qml @@ -1,270 +1,271 @@ /* GCompris - MoneyCore.qml * * Copyright (C) 2014 Bruno Coudoin * * Authors: * Bruno Coudoin (GTK+ version) * Bruno Coudoin (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import "../../core" import "money.js" as Activity ActivityBase { id: activity onStart: focus = true onStop: {} property var dataset pageComponent: Image { id: background anchors.fill: parent source: Activity.url + "/background.svg" sourceSize.width: parent.width signal start signal stop Component.onCompleted: { activity.start.connect(start) activity.stop.connect(stop) } // Add here the QML items you need to access in javascript QtObject { id: items property Item main: activity.main property alias background: background property GCSfx audioEffects: activity.audioEffects property alias answerModel: answerArea.pocketModel property alias pocketModel: pocketArea.pocketModel property alias store: store property alias instructions: instructions property alias tux: tux property var levels: activity.datasetLoader.item.data property alias tuxMoney: tuxMoney property alias bar: bar property alias bonus: bonus property int itemIndex property int pocketRows + property var verticalOrientation: background.height > background.width property var selectedArea property alias pocket: pocketArea.answer property alias answer: answerArea.answer } onStart: { Activity.start(items, dataset) } onStop: { Activity.stop() } Column { id: columnLayout spacing: 10 x: parent.width * 0.05 y: parent.height * 0.05 width: parent.width * 0.9 property int nbColumns: 5 - property int nbLines: items.pocketRows + property int nbLines: (items.verticalOrientation) ? items.pocketRows + 1 : items.pocketRows property int itemWidth: Math.min(width / nbColumns - 10 - 10 / nbColumns, parent.height * 0.4 / nbLines - 10 - 10 / nbLines) property int itemHeight: itemWidth * 0.59 // === The Answer Area === MoneyArea { id: answerArea onTransaction: Activity.unpay(index) } // === The Store Area === property int nbStoreColumns: activity.dataset === "BACK_WITHOUT_CENTS" || activity.dataset === "BACK_WITH_CENTS" ? store.model.length + 1 : store.model.length //tempSpace is a workaround to replace instructionsArea.realHeight that is freezing with Qt-5.9.1 property int tempSpace: bar.level === 1 ? 140 + columnLayout.spacing : 0 property int itemStoreWidth: Math.min((columnLayout.width - storeAreaFlow.spacing * nbStoreColumns) / nbStoreColumns, (parent.height - answerArea.height - pocketArea.height - bar.height) * 0.8) - tempSpace property int itemStoreHeight: itemStoreWidth Rectangle { id: storeArea height: columnLayout.itemStoreHeight + 10 width: columnLayout.width color: "#55333333" border.color: "black" border.width: 2 radius: 5 Flow { id: storeAreaFlow anchors.topMargin: 4 anchors.bottomMargin: 4 anchors.leftMargin: 20 anchors.rightMargin: 20 anchors.fill: parent spacing: 40 add: Transition { NumberAnimation { properties: "x" from: parent.width * 0.05 duration: 300 } } Image { id: tux visible: activity.dataset === "BACK_WITHOUT_CENTS" || activity.dataset === "BACK_WITH_CENTS" source: Activity.url + "/tux.svg" sourceSize.height: columnLayout.itemStoreHeight sourceSize.width: columnLayout.itemStoreHeight Repeater { id: tuxMoney Image { source: modelData.img sourceSize.height: columnLayout.itemStoreHeight * 0.4 - x: tux.x + index * 20 + x: tux.x + index * 50 y: tux.y + tux.height / 2 + index * 20 } } } Repeater { id: store Image { source: modelData.img sourceSize.height: columnLayout.itemStoreHeight sourceSize.width: columnLayout.itemStoreHeight GCText { text: modelData.price fontSize: 16 font.weight: Font.DemiBold style: Text.Outline styleColor: "black" color: "white" anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top anchors.topMargin: index % 2 == 0 ? 0 : parent.height - height } } } } } // == The instructions Area == Rectangle { id: instructionsArea height: instructions.height width: columnLayout.width color: "#55333333" border.color: "black" border.width: 2 radius: 5 anchors.topMargin: 4 anchors.bottomMargin: 4 anchors.leftMargin: 10 anchors.rightMargin: 10 visible: bar.level === 1 property int realHeight: bar.level === 1 ? height + columnLayout.spacing : 0 GCText { id: instructions horizontalAlignment: Text.AlignHCenter width: columnLayout.width height: columnLayout.height / 6 wrapMode: Text.WordWrap fontSizeMode: Text.Fit } } // === The Pocket Area === MoneyArea { id: pocketArea onTransaction: Activity.pay(index) } } Keys.onPressed: { if(event.key === Qt.Key_Tab) { if(items.selectedArea.count !== 0 && items.itemIndex !== -1) items.selectedArea.itemAt(items.itemIndex).selected = false if(items.selectedArea == items.pocket) { items.selectedArea = items.answer } else { items.selectedArea = items.pocket } items.itemIndex = 0 } if(items.selectedArea.count !== 0) { if(items.itemIndex >= 0) items.selectedArea.itemAt(items.itemIndex).selected = false if(event.key === Qt.Key_Right) { if(items.itemIndex != (items.selectedArea.count-1)) items.itemIndex++ else items.itemIndex = 0 } if(event.key === Qt.Key_Left) { if(items.itemIndex > 0) items.itemIndex-- else items.itemIndex = items.selectedArea.count-1 } if([Qt.Key_Space, Qt.Key_Enter, Qt.Key_Return].indexOf(event.key) != -1 && items.itemIndex !== -1 ) { if(items.selectedArea == items.pocket) Activity.pay(items.itemIndex) else Activity.unpay(items.itemIndex) if(items.itemIndex > 0) items.itemIndex-- } } if(items.selectedArea.count !== 0 && items.itemIndex !== -1) items.selectedArea.itemAt(items.itemIndex).selected = true } DialogHelp { id: dialogHelp onClose: home() } Bar { id: bar content: BarEnumContent { value: help | home | level } onHelpClicked: { displayDialog(dialogHelp) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: activity.home() } Bonus { id: bonus Component.onCompleted: win.connect(Activity.nextLevel) } } } diff --git a/src/activities/money/money.js b/src/activities/money/money.js index 8b998b08f..a19af48ca 100644 --- a/src/activities/money/money.js +++ b/src/activities/money/money.js @@ -1,247 +1,246 @@ /* GCompris - money.js * * Copyright (C) 2014 Bruno Coudoin * * Authors: * Bruno Coudoin (GTK+ version) * Bruno Coudoin (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ .pragma library .import "qrc:/gcompris/src/core/core.js" as Core .import GCompris 1.0 as GCompris - -.import "moneyConstants.js" as Constants +.import "moneyConstants.js" as MoneyConstants var url = "qrc:/gcompris/src/activities/money/resource/" // We create 3 prices categories to make the game more realistic. // List of images to use in the game (cheap objects) var currentLevel var numberOfLevel var dataset var items var centsMode var backMode var priceTotal function start(items_, datasetName) { items = items_ dataset = items.levels switch(datasetName) { case "WITHOUT_CENTS": centsMode = false backMode = false break case "WITH_CENTS": centsMode = true backMode = false break case "BACK_WITHOUT_CENTS": centsMode = false backMode = true break case "BACK_WITH_CENTS": centsMode = true backMode = true break } currentLevel = 0 numberOfLevel = dataset.length initLevel() } function stop() { } function getCoinCount (pocket) { var count = 0 for(var i = 0; i < pocket.length; i++) { if(pocket[i].val <= 2) count++ } return count; } function initLevel() { items.bar.level = currentLevel + 1 items.answerModel.clear() items.pocketModel.clear() var data = dataset[currentLevel] var pocket = Core.shuffle(data.pocket) var coinCount = getCoinCount(pocket) - items.pocketRows = ((data.pocket.length - coinCount / 2) > 9) ? 3 : 2 + items.pocketRows = (((data.pocket.length - coinCount / 2) > 9) ? 3 : 2) for (var i in pocket) items.pocketModel.append(pocket[i]) // fill up the store in a random way var storeModel = new Array() priceTotal = Math.floor(data.minPrice + Math.random() * (data.maxPrice - data.minPrice)) var priceCounter = 0 for(var i = 0; i < data.numberOfItem; i++) { var price if(i < data.numberOfItem - 1) // Calc a random price for each item based on the previous prices price = Math.floor((centsMode ? 0 : 1) + Math.random() * (2 * (priceTotal - priceCounter) / data.numberOfItem)) else // Put the remaining missing price on the last item price = priceTotal - priceCounter var cents = 0 if(centsMode) { if(currentLevel === 0) cents += 0.10 + Math.floor(Math.random() * 9) / 10 else cents += 0.01 + Math.floor(Math.random() * 9) / 100 priceTotal += cents price += cents } var locale = GCompris.ApplicationSettings.locale if(locale == "system") { locale = Qt.locale().name == "C" ? "en_US" : Qt.locale().name } var priceText = Number(price).toLocaleCurrencyString(Qt.locale(locale)) if(!centsMode) { // Strip floating part priceText = priceText.replace((/.00/), "") } storeModel.push({img: getRandomObject(price), price: priceText}) priceCounter += price } items.store.model = storeModel if(!backMode) { items.instructions.text = qsTr("Click on the coins or paper money at the bottom of the screen to pay." + " If you want to remove a coin or note, click on it on the upper screen area.") } else { var availableCurrency = pocket.slice() availableCurrency.sort(function sort(a, b) { return b.val - a.val }); var amountToBeCovered = data.paid var tuxMoney = [] while(amountToBeCovered > 0) { var maxPossible = 0 for(var i = 0; i < availableCurrency.length; i++) { if((availableCurrency[i].val <= amountToBeCovered)) { maxPossible = availableCurrency[i] break; } } tuxMoney.push(maxPossible) amountToBeCovered -= maxPossible.val; } items.tuxMoney.model = tuxMoney var tuxTotal = 0 for(var i=0; i < tuxMoney.length; i++) tuxTotal += tuxMoney[i].val var locale = GCompris.ApplicationSettings.locale if(locale == "system") { locale = Qt.locale().name == "C" ? "en_US" : Qt.locale().name } var priceText = Number(tuxTotal).toLocaleCurrencyString(Qt.locale(locale)) if(!centsMode) { // Strip floating part priceText = priceText.replace((/.00/), "") } /* The money sign is inserted based on the current locale */ items.instructions.text = qsTr("Tux just bought some items in your shop.\n" + "He gives you %1, please give back his change.") .arg(priceText) } //Keyboard reset items.itemIndex = -1 items.selectedArea = items.pocket } // Given a price return a random object function getRandomObject(price) { var list if(price < 5) - list = Constants.cheapObjects + list = MoneyConstants.cheapObjects else if(price < 10) - list = Constants.normalObjects + list = MoneyConstants.normalObjects else - list = Constants.expensiveObjects + list = MoneyConstants.expensiveObjects return list[Math.floor(Math.random() * list.length)] } function checkAnswer() { var paid = 0 for (var i = 0; i < items.answerModel.count; ++i) paid += items.answerModel.get(i).val paid = paid.toFixed(2) if(!backMode) { if(paid === priceTotal.toFixed(2)) items.bonus.good("flower") } else { if(paid === (dataset[currentLevel].paid - priceTotal).toFixed(2)) items.bonus.good("flower") } } function pay(index) { items.audioEffects.play(url + "money1.wav") // Add it to the anwser items.answerModel.append(items.pocketModel.get(index)) // Remove it from the pocket items.pocketModel.remove(index, 1) checkAnswer() } function unpay(index) { items.audioEffects.play(url + "money2.wav") // Add it to the pocket items.pocketModel.append(items.answerModel.get(index)) // Remove it from the Answer items.answerModel.remove(index, 1) checkAnswer() } function nextLevel() { if(numberOfLevel <= ++currentLevel ) { currentLevel = 0 } initLevel(); } function previousLevel() { if(--currentLevel < 0) { currentLevel = numberOfLevel - 1 } initLevel(); } diff --git a/src/activities/money/moneyConstants.js b/src/activities/money/moneyConstants.js index d29c5e146..9861d102f 100644 --- a/src/activities/money/moneyConstants.js +++ b/src/activities/money/moneyConstants.js @@ -1,61 +1,62 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ var cheapObjects = [ "qrc:/gcompris/src/activities/money/resource/apple.svg", "qrc:/gcompris/src/activities/money/resource/orange.svg", "qrc:/gcompris/src/activities/money/resource/banane.svg", "qrc:/gcompris/src/activities/money/resource/pamplemousse.svg", "qrc:/gcompris/src/activities/money/resource/carot.svg", "qrc:/gcompris/src/activities/money/resource/cerise.svg", "qrc:/gcompris/src/activities/money/resource/cake.svg" ] var normalObjects = [ "qrc:/gcompris/src/activities/money/resource/umbrella.svg", "qrc:/gcompris/src/activities/money/resource/pencil.svg", "qrc:/gcompris/src/activities/money/resource/bottle.svg", "qrc:/gcompris/src/activities/money/resource/light.svg", "qrc:/gcompris/src/activities/money/resource/eggpot.svg" ] var expensiveObjects = [ "qrc:/gcompris/src/activities/money/resource/lamp.svg", "qrc:/gcompris/src/activities/money/resource/football.svg", "qrc:/gcompris/src/activities/money/resource/bicycle.svg" ] var moneyItems = { MONEY_COIN_1C: { img: "qrc:/gcompris/src/activities/money/resource/c1c.svg", val: 0.01 }, MONEY_COIN_2C: { img: "qrc:/gcompris/src/activities/money/resource/c2c.svg", val: 0.02 }, MONEY_COIN_5C: { img: "qrc:/gcompris/src/activities/money/resource/c5c.svg", val: 0.05 }, MONEY_COIN_10C: { img: "qrc:/gcompris/src/activities/money/resource/c10c.svg", val: 0.1 }, MONEY_COIN_20C: { img: "qrc:/gcompris/src/activities/money/resource/c20c.svg", val: 0.20 }, MONEY_COIN_50C: { img: "qrc:/gcompris/src/activities/money/resource/c50c.svg", val: 0.5 }, MONEY_COIN_1E: { img: "qrc:/gcompris/src/activities/money/resource/c1e.svg", val: 1.0 }, MONEY_COIN_2E: { img: "qrc:/gcompris/src/activities/money/resource/c2e.svg", val: 2.0 }, MONEY_PAPER_5E: { img: "qrc:/gcompris/src/activities/money/resource/n5e.svg", val: 5.0 }, MONEY_PAPER_10E: { img: "qrc:/gcompris/src/activities/money/resource/n10e.svg", val: 10.0 }, MONEY_PAPER_20E: { img: "qrc:/gcompris/src/activities/money/resource/n20e.svg", val: 20.0 }, MONEY_PAPER_50E: { img: "qrc:/gcompris/src/activities/money/resource/n50e.svg", val: 50.0 }, MONEY_PAPER_100E: { img: "qrc:/gcompris/src/activities/money/resource/n100e.png", val: 100.0 }, - MONEY_PAPER_200E: { img: "qrc:/gcompris/src/activities/money/resource/n200e.svg", val: 200.0 } + MONEY_PAPER_200E: { img: "qrc:/gcompris/src/activities/money/resource/n200e.svg", val: 200.0 }, + MONEY_PAPER_500E: { img: "qrc:/gcompris/src/activities/money/resource/n500e.png", val: 500.0 } } diff --git a/src/activities/money/resource/1/Data.qml b/src/activities/money/resource/1/Data.qml index ca106bd26..752d4d887 100644 --- a/src/activities/money/resource/1/Data.qml +++ b/src/activities/money/resource/1/Data.qml @@ -1,106 +1,106 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { objective: qsTr("Learn how to pay up to 10 units") - property var moneyItems: Constants.moneyItems + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, "maxPrice": 4, "pocket": [ moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 5, "pocket": [ moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 6, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 7, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 8, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 9, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 10, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] } ] } diff --git a/src/activities/money/resource/2/Data.qml b/src/activities/money/resource/2/Data.qml index 3047ad53a..6d88a5a48 100644 --- a/src/activities/money/resource/2/Data.qml +++ b/src/activities/money/resource/2/Data.qml @@ -1,182 +1,182 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { objective: qsTr("Learn how to pay up to 100 units") - property var moneyItems: Constants.moneyItems + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 3, "maxPrice": 10, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 10, "maxPrice": 20, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 20, "maxPrice": 30, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 30, "maxPrice": 60, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 60, "maxPrice": 100, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E ] }, { "numberOfItem": 3, "minPrice": 10, "maxPrice": 20, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 4, "minPrice": 20, "maxPrice": 30, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 5, "minPrice": 30, "maxPrice": 60, "pocket": [ moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 6, "minPrice": 60, "maxPrice": 100, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E ] } ] } diff --git a/src/activities/money/resource/3/Data.qml b/src/activities/money/resource/3/Data.qml index 1aed23c7b..95b637eb9 100644 --- a/src/activities/money/resource/3/Data.qml +++ b/src/activities/money/resource/3/Data.qml @@ -1,231 +1,231 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { objective: qsTr("Learn how to pay up to 1000 units") - property var moneyItems: Constants.moneyItems + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 10, "maxPrice": 100, "pocket": [ moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 200, "maxPrice": 400, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 400, "maxPrice": 600, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 600, "maxPrice": 800, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 800, "maxPrice": 1000, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 3, "minPrice": 10, "maxPrice": 100, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 4, "minPrice": 100, "maxPrice": 200, "pocket": [ moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 5, "minPrice": 200, "maxPrice": 400, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 6, "minPrice": 400, "maxPrice": 600, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 7, "minPrice": 600, "maxPrice": 1000, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E ] } ] } diff --git a/src/activities/money/resource/n500e.png b/src/activities/money/resource/n500e.png new file mode 100644 index 000000000..3f0d94839 Binary files /dev/null and b/src/activities/money/resource/n500e.png differ diff --git a/src/activities/money_back/resource/1/Data.qml b/src/activities/money_back/resource/1/Data.qml index bd5c2a6aa..8f5b3c933 100644 --- a/src/activities/money_back/resource/1/Data.qml +++ b/src/activities/money_back/resource/1/Data.qml @@ -1,192 +1,170 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to calculate change when amount paid is upto 25 units") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to calculate change when amount paid is upto 10 units") + property var moneyItems: MoneyConstants.moneyItems data: [ + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 2, + "paid": 3, + "pocket": [ + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E + ] + }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 3, - "paid": 10, + "paid": 5, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 5, - "paid": 10, + "maxPrice": 4, + "paid": 5, "pocket": [ - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 8, - "paid": 10, + "maxPrice": 5, + "paid": 7, "pocket": [ - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 10, - "paid": 15, + "maxPrice": 6, + "paid": 7, "pocket": [ - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 12, - "paid": 15, + "maxPrice": 7, + "paid": 10, "pocket": [ moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 15, - "paid": 20, + "maxPrice": 8, + "paid": 10, "pocket": [ - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_50E, - moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_20E, - moneyItems.MONEY_PAPER_20E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 18, - "paid": 20, + "maxPrice": 9, + "paid": 10, "pocket": [ - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_50E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_COIN_1E, - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 20, - "paid": 25, + "maxPrice": 10, + "paid": 11, "pocket": [ - moneyItems.MONEY_PAPER_50E, - moneyItems.MONEY_PAPER_20E, - moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, - moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 22, - "paid": 25, + "maxPrice": 10, + "paid": 15, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, - moneyItems.MONEY_PAPER_50E, - moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E ] } ] } diff --git a/src/activities/money_back/resource/2/Data.qml b/src/activities/money_back/resource/2/Data.qml index cc52945f9..7ca3689a9 100644 --- a/src/activities/money_back/resource/2/Data.qml +++ b/src/activities/money_back/resource/2/Data.qml @@ -1,200 +1,219 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { objective: qsTr("Learn how to calculate change when amount paid is upto 100 units") - property var moneyItems: Constants.moneyItems + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, "maxPrice": 10, "paid": 15, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, ] }, { "numberOfItem": 2, "minPrice": 1, "maxPrice": 15, "paid": 20, "pocket": [ moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 2, "minPrice": 1, "maxPrice": 25, "paid": 30, "pocket": [ moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 3, "minPrice": 1, "maxPrice": 30, "paid": 40, "pocket": [ moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 3, "minPrice": 1, "maxPrice": 40, "paid": 50, "pocket": [ moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E ] }, + { + "numberOfItem": 3, + "minPrice": 1, + "maxPrice": 50, + "paid": 55, + "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] + }, { "numberOfItem": 4, "minPrice": 3, "maxPrice": 60, "paid": 100, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 4, "minPrice": 4, "maxPrice": 70, "paid": 100, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 5, "minPrice": 4, "maxPrice": 80, "paid": 100, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { "numberOfItem": 5, "minPrice": 4, "maxPrice": 99, "paid": 100, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E ] } ] } diff --git a/src/activities/money_back/resource/3/Data.qml b/src/activities/money_back/resource/3/Data.qml index fc3ea7acb..0877aa274 100644 --- a/src/activities/money_back/resource/3/Data.qml +++ b/src/activities/money_back/resource/3/Data.qml @@ -1,133 +1,251 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to calculate change when amount paid is upto 400 units") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to calculate change when amount paid is upto 1000 units") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, "maxPrice": 49, "paid": 50, "pocket": [ moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, ] }, { - "numberOfItem": 2, - "minPrice": 50, + "numberOfItem": 1, + "minPrice": 10, "maxPrice": 99, "paid": 100, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { - "numberOfItem": 3, - "minPrice": 100, + "numberOfItem": 2, + "minPrice": 10, "maxPrice": 199, "paid": 200, "pocket": [ moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { - "numberOfItem": 4, - "minPrice": 200, + "numberOfItem": 2, + "minPrice": 10, "maxPrice": 299, "paid": 300, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E ] }, { - "numberOfItem": 5, - "minPrice": 300, + "numberOfItem": 3, + "minPrice": 10, "maxPrice": 399, "paid": 400, "pocket": [ moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 499, + "paid": 500, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 599, + "paid": 600, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 699, + "paid": 700, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 4, + "minPrice": 10, + "maxPrice": 899, + "paid": 1000, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 4, + "minPrice": 10, + "maxPrice": 999, + "paid": 1000, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E + ] } ] } diff --git a/src/activities/money_back_cents/resource/1/Data.qml b/src/activities/money_back_cents/resource/1/Data.qml index bcff11f2c..97d4e7407 100644 --- a/src/activities/money_back_cents/resource/1/Data.qml +++ b/src/activities/money_back_cents/resource/1/Data.qml @@ -1,126 +1,253 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to calculate change including cents when amount paid is upto 5 units") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to calculate change including cents when amount paid is upto 10 units") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 2, "paid": 5, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 1, "minPrice": 1, "maxPrice": 3, "paid": 5, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 2, + "numberOfItem": 1, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 4, "paid": 5, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 3, + "numberOfItem": 1, "minPrice": 1, - "maxPrice": 3, - "paid": 5, + "maxPrice": 5, + "paid": 7, "pocket": [ moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 4, - "minPrice": 0, - "maxPrice": 4, - "paid": 5, + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 6, + "paid": 7, + "pocket": [ + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 7, + "paid": 10, "pocket": [ + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 8, + "paid": 10, + "pocket": [ moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 9, + "paid": 10, + "pocket": [ + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 10, + "paid": 11, + "pocket": [ + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 10, + "paid": 15, + "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] } ] } diff --git a/src/activities/money_back_cents/resource/2/Data.qml b/src/activities/money_back_cents/resource/2/Data.qml index 3827380a0..88e253c4e 100644 --- a/src/activities/money_back_cents/resource/2/Data.qml +++ b/src/activities/money_back_cents/resource/2/Data.qml @@ -1,136 +1,299 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to calculate change including cents when amount paid is upto 30 units") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to calculate change including cents when amount paid is upto 100 units") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 9, - "paid": 10, + "maxPrice": 10, + "paid": 15, "pocket": [ + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 1, + "numberOfItem": 2, "minPrice": 5, - "maxPrice": 14, - "paid": 15, + "maxPrice": 15, + "paid": 20, "pocket": [ + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 2, "minPrice": 10, - "maxPrice": 19, - "paid": 20, + "maxPrice": 25, + "paid": 30, "pocket": [ + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 3, - "minPrice": 15, - "maxPrice": 24, - "paid": 25, + "minPrice": 10, + "maxPrice": 30, + "paid": 40, "pocket": [ + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 40, + "paid": 50, + "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 50, + "paid": 55, + "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 60, + "paid": 100, + "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 70, + "paid": 100, + "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 4, - "minPrice": 20, - "maxPrice": 29, - "paid": 30, + "minPrice": 10, + "maxPrice": 80, + "paid": 100, "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 4, + "minPrice": 10, + "maxPrice": 99, + "paid": 100, + "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] } ] } diff --git a/src/activities/money_back_cents/resource/3/Data.qml b/src/activities/money_back_cents/resource/3/Data.qml index d84b5b514..26c232d01 100644 --- a/src/activities/money_back_cents/resource/3/Data.qml +++ b/src/activities/money_back_cents/resource/3/Data.qml @@ -1,151 +1,299 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to calculate change including cents when amount paid is upto 300 units") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to calculate change including cents when amount paid is upto 1000 units") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, - "minPrice": 30, - "maxPrice": 39, - "paid": 40, + "minPrice": 1, + "maxPrice": 49, + "paid": 50, "pocket": [ - moneyItems.MONEY_PAPER_20E, - moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 1, - "minPrice": 40, - "maxPrice": 49, - "paid": 50, + "minPrice": 10, + "maxPrice": 99, + "paid": 100, + "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 2, + "minPrice": 10, + "maxPrice": 199, + "paid": 200, "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 2, + "minPrice": 10, + "maxPrice": 299, + "paid": 300, + "pocket": [ + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 2, - "minPrice": 50, - "maxPrice": 70, - "paid": 100, + "minPrice": 10, + "maxPrice": 399, + "paid": 400, "pocket": [ - moneyItems.MONEY_PAPER_50E, - moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 3, - "minPrice": 100, - "maxPrice": 199, - "paid": 200, + "minPrice": 10, + "maxPrice": 499, + "paid": 500, "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, - moneyItems.MONEY_PAPER_100E, - moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 3, + "minPrice": 10, + "maxPrice": 599, + "paid": 600, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 4, - "minPrice": 200, - "maxPrice": 299, - "paid": 300, + "minPrice": 10, + "maxPrice": 699, + "paid": 700, "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_200E, moneyItems.MONEY_PAPER_100E, - moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 4, + "minPrice": 10, + "maxPrice": 999, + "paid": 1000, + "pocket": [ + moneyItems.MONEY_PAPER_500E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] } ] } diff --git a/src/activities/money_cents/resource/1/Data.qml b/src/activities/money_cents/resource/1/Data.qml index 333c711ad..5f1840ef8 100644 --- a/src/activities/money_cents/resource/1/Data.qml +++ b/src/activities/money_cents/resource/1/Data.qml @@ -1,117 +1,162 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to pay up to 5 units including cents") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to pay up to 10 units including cents") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 4, "pocket": [ + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 1, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 5, "pocket": [ + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 2, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 6, "pocket": [ moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 3, "minPrice": 1, - "maxPrice": 3, + "maxPrice": 7, "pocket": [ + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 4, - "minPrice": 0, - "maxPrice": 4, + "minPrice": 1, + "maxPrice": 8, + "pocket": [ + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 4, + "minPrice": 1, + "maxPrice": 9, + "pocket": [ + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 4, + "minPrice": 1, + "maxPrice": 10, "pocket": [ + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] } ] } diff --git a/src/activities/money_cents/resource/2/Data.qml b/src/activities/money_cents/resource/2/Data.qml index b59a507c4..5c481a563 100644 --- a/src/activities/money_cents/resource/2/Data.qml +++ b/src/activities/money_cents/resource/2/Data.qml @@ -1,128 +1,255 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to pay up to 30 units including cents") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to pay up to 100 units including cents") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, - "minPrice": 1, - "maxPrice": 5, + "minPrice": 3, + "maxPrice": 10, "pocket": [ + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 1, - "minPrice": 5, - "maxPrice": 10, + "minPrice": 10, + "maxPrice": 20, + "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 1, + "minPrice": 20, + "maxPrice": 30, + "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 1, + "minPrice": 30, + "maxPrice": 60, "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 1, + "minPrice": 60, + "maxPrice": 100, + "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 2, "minPrice": 10, - "maxPrice": 15, + "maxPrice": 20, "pocket": [ moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 3, - "minPrice": 15, - "maxPrice": 20, + "minPrice": 20, + "maxPrice": 30, "pocket": [ moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C + moneyItems.MONEY_COIN_1C, ] }, { "numberOfItem": 4, - "minPrice": 20, - "maxPrice": 30, + "minPrice": 30, + "maxPrice": 60, "pocket": [ moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C, + ] + }, + { + "numberOfItem": 4, + "minPrice": 60, + "maxPrice": 100, + "pocket": [ + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, moneyItems.MONEY_COIN_1C, ] } ] } diff --git a/src/activities/money_cents/resource/3/Data.qml b/src/activities/money_cents/resource/3/Data.qml index 4e48e77c0..6362bf474 100644 --- a/src/activities/money_cents/resource/3/Data.qml +++ b/src/activities/money_cents/resource/3/Data.qml @@ -1,188 +1,308 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../../core" -import "../../../money/moneyConstants.js" as Constants +import "../../../money/moneyConstants.js" as MoneyConstants Dataset { - objective: qsTr("Learn how to pay up to 300 units including cents") - property var moneyItems: Constants.moneyItems + objective: qsTr("Learn how to pay up to 1000 units including cents") + property var moneyItems: MoneyConstants.moneyItems data: [ { "numberOfItem": 1, - "minPrice": 20, - "maxPrice": 30, + "minPrice": 10, + "maxPrice": 100, "pocket": [ + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 1, - "minPrice": 30, - "maxPrice": 40, + "minPrice": 200, + "maxPrice": 400, "pocket": [ + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 2, - "minPrice": 40, - "maxPrice": 50, + "numberOfItem": 1, + "minPrice": 400, + "maxPrice": 600, "pocket": [ - moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 2, - "minPrice": 50, - "maxPrice": 80, + "numberOfItem": 1, + "minPrice": 600, + "maxPrice": 800, "pocket": [ + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, + moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 1, + "minPrice": 800, + "maxPrice": 1000, + "pocket": [ + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 2, + "minPrice": 10, + "maxPrice": 100, + "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 3, - "minPrice": 70, - "maxPrice": 120, + "numberOfItem": 2, + "minPrice": 100, + "maxPrice": 200, "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_PAPER_5E, moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { "numberOfItem": 3, - "minPrice": 120, - "maxPrice": 200, + "minPrice": 200, + "maxPrice": 400, "pocket": [ moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_100E, + moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, - moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] }, { - "numberOfItem": 4, - "minPrice": 200, - "maxPrice": 300, + "numberOfItem": 3, + "minPrice": 400, + "maxPrice": 600, "pocket": [ moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_100E, moneyItems.MONEY_PAPER_50E, moneyItems.MONEY_PAPER_20E, moneyItems.MONEY_PAPER_10E, - moneyItems.MONEY_PAPER_5E, - moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_2E, moneyItems.MONEY_COIN_1E, moneyItems.MONEY_COIN_5C, moneyItems.MONEY_COIN_2C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_50C, moneyItems.MONEY_COIN_20C, moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C + ] + }, + { + "numberOfItem": 4, + "minPrice": 800, + "maxPrice": 1000, + "pocket": [ + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_200E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_PAPER_20E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_5C, + moneyItems.MONEY_COIN_2C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_50C, + moneyItems.MONEY_COIN_20C, + moneyItems.MONEY_COIN_10C, moneyItems.MONEY_COIN_1C, + moneyItems.MONEY_COIN_1C ] } ] }