diff --git a/src/activities/money_cents/ActivityInfo.qml b/src/activities/money_cents/ActivityInfo.qml index a094ec672..301c533ac 100644 --- a/src/activities/money_cents/ActivityInfo.qml +++ b/src/activities/money_cents/ActivityInfo.qml @@ -1,41 +1,41 @@ /* GCompris - ActivityInfo.qml * * Copyright (C) 2015 Bruno Coudoin * * 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 GCompris 1.0 ActivityInfo { name: "money_cents/MoneyCents.qml" difficulty: 5 icon: "money_cents/money_cents.svg" author: "Bruno Coudoin <bruno.coudoin@gcompris.net>" demo: false //: Activity title title: qsTr("Money with cents") //: Help title description: qsTr("Practice money usage including cents") // intro: "Click on the money to pay." //: Help goal goal: qsTr("You must buy the different items and give the exact price. At higher levels, several items are displayed, and you must first calculate the total price.") //: Help prerequisite prerequisite: qsTr("Can count") //: Help manual manual: 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.") credit: "" section: "math money measures" createdInVersion: 0 - levels: "1" + levels: "1,2,3" } diff --git a/src/activities/money_cents/resource/1/Data.qml b/src/activities/money_cents/resource/1/Data.qml index 0d3ebaade..333c711ad 100644 --- a/src/activities/money_cents/resource/1/Data.qml +++ b/src/activities/money_cents/resource/1/Data.qml @@ -1,117 +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") + objective: qsTr("Learn how to pay up to 5 units 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, ] } ] } diff --git a/src/activities/money_cents/resource/1/Data.qml b/src/activities/money_cents/resource/2/Data.qml similarity index 82% copy from src/activities/money_cents/resource/1/Data.qml copy to src/activities/money_cents/resource/2/Data.qml index 0d3ebaade..b59a507c4 100644 --- a/src/activities/money_cents/resource/1/Data.qml +++ b/src/activities/money_cents/resource/2/Data.qml @@ -1,117 +1,128 @@ /* 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") + objective: qsTr("Learn how to pay up to 30 units including cents") property var moneyItems: Constants.moneyItems data: [ { "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": 1, - "minPrice": 1, - "maxPrice": 3, + "minPrice": 5, + "maxPrice": 10, "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": 2, - "minPrice": 1, - "maxPrice": 3, + "minPrice": 10, + "maxPrice": 15, "pocket": [ + moneyItems.MONEY_PAPER_10E, + 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": 3, - "minPrice": 1, - "maxPrice": 3, + "minPrice": 15, + "maxPrice": 20, "pocket": [ + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + 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": 0, - "maxPrice": 4, + "minPrice": 20, + "maxPrice": 30, "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_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/3/Data.qml similarity index 52% copy from src/activities/money_cents/resource/1/Data.qml copy to src/activities/money_cents/resource/3/Data.qml index 0d3ebaade..4e48e77c0 100644 --- a/src/activities/money_cents/resource/1/Data.qml +++ b/src/activities/money_cents/resource/3/Data.qml @@ -1,117 +1,188 @@ /* 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") + objective: qsTr("Learn how to pay up to 300 units including cents") property var moneyItems: Constants.moneyItems data: [ { "numberOfItem": 1, - "minPrice": 1, - "maxPrice": 3, + "minPrice": 20, + "maxPrice": 30, "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_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, + "minPrice": 30, + "maxPrice": 40, "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_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, + "pocket": [ + moneyItems.MONEY_PAPER_20E, + 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_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, + "minPrice": 50, + "maxPrice": 80, "pocket": [ + moneyItems.MONEY_PAPER_50E, + moneyItems.MONEY_PAPER_10E, + moneyItems.MONEY_PAPER_5E, + moneyItems.MONEY_PAPER_5E, + 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": 3, - "minPrice": 1, - "maxPrice": 3, + "minPrice": 70, + "maxPrice": 120, "pocket": [ + 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_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, + "pocket": [ + 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_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, + "minPrice": 200, + "maxPrice": 300, "pocket": [ + moneyItems.MONEY_PAPER_200E, + 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_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, ] } ] }