Merge branch 'master' of https://github.com/ivoxavier/kaltracker

ivoxavier · Jul 11, 2023 · d3c1eae · d3c1eae
2 parents ea1c7f0 + 46d757c
commit d3c1eae
Show file tree

Hide file tree

Showing 9 changed files with 390 additions and 438 deletions.
diff --git a/js/GetData.js b/js/GetData.js
diff --git a/po/kaltracker.ivoxavier.pot b/po/kaltracker.ivoxavier.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kaltracker.ivoxavier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-10 09:28+0000\n"
+"POT-Creation-Date: 2023-07-10 15:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -441,11 +441,11 @@ msgstr ""
 msgid "Product Macros"
 msgstr ""
 
-#: ../qml/QuickAdditionPage.qml:65 ../qml/SetFoodPage.qml:87
+#: ../qml/QuickAdditionPage.qml:52 ../qml/SetFoodPage.qml:87
 msgid "Stored!"
 msgstr ""
 
-#: ../qml/QuickAdditionPage.qml:70 ../qml/SetFoodPage.qml:92
+#: ../qml/QuickAdditionPage.qml:57 ../qml/SetFoodPage.qml:92
 msgid "Something went wrong. Please, restart the app and try again."
 msgstr ""
 

diff --git a/qml/BodyMeasuresPage.qml b/qml/BodyMeasuresPage.qml
@@ -52,8 +52,8 @@ Page{
     property int user_weight : UserTable.getWeight()
     property string user_sex_at_birth : UserTable.getSexAtBirth()
     property double user_bmi : BMI.getBmi(user_height, user_weight)
-    property int user_ap_hi : UserTable.getApHi()
-    property int user_ap_lo : UserTable.getApLo()
+    property var user_ap_hi : UserTable.getApHi()
+    property var user_ap_lo : UserTable.getApLo()
 
     Component{
         id: info_bmi

diff --git a/qml/QuickAdditionPage.qml b/qml/QuickAdditionPage.qml
@@ -45,19 +45,6 @@ Page{
         }
 
     BackgroundStyle{}
-
-    //receives meal category from HomePage.slotAddMeal
-    property int meal_quick_addition_page
-
-    //food detail
-    property string product_name_quick_addition_page
-    property string nutriscore_quick_addition_page : "a"
-
-    //macros for calculating nutriscore
-    property int cal_quick_addition_page
-    property double carbo_quick_addition_page : 0.0
-    property double fat_quick_addition_page : 0.0
-    property double protein_quick_addition_page : 0.0
 
 
     Component{

diff --git a/qml/components/RowAbstractConfirmButton.qml b/qml/components/RowAbstractConfirmButton.qml
@@ -38,32 +38,31 @@ Row{
             anchors.fill: parent
             onClicked: {
                 try{
-                    if(UserFoodsListTable.isUnique(product_name_quick_addition_page) >= 1){
+                    if(UserFoodsListTable.isUnique(logical_fields.ingestion.product_name) >= 1){
                         /* REGISTER INGESTION */
                         //item already on DB
-                        IngestionsTable.saveIngestion(product_name_quick_addition_page,
-                        nutriscore_quick_addition_page, cal_quick_addition_page,
-                        fat_quick_addition_page, carbo_quick_addition_page,
-                        protein_quick_addition_page, meal_quick_addition_page)
-                        root.initDB()
-                        PopupUtils.open(sucess_dialog)
+                        IngestionsTable.saveIngestion(logical_fields.ingestion.product_name,
+                        logical_fields.ingestion.nutriscore, logical_fields.ingestion.cal,
+                        logical_fields.ingestion.fat, logical_fields.ingestion.carbo,
+                        logical_fields.ingestion.protein, logical_fields.ingestion.meal_type)
+
                     } else{
                         /* CREATE NEW ENTRY */
                         //new item
-                        UserFoodsListTable.saveIngestion(product_name_quick_addition_page,
-                        nutriscore_quick_addition_page, cal_quick_addition_page,
-                        fat_quick_addition_page, carbo_quick_addition_page,
-                        protein_quick_addition_page)
-                        root.initDB()
+                        UserFoodsListTable.saveIngestion(logical_fields.ingestion.product_name,
+                        logical_fields.ingestion.nutriscore, logical_fields.ingestion.cal,
+                        logical_fields.ingestion.fat, logical_fields.ingestion.carbo,
+                        logical_fields.ingestion.protein)
 
                         /* REGISTER INGESTION */
-                        IngestionsTable.saveIngestion(product_name_quick_addition_page,
-                        nutriscore_quick_addition_page, cal_quick_addition_page,
-                        fat_quick_addition_page, carbo_quick_addition_page,
-                        protein_quick_addition_page, meal_quick_addition_page)
-                        root.initDB()
-                        PopupUtils.open(sucess_dialog)
+                        IngestionsTable.saveIngestion(logical_fields.ingestion.product_name,
+                        logical_fields.ingestion.nutriscore, logical_fields.ingestion.cal,
+                        logical_fields.ingestion.fat, logical_fields.ingestion.carbo,
+                        logical_fields.ingestion.protein, logical_fields.ingestion.meal_type)  
                     }
+
+                    root.initDB()
+                    PopupUtils.open(sucess_dialog)
                 } catch (err){
                     PopupUtils.open(error_dialog)
                 }  

diff --git a/qml/components/RowAbstractQuickAdditionButton.qml b/qml/components/RowAbstractQuickAdditionButton.qml
@@ -35,7 +35,7 @@ Row{
         icon_source: "../../assets/apple-fruit-svgrepo-com.svg"
         MouseArea{
             anchors.fill: parent
-            onClicked: page_stack.push(quick_addition_page,{meal_quick_addition_page : meal_quick_list_foods_page})
+            onClicked: page_stack.push(quick_addition_page)
         }
     }
 }
diff --git a/qml/logicalFields/LogicalFields.qml b/qml/logicalFields/LogicalFields.qml
@@ -48,12 +48,12 @@ QtObject{
 
     property QtObject ingestion : QtObject{
         property string product_name
-        property string nutriscore
+        property string nutriscore : "a"
         property string nova_groups
         property int cal
-        property double carbo
-        property double fat
-        property double protein
+        property double carbo : 0.0
+        property double fat : 0.0
+        property double protein : 0.0
         property int meal_type
         property int quantity_portions : 1
         property double size_portions : 1

diff --git a/qml/plugins/ProductMacros.qml b/qml/plugins/ProductMacros.qml
@@ -35,24 +35,24 @@ GridLayout{
     columns: 3
 
     //first row
-    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter; text: fat_quick_addition_page; font.bold: true;color : app_style.label.labelColor  }
-    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter;text: protein_quick_addition_page; font.bold: true;color : app_style.label.labelColor  }
-    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter;text: carbo_quick_addition_page; font.bold: true;color : app_style.label.labelColor }
+    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter; text: logical_fields.ingestion.fat; font.bold: true;color : app_style.label.labelColor  }
+    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter;text: logical_fields.ingestion.protein; font.bold: true;color : app_style.label.labelColor  }
+    Text {Layout.alignment: Qt.AlignTop | Qt.AlignHCenter;text: logical_fields.ingestion.carbo; font.bold: true;color : app_style.label.labelColor }
 
     //second row
     NutrientSlider{
         Layout.alignment: Qt.AlignCenter | Qt.AlignHCenter
-        onValueChanged: fat_quick_addition_page = Number(value.toFixed(1))
+        onValueChanged: logical_fields.ingestion.fat = Number(value.toFixed(1))
     }
 
     NutrientSlider{
         Layout.alignment: Qt.AlignCenter | Qt.AlignHCenter
-        onValueChanged : protein_quick_addition_page = Number(value.toFixed(1))   
+        onValueChanged : logical_fields.ingestion.protein = Number(value.toFixed(1))   
     }
 
     NutrientSlider{
         Layout.alignment: Qt.AlignCenter | Qt.AlignHCenter
-        onValueChanged : carbo_quick_addition_page = Number(value.toFixed(1))
+        onValueChanged : logical_fields.ingestion.carbo = Number(value.toFixed(1))
     }
 
     //third row

diff --git a/qml/plugins/ProductNameCalories.qml b/qml/plugins/ProductNameCalories.qml
@@ -54,7 +54,7 @@ ColumnLayout{
             horizontalAlignment: TextInput.AlignHCenter
             verticalAlignment: TextInput.AlignVCenter
             color : app_style.label.labelColor 
-            onTextChanged: product_name_quick_addition_page = text
+            onTextChanged: logical_fields.ingestion.product_name = text
         }
     }
 
@@ -83,7 +83,7 @@ ColumnLayout{
             inputMethodHints: Qt.ImhDigitsOnly
             color : app_style.label.labelColor 
             onEditingFinished:{ 
-                cal_quick_addition_page = text
+                logical_fields.ingestion.cal = text
             }
         }
     }
@@ -107,7 +107,7 @@ ColumnLayout{
             i18n.tr("E: Bad Nutritional Quality")]
             selectedIndex: -1
             onSelectedIndexChanged: {
-                nutriscore_quick_addition_page = selectedIndex == 0 ?
+                logical_fields.ingestion.nutriscore = selectedIndex == 0 ?
                 "a" : selectedIndex == 1 ?
                 "b" : selectedIndex == 2 ?
                 "c" : selectedIndex == 3 ?