diff --git a/src/activities/money/ActivityInfo.qml b/src/activities/money/ActivityInfo.qml --- a/src/activities/money/ActivityInfo.qml +++ b/src/activities/money/ActivityInfo.qml @@ -37,4 +37,5 @@ credit: "" section: "math numeration money" createdInVersion: 0 + levels: "1,2" } diff --git a/src/activities/money/CMakeLists.txt b/src/activities/money/CMakeLists.txt --- a/src/activities/money/CMakeLists.txt +++ b/src/activities/money/CMakeLists.txt @@ -1 +1 @@ -GCOMPRIS_ADD_RCC(activities/money *.qml *.svg *.js resource/*) +GCOMPRIS_ADD_RCC(activities/money *.qml *.svg *.js resource/* resource/*/*/*.qml) diff --git a/src/activities/money/MoneyArea.qml b/src/activities/money/MoneyArea.qml --- a/src/activities/money/MoneyArea.qml +++ b/src/activities/money/MoneyArea.qml @@ -63,7 +63,7 @@ id: pocket model: ListModel { id: pocketModel } Image { - source: Activity.url + img + source: img sourceSize.height: columnLayout.itemHeight height: columnLayout.itemHeight diff --git a/src/activities/money/MoneyCore.qml b/src/activities/money/MoneyCore.qml --- a/src/activities/money/MoneyCore.qml +++ b/src/activities/money/MoneyCore.qml @@ -56,6 +56,7 @@ 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 @@ -135,7 +136,7 @@ Repeater { id: tuxMoney Image { - source: Activity.url + modelData.img + source: modelData.img sourceSize.height: columnLayout.itemStoreHeight * 0.4 x: tux.x + index * 20 y: tux.y + tux.height / 2 + index * 20 @@ -146,7 +147,7 @@ Repeater { id: store Image { - source: Activity.url + modelData.img + source: modelData.img sourceSize.height: columnLayout.itemStoreHeight sourceSize.width: columnLayout.itemStoreHeight GCText { diff --git a/src/activities/money/money.js b/src/activities/money/money.js --- a/src/activities/money/money.js +++ b/src/activities/money/money.js @@ -23,546 +23,12 @@ .import "qrc:/gcompris/src/core/core.js" as Core .import GCompris 1.0 as GCompris +.import "moneyConstants.js" as Constants + 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 cheapObjects = [ - "apple.svg", - "orange.svg", - "banane.svg", - "pamplemousse.svg", - "carot.svg", - "cerise.svg", - "cake.svg" - ] - -var normalObjects = [ - "umbrella.svg", - "pencil.svg", - "bottle.svg", - "light.svg", - "eggpot.svg" - ] - -var expensiveObjects = [ - "lamp.svg", - "football.svg", - "bicycle.svg" - ] - -var moneyItems = { - MONEY_EURO_COIN_1C: { img: "c1c.svg", val: 0.01 }, - MONEY_EURO_COIN_2C: { img: "c2c.svg", val: 0.02 }, - MONEY_EURO_COIN_5C: { img: "c5c.svg", val: 0.05 }, - MONEY_EURO_COIN_10C: { img: "c10c.svg", val: 0.1 }, - MONEY_EURO_COIN_20C: { img: "c20c.svg", val: 0.20 }, - MONEY_EURO_COIN_50C: { img: "c50c.svg", val: 0.5 }, - MONEY_EURO_COIN_1E: { img: "c1e.svg", val: 1.0 }, - MONEY_EURO_COIN_2E: { img: "c2e.svg", val: 2.0 }, - MONEY_EURO_PAPER_5E: { img: "n5e.svg", val: 5.0 }, - MONEY_EURO_PAPER_10E: { img: "n10e.svg", val: 10.0 }, - MONEY_EURO_PAPER_20E: { img: "n20e.svg", val: 20.0 }, - MONEY_EURO_PAPER_50E: { img: "n50e.svg", val: 50.0 }, -} - -var fullDataset = { - WITHOUT_CENTS: [ - { - numberOfItem: 1, - minPrice: 3, - maxPrice: 10, - pocket: [ - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 1, - minPrice: 10, - maxPrice: 20, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 2, - minPrice: 20, - maxPrice: 30, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 2, - minPrice: 30, - maxPrice: 40, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 3, - minPrice: 40, - maxPrice: 50, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 3, - minPrice: 50, - maxPrice: 60, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 60, - maxPrice: 70, - pocket: [ - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 70, - maxPrice: 80, - pocket: [ - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 50, - maxPrice: 100, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E - ] - } - ], - - WITH_CENTS: [ - { - numberOfItem: 1, - minPrice: 1, - maxPrice: 3, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C, - ] - }, - { - numberOfItem: 1, - minPrice: 1, - maxPrice: 3, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 2, - minPrice: 1, - maxPrice: 3, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C, - ] - }, - { - numberOfItem: 3, - minPrice: 1, - maxPrice: 3, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 4, - minPrice: 0, - maxPrice: 4, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C, - ] - } - ], - - BACK_WITHOUT_CENTS: [ - { - numberOfItem: 1, - minPrice: 3, - maxPrice: 9, - paid: 10, - pocket: [ - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - ] - }, - { - numberOfItem: 1, - minPrice: 1, - maxPrice: 19, - paid: 20, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 2, - minPrice: 2, - maxPrice: 29, - paid: 30, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 2, - minPrice: 2, - maxPrice: 39, - paid: 40, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 3, - minPrice: 3, - maxPrice: 49, - paid: 50, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 3, - minPrice: 3, - maxPrice: 60, - paid: 100, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 4, - maxPrice: 70, - paid: 100, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 4, - maxPrice: 80, - paid: 100, - pocket: [ - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E - ] - }, - { - numberOfItem: 4, - minPrice: 4, - maxPrice: 99, - paid: 100, - pocket: [ - moneyItems.MONEY_EURO_PAPER_10E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_PAPER_50E, - moneyItems.MONEY_EURO_PAPER_20E, - moneyItems.MONEY_EURO_PAPER_5E, - moneyItems.MONEY_EURO_PAPER_5E - ] - } - ], - - BACK_WITH_CENTS: [ - { - numberOfItem: 1, - minPrice: 1, - maxPrice: 3, - paid: 5, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 1, - minPrice: 1, - maxPrice: 3, - paid: 5, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 2, - minPrice: 1, - maxPrice: 3, - paid: 5, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 3, - minPrice: 1, - maxPrice: 3, - paid: 5, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - }, - { - numberOfItem: 4, - minPrice: 0, - maxPrice: 4, - paid: 5, - pocket: [ - moneyItems.MONEY_EURO_COIN_2E, - moneyItems.MONEY_EURO_COIN_1E, - moneyItems.MONEY_EURO_COIN_5C, - moneyItems.MONEY_EURO_COIN_2C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_50C, - moneyItems.MONEY_EURO_COIN_20C, - moneyItems.MONEY_EURO_COIN_10C, - moneyItems.MONEY_EURO_COIN_1C, - moneyItems.MONEY_EURO_COIN_1C - ] - } - ] -} var currentLevel var numberOfLevel @@ -574,30 +40,25 @@ function start(items_, datasetName) { items = items_ - + dataset = items.levels switch(datasetName) { - case "WITHOUT_CENTS": - dataset = fullDataset.WITHOUT_CENTS - centsMode = false - backMode = false + case "WITHOUT_CENTS": + centsMode = false + backMode = false break - case "WITH_CENTS": - dataset = fullDataset.WITH_CENTS - centsMode = true - backMode = false + case "WITH_CENTS": + centsMode = true + backMode = false break - case "BACK_WITHOUT_CENTS": - dataset = fullDataset.BACK_WITHOUT_CENTS - centsMode = false - backMode = true + case "BACK_WITHOUT_CENTS": + centsMode = false + backMode = true break - case "BACK_WITH_CENTS": - dataset = fullDataset.BACK_WITH_CENTS - centsMode = true - backMode = true + case "BACK_WITH_CENTS": + centsMode = true + backMode = true break } - currentLevel = 0 numberOfLevel = dataset.length initLevel() @@ -608,7 +69,6 @@ function initLevel() { items.bar.level = currentLevel + 1 - items.answerModel.clear() items.pocketModel.clear() @@ -668,25 +128,25 @@ var tuxMoney switch(data.paid) { case 5: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_5E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_5E] break case 10: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_10E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_10E] break case 20: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_20E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_20E] break case 30: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_20E, moneyItems.MONEY_EURO_PAPER_10E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_20E, Constants.moneyItems.MONEY_PAPER_10E] break case 40: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_20E, moneyItems.MONEY_EURO_PAPER_20E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_20E, Constants.moneyItems.MONEY_PAPER_20E] break case 50: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_50E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_50E] break case 100: - tuxMoney = [moneyItems.MONEY_EURO_PAPER_50E, moneyItems.MONEY_EURO_PAPER_50E] + tuxMoney = [Constants.moneyItems.MONEY_PAPER_50E, Constants.moneyItems.MONEY_PAPER_50E] break } items.tuxMoney.model = tuxMoney @@ -722,11 +182,11 @@ function getRandomObject(price) { var list if(price < 5) - list = cheapObjects + list = Constants.cheapObjects else if(price < 10) - list = normalObjects + list = Constants.normalObjects else - list = expensiveObjects + list = Constants.expensiveObjects return list[Math.floor(Math.random() * list.length)] } diff --git a/src/activities/money/moneyConstants.js b/src/activities/money/moneyConstants.js new file mode 100644 --- /dev/null +++ b/src/activities/money/moneyConstants.js @@ -0,0 +1,59 @@ +/* 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 }, +} diff --git a/src/activities/money/resource/1/Data.qml b/src/activities/money/resource/1/Data.qml new file mode 100644 --- /dev/null +++ b/src/activities/money/resource/1/Data.qml @@ -0,0 +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 + +Dataset { + objective: qsTr("Learn how to pay up to 10 euros") + property var moneyItems: Constants.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 new file mode 100644 --- /dev/null +++ b/src/activities/money/resource/2/Data.qml @@ -0,0 +1,180 @@ +/* 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 + +Dataset { + objective: qsTr("Learn how to pay up to 100 euros") + property var moneyItems: Constants.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": 2, + "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": 2, + "minPrice": 30, + "maxPrice": 40, + "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": 3, + "minPrice": 40, + "maxPrice": 50, + "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": 3, + "minPrice": 50, + "maxPrice": 60, + "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": 60, + "maxPrice": 70, + "pocket": [ + 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": 4, + "minPrice": 70, + "maxPrice": 80, + "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_20E, + 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": 4, + "minPrice": 50, + "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_back/ActivityInfo.qml b/src/activities/money_back/ActivityInfo.qml --- a/src/activities/money_back/ActivityInfo.qml +++ b/src/activities/money_back/ActivityInfo.qml @@ -37,4 +37,5 @@ credit: "" section: "math numeration money" createdInVersion: 0 + levels: "1" } diff --git a/src/activities/money_back/CMakeLists.txt b/src/activities/money_back/CMakeLists.txt --- a/src/activities/money_back/CMakeLists.txt +++ b/src/activities/money_back/CMakeLists.txt @@ -1 +1 @@ -GCOMPRIS_ADD_RCC(activities/money_back *.qml *.svg *.js resource/*) +GCOMPRIS_ADD_RCC(activities/money_back *.qml *.svg *.js resource/* resource/*/*/*.qml) diff --git a/src/activities/money_back/resource/1/Data.qml b/src/activities/money_back/resource/1/Data.qml new file mode 100644 --- /dev/null +++ b/src/activities/money_back/resource/1/Data.qml @@ -0,0 +1,190 @@ +/* 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 + +Dataset { + objective: qsTr("Learn how to pay up to 100 euros including cents") + property var moneyItems: Constants.moneyItems + data: [ + { + "numberOfItem": 1, + "minPrice": 3, + "maxPrice": 9, + "paid": 10, + "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, + ] + }, + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 19, + "paid": 20, + "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": 2, + "maxPrice": 29, + "paid": 30, + "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": 2, + "minPrice": 2, + "maxPrice": 39, + "paid": 40, + "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": 3, + "minPrice": 3, + "maxPrice": 49, + "paid": 50, + "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": 3, + "minPrice": 3, + "maxPrice": 60, + "paid": 100, + "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_COIN_1E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 4, + "minPrice": 4, + "maxPrice": 70, + "paid": 100, + "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_PAPER_5E, + moneyItems.MONEY_COIN_2E, + moneyItems.MONEY_COIN_1E, + moneyItems.MONEY_COIN_1E + ] + }, + { + "numberOfItem": 4, + "minPrice": 4, + "maxPrice": 80, + "paid": 100, + "pocket": [ + 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": 4, + "minPrice": 4, + "maxPrice": 99, + "paid": 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_back_cents/ActivityInfo.qml b/src/activities/money_back_cents/ActivityInfo.qml --- a/src/activities/money_back_cents/ActivityInfo.qml +++ b/src/activities/money_back_cents/ActivityInfo.qml @@ -37,4 +37,5 @@ credit: "" section: "math numeration money" createdInVersion: 0 + levels: "1" } diff --git a/src/activities/money_back_cents/CMakeLists.txt b/src/activities/money_back_cents/CMakeLists.txt --- a/src/activities/money_back_cents/CMakeLists.txt +++ b/src/activities/money_back_cents/CMakeLists.txt @@ -1 +1 @@ -GCOMPRIS_ADD_RCC(activities/money_back_cents *.qml *.svg *.js resource/*) +GCOMPRIS_ADD_RCC(activities/money_back_cents *.qml *.svg *.js resource/* resource/*/*/*.qml) diff --git a/src/activities/money_back_cents/resource/1/Data.qml b/src/activities/money_back_cents/resource/1/Data.qml new file mode 100644 --- /dev/null +++ b/src/activities/money_back_cents/resource/1/Data.qml @@ -0,0 +1,121 @@ +/* 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 + +Dataset { + objective: qsTr("Learn how to pay up to 10 euros giving back the change") + property var moneyItems: Constants.moneyItems + data: [ + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 3, + "paid": 5, + "pocket": [ + 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_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, + "paid": 5, + "pocket": [ + 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": 3, + "minPrice": 1, + "maxPrice": 3, + "paid": 5, + "pocket": [ + 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": 0, + "maxPrice": 4, + "paid": 5, + "pocket": [ + 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/ActivityInfo.qml b/src/activities/money_cents/ActivityInfo.qml --- a/src/activities/money_cents/ActivityInfo.qml +++ b/src/activities/money_cents/ActivityInfo.qml @@ -37,4 +37,5 @@ credit: "" section: "math numeration money" createdInVersion: 0 + levels: "1" } diff --git a/src/activities/money_cents/CMakeLists.txt b/src/activities/money_cents/CMakeLists.txt --- a/src/activities/money_cents/CMakeLists.txt +++ b/src/activities/money_cents/CMakeLists.txt @@ -1 +1 @@ -GCOMPRIS_ADD_RCC(activities/money_cents *.qml *.svg *.js resource/*) +GCOMPRIS_ADD_RCC(activities/money_cents *.qml *.svg *.js resource/* resource/*/*/*.qml) diff --git a/src/activities/money_cents/resource/1/Data.qml b/src/activities/money_cents/resource/1/Data.qml new file mode 100644 --- /dev/null +++ b/src/activities/money_cents/resource/1/Data.qml @@ -0,0 +1,117 @@ +/* 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 + + +Dataset { + objective: qsTr("Learn how to pay up to 10 euros giving back the change, including cents") + property var moneyItems: Constants.moneyItems + data: [ + { + "numberOfItem": 1, + "minPrice": 1, + "maxPrice": 3, + "pocket": [ + 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, + "pocket": [ + 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, + "pocket": [ + 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": 3, + "minPrice": 1, + "maxPrice": 3, + "pocket": [ + 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": 0, + "maxPrice": 4, + "pocket": [ + 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, + ] + } + ] +}