diff --git a/README.md b/README.md index 13f3840..7ec703e 100644 --- a/README.md +++ b/README.md @@ -72,23 +72,29 @@ In Calories tracker you can add your own products and you can share them with us Changelog ========= +0.8.0 + * Removed caloriestracker_init. Now you can create a new database from login. + * Added sugar to meals tables. + * Now you can move all data from a personal product to an existing system one. + * Fixed bugs with empty databases. + 0.7.0 - * Food types are now ordered by translated name - * Fixed bug deleting a user + * Food types are now ordered by translated name. + * Fixed bug deleting a user. * Added a combobox to filter products by personal, system and elaborated types. * Added meals and foodtype pies. - * Added curiosities - * Added daily meal evolution chart - * Calcium component has been added to products - * Added copy and paste meals + * Added curiosities. + * Added daily meal evolution chart. + * Calcium component has been added to products. + * Added copy and paste meals. 0.6.0 * You can see all products of a company in companies list. * You can see a system products without editing. - * Update a lot files from reusingcode project - * Added food types - * Added additives - * Added russian translations. Thanks DankanTsar + * Update a lot files from reusingcode project. + * Added food types. + * Added additives. + * Added russian translations. Thanks DankanTsar. * Added product mantainer mode. Only for developers. * Added more products. * Added glutenfree field. diff --git a/caloriestracker/i18n/caloriestracker_en.ts b/caloriestracker/i18n/caloriestracker_en.ts index e4369e7..af84065 100644 --- a/caloriestracker/i18n/caloriestracker_en.ts +++ b/caloriestracker/i18n/caloriestracker_en.ts @@ -628,6 +628,11 @@ Developed by Mariano Muñoz 2019-{} © + + + Calories Tracker have been correctly installed. Please login again + + MemCaloriestracker @@ -860,7 +865,7 @@ cmbManagerSelector - + Press to open a manager selector @@ -868,12 +873,12 @@ combo - + Select an option - + No options to select @@ -954,45 +959,90 @@ frmAccess - + Language - + Server - + Port - + Database - + User - + Password - + Log in PostreSQL database - + Error conecting to {} database in {} server + + + Select a profile + + + + + Create a new profile + + + + + Update current profile name + + + + + Delete current profile + + + + + New Database + + + + + Profile name + + + + + Do you want to create {} database in {}? + + + + + Xulpymoney database already exists + + + + + Error conecting to {} database in {} server, after creating database + + frmBiometricsAdd @@ -1032,20 +1082,25 @@ - + Edit a biometrics information register - + Add a new biometrics information register - + You must select an activity and a weight wish + + + You must add your biometric data + + frmCompaniesAdd @@ -1159,84 +1214,6 @@ - - frmInit - - - Initializating Calories Tracker database - - - - - <html><head/><body><p>Pressing the button below, you will create the database needed to run CaloriesTracker. It'll be created in the language selected</p></body></html> - - - - - Database language - - - - - Server - - - - - 127.0.0.1 - - - - - Port - - - - - 5432 - - - - - User - - - - - postgres - - - - - Password - - - - - Database - - - - - caloriestracker - - - - - Create database - - - - - Do you want to create {} database in {}? - - - - - Database created. Please run Calories Tracker and login - - - frmMain @@ -1766,11 +1743,6 @@ Select product additives - - - You neet to set a food type - - Gluten free @@ -1801,6 +1773,11 @@ Calcium + + + You need to set a food type + + frmProductsElaboratedAdd @@ -1881,7 +1858,7 @@ - You neet to set a food type + You need to set a food type @@ -2017,7 +1994,7 @@ mem - + Please login to the Calories Tracker database @@ -2124,7 +2101,7 @@ - + This action can't be undone. Do you want to delete this record? @@ -2174,21 +2151,26 @@ Do you want to delete this record? Last three years + + + This is your last biometric data. You can't delete + + wdgCuriosities - + Since when there is data in the database? - + Which is the product with highest calories in 100 gramos? - + The product with highest calories is {} with {} calories. @@ -2198,52 +2180,52 @@ Do you want to delete this record? - + When did I have my highest weight? - + My highest weight was {} at {} - + When did I have my lowest weight? - + My lowest weight was {} at {} - + Which is my median weight? - + My median weight is {} - + Which is the meal with highest calories I had eaten? - + The meal with the highest calories I ate was '{}' with '{}' calories. I ate at {}. - + When did I take the highest calories amount in a day? - + The day I took the highest amount of calories was {} and I took {}. @@ -2308,7 +2290,7 @@ Do you want to delete this record? wdgManagerSelector - + Object @@ -2555,7 +2537,7 @@ Do you want to delete this record? - + {} products found @@ -2597,21 +2579,38 @@ Do you want to delete this record? wdgProductsDataMove + + + Moving data between products + + + + + This action can't be undone. +Do you want to continue? + + + + + Move data from personal to system product + + - All product data will be moved from origin product to destiny one. If there are invesments created with origin product, they will be referenced to destiny product. -If origin is a user product, you can delete afterwards, because it won't have any data + Sometimes user creates a personal product that is already created as a system product + +Selecting a system product you can move all data from your person product to it + - - Moving data between products + + Moving data from personal product '{}' to system product '{}' - - This action can't be undone. -Do you want to continue? + + You must select a system product diff --git a/caloriestracker/i18n/caloriestracker_es.qm b/caloriestracker/i18n/caloriestracker_es.qm index e657c40..05d5a68 100644 Binary files a/caloriestracker/i18n/caloriestracker_es.qm and b/caloriestracker/i18n/caloriestracker_es.qm differ diff --git a/caloriestracker/i18n/caloriestracker_es.ts b/caloriestracker/i18n/caloriestracker_es.ts index f36f1a6..1e3e30e 100644 --- a/caloriestracker/i18n/caloriestracker_es.ts +++ b/caloriestracker/i18n/caloriestracker_es.ts @@ -580,15 +580,10 @@ Homemade food Comida casera - - - Peppers from Padrón - - Gin - + Ginebra @@ -598,21 +593,26 @@ Orange - + Naranja Sweet corn - + Maiz dulce White wine - + Vino blanco Bottle + Botella + + + + Peppers from Padrón @@ -628,6 +628,11 @@ Developed by Mariano Muñoz 2019-{} © Desarrollado por Mariano Muñoz 2019-{} © + + + Calories Tracker have been correctly installed. Please login again + Calories Tracker ha sido instalado correctamente. Por favor autentícate otra vez + MemCaloriestracker @@ -726,7 +731,7 @@ Last value - + Último valor @@ -813,12 +818,12 @@ Show chart data - Muestra los datos del gráfico + Muestra los datos del gráfico Hide chart data - Oculta los datos del gráfico + Oculta los datos del gráfico @@ -860,7 +865,7 @@ cmbManagerSelector - + Press to open a manager selector Pulsa para realizar su selección @@ -868,12 +873,12 @@ combo - + Select an option Selecciona una opción - + No options to select No hay opciones para seleccionar @@ -954,45 +959,90 @@ frmAccess - + Language Idioma - + Server Servidor - + Port Puerto - + Database Base de datos - + User Usuario - + Password Contraseña - + Error conecting to {} database in {} server Error al conectar a la base de datos {} del servidor {} - + Log in PostreSQL database Autentícate en la base de datos PostgreSQL + + + Select a profile + + + + + Create a new profile + + + + + Update current profile name + + + + + Delete current profile + + + + + New Database + + + + + Profile name + + + + + Do you want to create {} database in {}? + Quieres crear la base de datos {} en {}? + + + + Xulpymoney database already exists + + + + + Error conecting to {} database in {} server, after creating database + + frmBiometricsAdd @@ -1032,20 +1082,25 @@ Selecciona tu deseo sobre el peso - + Edit a biometrics information register Edita un registro de información biométrica - + Add a new biometrics information register Añade un nuevo registro de información biométrica - + You must select an activity and a weight wish + + + You must add your biometric data + + frmCompaniesAdd @@ -1159,84 +1214,6 @@ https://github.com/turulomio/xulpymoney/wiki - - frmInit - - - Database language - Idioma de la base de datos - - - - Server - Servidor - - - - 127.0.0.1 - 127.0.0.1 - - - - Port - Puerto - - - - 5432 - 5432 - - - - User - Usuario - - - - postgres - postgres - - - - Password - Contraseña - - - - Create database - Crear base de datos - - - - Do you want to create {} database in {}? - Quieres crear la base de datos {} en {}? - - - - Initializating Calories Tracker database - Iniciando la base de datos de Calories Tracker - - - - <html><head/><body><p>Pressing the button below, you will create the database needed to run CaloriesTracker. It'll be created in the language selected</p></body></html> - <html><head/><body><p>Pulsando el botón de abajo crearás la base de datos que se necesita para ejcutar Calories Tracker. Será creada en el idioma seleccionado</p></body></html> - - - - Database - Base de datos - - - - caloriestracker - caloriestracker - - - - Database created. Please run Calories Tracker and login - Base de datos creada. Por favor ejecuta Calories Tracker y autentícate - - frmMain @@ -1766,11 +1743,6 @@ Select product additives Selecciona los aditivos del producto - - - You neet to set a food type - - Gluten free @@ -1801,6 +1773,11 @@ Calcium Calcio + + + You need to set a food type + + frmProductsElaboratedAdd @@ -1881,7 +1858,7 @@ - You neet to set a food type + You need to set a food type @@ -2017,7 +1994,7 @@ mem - + Please login to the Calories Tracker database Por favor autentíquese en la base de datos de Calories Tracker @@ -2124,7 +2101,7 @@ Edita información biométrica - + This action can't be undone. Do you want to delete this record? Esta acción no puede deshacerse. @@ -2175,21 +2152,26 @@ Do you want to delete this record? Last three years Últimos tres años + + + This is your last biometric data. You can't delete + + wdgCuriosities - + Since when there is data in the database? ¿Desde que fecha hay información en la base de datos? - + Which is the product with highest calories in 100 gramos? ¿Cuál es el producto con el mayor número de calorías en 100 gramos? - + The product with highest calories is {} with {} calories. El producto con las calorías más alta es {} con {} calorías. @@ -2199,52 +2181,52 @@ Do you want to delete this record? Curiosidades de Calories Tracker - + When did I have my highest weight? ¿Cuándo tuve mi peso más alto? - + My highest weight was {} at {} Mi peso más alto fue {} en {} - + When did I have my lowest weight? ¿Cuándo tuve mi peso más bajo? - + My lowest weight was {} at {} Mi peso más bajo fue {} en {} - + Which is my median weight? ¿Cuál es la mediana de mi peso? - + My median weight is {} La mediana de mi peso es {} - + Which is the meal with highest calories I had eaten? - + The meal with the highest calories I ate was '{}' with '{}' calories. I ate at {}. - + When did I take the highest calories amount in a day? - + The day I took the highest amount of calories was {} and I took {}. @@ -2296,7 +2278,7 @@ Do you want to delete this record? Sets a null value - + Establece un valor nulo @@ -2304,13 +2286,13 @@ Do you want to delete this record? Select date and time - + Selecciona fecha y hora wdgManagerSelector - + Object Objeto @@ -2428,12 +2410,12 @@ Do you want to delete all meals from selected day? Copy meal - + Copiar comida Paste meal - + Pegar comida @@ -2549,7 +2531,7 @@ Do you want to delete this record? ¿Quieres borrar el registro? - + {} products found {} productos encontrados @@ -2602,21 +2584,38 @@ Do you want to delete this record? wdgProductsDataMove - + Moving data between products Moviendo datos entre productos - + This action can't be undone. Do you want to continue? Esta acción no puede ser deshecha. Quieres continuar? + + + Move data from personal to system product + + - All product data will be moved from origin product to destiny one. If there are invesments created with origin product, they will be referenced to destiny product. -If origin is a user product, you can delete afterwards, because it won't have any data + Sometimes user creates a personal product that is already created as a system product + +Selecting a system product you can move all data from your person product to it + + + + + + Moving data from personal product '{}' to system product '{}' + + + + + You must select a system product diff --git a/caloriestracker/i18n/caloriestracker_fr.ts b/caloriestracker/i18n/caloriestracker_fr.ts index f4207ba..2622c04 100644 --- a/caloriestracker/i18n/caloriestracker_fr.ts +++ b/caloriestracker/i18n/caloriestracker_fr.ts @@ -628,6 +628,11 @@ Developed by Mariano Muñoz 2019-{} © + + + Calories Tracker have been correctly installed. Please login again + + MemCaloriestracker @@ -860,7 +865,7 @@ cmbManagerSelector - + Press to open a manager selector @@ -868,12 +873,12 @@ combo - + Select an option - + No options to select @@ -954,45 +959,90 @@ frmAccess - + Language - + Server - + Port - + Database - + User - + Password - + Error conecting to {} database in {} server - + Log in PostreSQL database + + + Select a profile + + + + + Create a new profile + + + + + Update current profile name + + + + + Delete current profile + + + + + New Database + + + + + Profile name + + + + + Do you want to create {} database in {}? + + + + + Xulpymoney database already exists + + + + + Error conecting to {} database in {} server, after creating database + + frmBiometricsAdd @@ -1032,20 +1082,25 @@ - + Edit a biometrics information register - + Add a new biometrics information register - + You must select an activity and a weight wish + + + You must add your biometric data + + frmCompaniesAdd @@ -1159,84 +1214,6 @@ - - frmInit - - - Database language - - - - - Server - - - - - 127.0.0.1 - - - - - Port - - - - - 5432 - - - - - User - - - - - postgres - - - - - Password - - - - - Create database - - - - - Do you want to create {} database in {}? - - - - - Initializating Calories Tracker database - - - - - <html><head/><body><p>Pressing the button below, you will create the database needed to run CaloriesTracker. It'll be created in the language selected</p></body></html> - - - - - Database - - - - - caloriestracker - - - - - Database created. Please run Calories Tracker and login - - - frmMain @@ -1766,11 +1743,6 @@ Select product additives - - - You neet to set a food type - - Gluten free @@ -1801,6 +1773,11 @@ Calcium + + + You need to set a food type + + frmProductsElaboratedAdd @@ -1881,7 +1858,7 @@ - You neet to set a food type + You need to set a food type @@ -2017,7 +1994,7 @@ mem - + Please login to the Calories Tracker database @@ -2124,7 +2101,7 @@ - + This action can't be undone. Do you want to delete this record? @@ -2174,21 +2151,26 @@ Do you want to delete this record? Last three years + + + This is your last biometric data. You can't delete + + wdgCuriosities - + Since when there is data in the database? - + Which is the product with highest calories in 100 gramos? - + The product with highest calories is {} with {} calories. @@ -2198,52 +2180,52 @@ Do you want to delete this record? - + When did I have my highest weight? - + My highest weight was {} at {} - + When did I have my lowest weight? - + My lowest weight was {} at {} - + Which is my median weight? - + My median weight is {} - + Which is the meal with highest calories I had eaten? - + The meal with the highest calories I ate was '{}' with '{}' calories. I ate at {}. - + When did I take the highest calories amount in a day? - + The day I took the highest amount of calories was {} and I took {}. @@ -2308,7 +2290,7 @@ Do you want to delete this record? wdgManagerSelector - + Object @@ -2545,7 +2527,7 @@ Do you want to delete this record? - + {} products found @@ -2598,20 +2580,37 @@ Do you want to delete this record? wdgProductsDataMove - + Moving data between products - + This action can't be undone. Do you want to continue? + + + Move data from personal to system product + + - All product data will be moved from origin product to destiny one. If there are invesments created with origin product, they will be referenced to destiny product. -If origin is a user product, you can delete afterwards, because it won't have any data + Sometimes user creates a personal product that is already created as a system product + +Selecting a system product you can move all data from your person product to it + + + + + + Moving data from personal product '{}' to system product '{}' + + + + + You must select a system product diff --git a/caloriestracker/i18n/caloriestracker_ro.ts b/caloriestracker/i18n/caloriestracker_ro.ts index 76e9ba3..7724b7d 100644 --- a/caloriestracker/i18n/caloriestracker_ro.ts +++ b/caloriestracker/i18n/caloriestracker_ro.ts @@ -628,6 +628,11 @@ Developed by Mariano Muñoz 2019-{} © + + + Calories Tracker have been correctly installed. Please login again + + MemCaloriestracker @@ -860,7 +865,7 @@ cmbManagerSelector - + Press to open a manager selector @@ -868,12 +873,12 @@ combo - + Select an option - + No options to select @@ -954,45 +959,90 @@ frmAccess - + Language - + Server - + Port - + Database - + User - + Password - + Error conecting to {} database in {} server - + Log in PostreSQL database + + + Select a profile + + + + + Create a new profile + + + + + Update current profile name + + + + + Delete current profile + + + + + New Database + + + + + Profile name + + + + + Do you want to create {} database in {}? + + + + + Xulpymoney database already exists + + + + + Error conecting to {} database in {} server, after creating database + + frmBiometricsAdd @@ -1032,20 +1082,25 @@ - + Edit a biometrics information register - + Add a new biometrics information register - + You must select an activity and a weight wish + + + You must add your biometric data + + frmCompaniesAdd @@ -1159,84 +1214,6 @@ - - frmInit - - - Database language - - - - - Server - - - - - 127.0.0.1 - - - - - Port - - - - - 5432 - - - - - User - - - - - postgres - - - - - Password - - - - - Create database - - - - - Do you want to create {} database in {}? - - - - - Initializating Calories Tracker database - - - - - <html><head/><body><p>Pressing the button below, you will create the database needed to run CaloriesTracker. It'll be created in the language selected</p></body></html> - - - - - Database - - - - - caloriestracker - - - - - Database created. Please run Calories Tracker and login - - - frmMain @@ -1766,11 +1743,6 @@ Select product additives - - - You neet to set a food type - - Gluten free @@ -1801,6 +1773,11 @@ Calcium + + + You need to set a food type + + frmProductsElaboratedAdd @@ -1881,7 +1858,7 @@ - You neet to set a food type + You need to set a food type @@ -2017,7 +1994,7 @@ mem - + Please login to the Calories Tracker database @@ -2124,7 +2101,7 @@ - + This action can't be undone. Do you want to delete this record? @@ -2174,21 +2151,26 @@ Do you want to delete this record? Last three years + + + This is your last biometric data. You can't delete + + wdgCuriosities - + Since when there is data in the database? - + Which is the product with highest calories in 100 gramos? - + The product with highest calories is {} with {} calories. @@ -2198,52 +2180,52 @@ Do you want to delete this record? - + When did I have my highest weight? - + My highest weight was {} at {} - + When did I have my lowest weight? - + My lowest weight was {} at {} - + Which is my median weight? - + My median weight is {} - + Which is the meal with highest calories I had eaten? - + The meal with the highest calories I ate was '{}' with '{}' calories. I ate at {}. - + When did I take the highest calories amount in a day? - + The day I took the highest amount of calories was {} and I took {}. @@ -2308,7 +2290,7 @@ Do you want to delete this record? wdgManagerSelector - + Object @@ -2545,7 +2527,7 @@ Do you want to delete this record? - + {} products found @@ -2598,20 +2580,37 @@ Do you want to delete this record? wdgProductsDataMove - + Moving data between products - + This action can't be undone. Do you want to continue? + + + Move data from personal to system product + + - All product data will be moved from origin product to destiny one. If there are invesments created with origin product, they will be referenced to destiny product. -If origin is a user product, you can delete afterwards, because it won't have any data + Sometimes user creates a personal product that is already created as a system product + +Selecting a system product you can move all data from your person product to it + + + + + + Moving data from personal product '{}' to system product '{}' + + + + + You must select a system product diff --git a/caloriestracker/i18n/caloriestracker_ru.qm b/caloriestracker/i18n/caloriestracker_ru.qm index 33fdbe0..74f7fe7 100644 Binary files a/caloriestracker/i18n/caloriestracker_ru.qm and b/caloriestracker/i18n/caloriestracker_ru.qm differ diff --git a/caloriestracker/i18n/caloriestracker_ru.ts b/caloriestracker/i18n/caloriestracker_ru.ts index f11287d..e697233 100644 --- a/caloriestracker/i18n/caloriestracker_ru.ts +++ b/caloriestracker/i18n/caloriestracker_ru.ts @@ -628,6 +628,11 @@ Developed by Mariano Muñoz 2019-{} © Разработано Mariano Muñoz 2019-{} © + + + Calories Tracker have been correctly installed. Please login again + + MemCaloriestracker @@ -860,7 +865,7 @@ cmbManagerSelector - + Press to open a manager selector @@ -868,12 +873,12 @@ combo - + Select an option Выберите варианты - + No options to select Нечего выбирать @@ -954,45 +959,90 @@ frmAccess - + Language Язык - + Server Сервер - + Port Порт - + Database База данных - + User Пользователь - + Password Пароль - + Error conecting to {} database in {} server Ошибка соединения с базой данных {} yf cthdtht {} - + Log in PostreSQL database Авторизация в базе PostgreSQL + + + Select a profile + + + + + Create a new profile + + + + + Update current profile name + + + + + Delete current profile + + + + + New Database + + + + + Profile name + + + + + Do you want to create {} database in {}? + Хотите ли вы создать базу данных {} в {}? + + + + Xulpymoney database already exists + + + + + Error conecting to {} database in {} server, after creating database + + frmBiometricsAdd @@ -1032,20 +1082,25 @@ Выберите желаемый вес - + Edit a biometrics information register Изменить биометрическую информацию - + Add a new biometrics information register Добавить новую биометрическую информацию - + You must select an activity and a weight wish + + + You must add your biometric data + + frmCompaniesAdd @@ -1159,84 +1214,6 @@ - - frmInit - - - Database language - Язык базы данных - - - - Server - Сервер - - - - 127.0.0.1 - - - - - Port - Порт - - - - 5432 - - - - - User - Пользователь - - - - postgres - - - - - Password - Пароль - - - - Create database - Создать базу данных - - - - Do you want to create {} database in {}? - Хотите ли вы создать базу данных {} в {}? - - - - Initializating Calories Tracker database - Инициализация базы данных Calories Tracker - - - - <html><head/><body><p>Pressing the button below, you will create the database needed to run CaloriesTracker. It'll be created in the language selected</p></body></html> - <html><head/><body><p>Нажимая кнопку ниже - вы создадите базу данных, необходимую для запуска CaloriesTracker. Она будет создана на выбранном языке</p></body></html> - - - - Database - база данных - - - - caloriestracker - - - - - Database created. Please run Calories Tracker and login - База данных создана. Запустите Calories Tracker и авторизуйтесь - - frmMain @@ -1766,11 +1743,6 @@ Select product additives - - - You neet to set a food type - - Gluten free @@ -1801,6 +1773,11 @@ Calcium + + + You need to set a food type + + frmProductsElaboratedAdd @@ -1881,7 +1858,7 @@ - You neet to set a food type + You need to set a food type @@ -2017,7 +1994,7 @@ mem - + Please login to the Calories Tracker database Пожалуйста, авторизуйтесь в базе данных Calories Tracker @@ -2124,7 +2101,7 @@ Править биометрическую информацию - + This action can't be undone. Do you want to delete this record? Это действие не может быть отменено. @@ -2175,21 +2152,26 @@ Do you want to delete this record? Last three years Последние три года + + + This is your last biometric data. You can't delete + + wdgCuriosities - + Since when there is data in the database? С какого момента в базе? - + Which is the product with highest calories in 100 gramos? Какой продукт обладает самой высокой калорийностью на 100 грамм? - + The product with highest calories is {} with {} calories. Продукт с самой высокой калорийностью - это {} с {} калориями. @@ -2199,52 +2181,52 @@ Do you want to delete this record? - + When did I have my highest weight? Когда у меня был самый высокий вес? - + My highest weight was {} at {} Мой самый высокий вес был {} {} - + When did I have my lowest weight? Когда у меня был самый низкий вес? - + My lowest weight was {} at {} Мой самый низкий вес был {} {} - + Which is my median weight? Какой мой медианный вес? - + My median weight is {} Мой медианный вес - {} - + Which is the meal with highest calories I had eaten? - + The meal with the highest calories I ate was '{}' with '{}' calories. I ate at {}. - + When did I take the highest calories amount in a day? - + The day I took the highest amount of calories was {} and I took {}. @@ -2310,7 +2292,7 @@ Do you want to delete this record? wdgManagerSelector - + Object @@ -2550,7 +2532,7 @@ Do you want to delete this record? Вы действительно хотите удалить эту запись? - + {} products found {} продуктов найдено @@ -2603,23 +2585,39 @@ Do you want to delete this record? wdgProductsDataMove - + Moving data between products Перемещение данных между продуктами - + This action can't be undone. Do you want to continue? Это действие не может быть отменено. Вы хотите продолжить? + + + Move data from personal to system product + + - All product data will be moved from origin product to destiny one. If there are invesments created with origin product, they will be referenced to destiny product. -If origin is a user product, you can delete afterwards, because it won't have any data - Все данные о продукте будут перенесены из исходного продукта в конечный. Если есть инвестиции, созданные с оригинальным продуктом, они будут привязаны к результирующему продукту. -Если исходный продукт является пользовательским продуктом, вы можете удалить его позже, потому что он не будет иметь никаких данных + Sometimes user creates a personal product that is already created as a system product + +Selecting a system product you can move all data from your person product to it + + + + + + Moving data from personal product '{}' to system product '{}' + + + + + You must select a system product + diff --git a/caloriestracker/ui/frmProductsAdd.py b/caloriestracker/ui/frmProductsAdd.py index 94b7eb2..3c6d019 100644 --- a/caloriestracker/ui/frmProductsAdd.py +++ b/caloriestracker/ui/frmProductsAdd.py @@ -120,7 +120,7 @@ def on_bb_accepted(self): company=None if cmb_index==-1 else self.mem.data.companies.find_by_string_id(self.cmbCompanies.itemData(cmb_index)) foodtype=None if self.cmbFoodtypes.currentIndex()==-1 else self.mem.data.foodtypes.find_by_id(self.cmbFoodtypes.itemData(self.cmbFoodtypes.currentIndex())) if foodtype==None: - qmessagebox(self.tr("You neet to set a food type"), ":/caloriestracker/book.png") + qmessagebox(self.tr("You need to set a food type"), ":/caloriestracker/book.png") return system_company=None if company==None else company.system_company if self.product==None: diff --git a/caloriestracker/ui/frmProductsElaboratedAdd.py b/caloriestracker/ui/frmProductsElaboratedAdd.py index 0205b9e..9c27acf 100644 --- a/caloriestracker/ui/frmProductsElaboratedAdd.py +++ b/caloriestracker/ui/frmProductsElaboratedAdd.py @@ -111,7 +111,7 @@ def on_tblProductsIn_itemSelectionChanged(self): def on_bb_accepted(self): foodtype=None if self.cmbFoodtypes.currentIndex()==-1 else self.mem.data.foodtypes.find_by_id(self.cmbFoodtypes.itemData(self.cmbFoodtypes.currentIndex())) if foodtype==None: - qmessagebox(self.tr("You neet to set a food type"), ":/caloriestracker/book.png") + qmessagebox(self.tr("You need to set a food type"), ":/caloriestracker/book.png") return if self.elaboratedproduct is None: diff --git a/caloriestracker/version.py b/caloriestracker/version.py index 30dd889..c2ff6af 100644 --- a/caloriestracker/version.py +++ b/caloriestracker/version.py @@ -1,5 +1,5 @@ ## @brief Package with package version information from datetime import datetime -__version__ ='0.7.9999' -__versiondatetime__=datetime(2021, 3, 21, 20, 44) +__version__ ='0.8.0' +__versiondatetime__=datetime(2021, 5, 16, 7, 48) diff --git a/doc/Doxyfile b/doc/Doxyfile index dbc3d79..c156b24 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Calories Tracker # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.7.0 +PROJECT_NUMBER = 0.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a