Skip to content

Commit

Permalink
prevent invalid date from setting answervm and delete answervm if inv…
Browse files Browse the repository at this point in the history
…alid
  • Loading branch information
tobiasnteireho committed Mar 23, 2024
1 parent a52f352 commit 9a2afc4
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions demo/viewer/viewer.html
Expand Up @@ -53,9 +53,9 @@
<script main="@empty"
env="production"
config="../package.json!npm"
src="../dist/bundles/app.js?v=1711141365636"
src="../dist/bundles/app.js?v=1711191320050"
cache-key="v"
cache-version="1711141365636"
cache-version="1711191320050"
base-url="../">
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion index.dev.html
Expand Up @@ -59,6 +59,6 @@
errRepURL: ''
}));
</script>
<script src="node_modules/steal/steal.production.js?v=1708983367123" cache-key="v" cache-version="1708983367123" main="@caliorg/a2jviewer/app"></script>
<script src="node_modules/steal/steal.production.js?v=1711147865601" cache-key="v" cache-version="1711147865601" main="@caliorg/a2jviewer/app"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -59,6 +59,6 @@
errRepURL: ''
}));
</script>
<script src="node_modules/steal/steal.production.js?v=1711140604745" cache-key="v" cache-version="1711140604745" main="@caliorg/a2jviewer/app"></script>
<script src="node_modules/steal/steal.production.js?v=1711191328321" cache-key="v" cache-version="1711191328321" main="@caliorg/a2jviewer/app"></script>
</body>
</html>
22 changes: 17 additions & 5 deletions src/mobile/pages/fields/field/field.js
Expand Up @@ -310,9 +310,10 @@ export const FieldVM = DefineMap.extend('FieldVM', {
} else if (field.type === 'datemdy') {
if ($el.val().length < 6) {
value = ''
}
} else {
// format date to (mm/dd/yyyy) from acceptable inputs
value = this.normalizeDateInput($el.val())
value = this.normalizeDateInput($el.val())
}

// date bounds are in 6 or 8 digit texts
// need to change to same format as value
Expand Down Expand Up @@ -351,11 +352,18 @@ export const FieldVM = DefineMap.extend('FieldVM', {
} else {
value = $el.val()
}
//console.log("value after: " + value)
//console.log("answer value before: " + _answerVm.values)

if (((field.type === 'datemdy') && (value.length >= 6)) ||
(field.type !== 'datemdy')) {
//if (((field.type === 'datemdy') && (value.length >= 6)) ||
// (field.type !== 'datemdy')) {
_answerVm.values = value
}
//} else {
// I don't understand why this is necessary but it is
// _answerVm.values = ''
//}

console.log("answer value: " + _answerVm.values)

let errors = _answerVm.errors
field.hasError = errors
Expand All @@ -367,6 +375,10 @@ export const FieldVM = DefineMap.extend('FieldVM', {
this.debugPanelMessage(field, value)
}

if (((field.type === 'datemdy') && (value.length < 6))){
_answerVm = undefined
}

return errors
},

Expand Down

0 comments on commit 9a2afc4

Please sign in to comment.