Merge pull request #50 from sampocs/pochyly

decimal issue
sampocs · Apr 26, 2019 · b7887b4 · b7887b4
2 parents 2ff6991 + c3d0169
commit b7887b4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/screens/AddHabitScreen.js b/screens/AddHabitScreen.js
@@ -139,13 +139,13 @@ class AddHabitScreen extends React.Component {
             habitSettings.type = Constants.PROGRESS
             habitSettings.habitInfo = {
                 unit: this.state.unit,
-                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
+                goal: this.state.goal.indexOf('.') === 0 ? 0 : parseInt(this.state.goal)
             }
 
             habitHistory.type = Constants.PROGRESS
             habitHistory.habitInfo = {
                 progress: 0,
-                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
+                goal: this.state.goal.indexOf('.') === 0 ? 0 : parseInt(this.state.goal)
             }
         }
         else if (this.state.includeSubtasksChecked) {
@@ -180,7 +180,8 @@ class AddHabitScreen extends React.Component {
             }
             return false
         }
-        if (this.state.includeMeasurementsChecked && (this.state.goal === '' || this.state.goal === '.')) {
+        if (this.state.includeMeasurementsChecked && 
+            (this.state.goal === '' || this.state.goal === '.' || this.state.goal.indexOf('.') === 0)) {
             if (alertUser) {
                 AlertIOS.alert(
                     '',
@@ -189,6 +190,15 @@ class AddHabitScreen extends React.Component {
             }
             return false
         }
+        if (this.state.includeMeasurementsChecked && this.state.goal.replace(/[^.]/g, "").length > 1) {
+            if (alertUser) {
+                AlertIOS.alert(
+                    '',
+                    'Please enter a valid goal amount!'
+                )
+            }
+            return false
+        }
         if (this.state.includeSubtasksChecked && this.state.subtasks.length === 0) {
             if (alertUser) {
                 AlertIOS.alert(

diff --git a/screens/EditHabitScreen.js b/screens/EditHabitScreen.js
@@ -145,13 +145,13 @@ class EditHabitScreen extends React.Component {
             habitSettings.type = Constants.PROGRESS
             habitSettings.habitInfo = {
                 unit: this.state.unit,
-                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
+                goal: this.state.goal.indexOf('.') === 0 ? 0 : parseInt(this.state.goal)
             }
 
             habitHistory.type = Constants.PROGRESS
             habitHistory.habitInfo = {
                 progress: 0,
-                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
+                goal: this.state.goal.indexOf('.') === 0 ? 0 : parseInt(this.state.goal)
             }
         }
         else if (this.state.includeSubtasksChecked) {
@@ -187,7 +187,8 @@ class EditHabitScreen extends React.Component {
             }
             return false
         }
-        if (this.state.includeMeasurementsChecked && (this.state.goal === '' || this.state.goal === '.')) {
+        if (this.state.includeMeasurementsChecked && 
+            (this.state.goal === '' || this.state.goal === '.' || this.state.goal.indexOf('.') === 0)) {
             if (alertUser) {
                 AlertIOS.alert(
                     '',
@@ -196,6 +197,15 @@ class EditHabitScreen extends React.Component {
             }
             return false
         }
+        if (this.state.includeMeasurementsChecked && this.state.goal.replace(/[^.]/g, "").length > 1) {
+            if (alertUser) {
+                AlertIOS.alert(
+                    '',
+                    'Please enter a valid goal amount!'
+                )
+            }
+            return false
+        }
         if (this.state.includeSubtasksChecked && this.state.subtasks.length === 0) {
             if (alertUser) {
                 AlertIOS.alert(