Skip to content

Commit

Permalink
properly send only var names to alerter. cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasnteireho committed Sep 18, 2024
1 parent be0e2eb commit 531aa36
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 36 deletions.
4 changes: 2 additions & 2 deletions demo/viewer/viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<script main="@empty"
env="production"
config="../package.json!npm"
src="../dist/bundles/app.js?v=1726264879172"
src="../dist/bundles/app.js?v=1726696976574"
cache-key="v"
cache-version="1726264879172"
cache-version="1726696976574"
base-url="../">
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion index.dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
errRepURL: ''
}));
</script>
<script src="node_modules/steal/steal.production.js?v=1726264826982" cache-key="v" cache-version="1726264826982" main="@caliorg/a2jviewer/app"></script>
<script src="node_modules/steal/steal.production.js?v=1726688771294" cache-key="v" cache-version="1726688771294" main="@caliorg/a2jviewer/app"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
errRepURL: ''
}));
</script>
<script src="node_modules/steal/steal.production.js?v=1726274139814" cache-key="v" cache-version="1726274139814" main="@caliorg/a2jviewer/app"></script>
<script src="node_modules/steal/steal.production.js?v=1726696917595" cache-key="v" cache-version="1726696917595" main="@caliorg/a2jviewer/app"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@caliorg/a2jviewer",
"version": "8.1.7-13",
"version": "8.1.7-23",
"description": "A2J Viewer standalone and preview app.",
"main": "a2jviewer/app",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/footer/footerVersion.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

const version = {
number: '8.1.7-13',
date: '2024-09-14'
number: '8.1.7-23',
date: '2024-09-18'
}

export default version
39 changes: 14 additions & 25 deletions src/mobile/pages/pages-vm.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ export default DefineMap.extend('PagesVM', {
* check is date is valid
*/
function isValidDate (date) {
console.log('date: ' + date)
let dmy = date.split('/')
// js wants mdy or ymd
// while a2j dates are d/m/yyyy
Expand Down Expand Up @@ -255,26 +254,21 @@ export default DefineMap.extend('PagesVM', {
if (validator.has(answer.type)) {
for (let i = 1; i < answer.values.length; i++) {
if (!validator.get(answer.type)(answer.values[i])) {
// delete answer.values[i]
answer.values[i] = null
Object.defineProperty(answer, 'invalid', 'true')
Object.defineProperty(answer, 'invalid',
{
value: true,
writable: true
})
}
}
}

// answer.values[0] = answer.values.length

return answer
}

Object.keys(answers).forEach(function filter (name) {
let sanitizedAnswer = sanitizeAnswerValues(answers[name])
if (sanitizedAnswer.values.length === 1) {
// delete answers[name]
answers[name] = null
} else {
answers[name] = sanitizedAnswer
}
answers[name] = sanitizedAnswer
})

return answers
Expand All @@ -291,9 +285,7 @@ export default DefineMap.extend('PagesVM', {
*/
answersValidated: {
get () {
// console.log(this.answers.serialize())
// console.log(this.validatedAnswers(this.answers.serialize()))
// const parsed = Parser.parseANX(this.answers.serialize())

const parsed = this.validatedAnswers(this.answers.serialize())
return parsed
}
Expand All @@ -310,17 +302,15 @@ export default DefineMap.extend('PagesVM', {
*/
invalidAnswers: {
get () {
// console.log(this.answers.serialize())
// console.log(this.validatedAnswers(this.answers.serialize()))
// const parsed = Parser.parseANX(this.answers.serialize())
let answers = this.answersValidated
let invalidVars = []
Object.keys(answers).forEach(function filter (name) {
if (!answers[name].invalid) {
delete answers[name]
if (answers[name].invalid) {
invalidVars.push(answers[name].name)
}
})

return answers
return invalidVars
}
},

Expand All @@ -335,10 +325,9 @@ export default DefineMap.extend('PagesVM', {
*/
answersANX: {
get () {
// console.log(this.answers.serialize())
// console.log(this.validatedAnswers(this.answers.serialize()))
// const parsed = Parser.parseANX(this.answers.serialize())
const parsed = Parser.parseANX(this.validatedAnswers(this.answers.serialize()))

//const parsed = Parser.parseANX(this.validatedAnswers(this.answers.serialize()))
const parsed = Parser.parseANX(this.answersValidated)
return parsed
}
},
Expand Down
5 changes: 4 additions & 1 deletion src/mobile/pages/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { analytics } from '~/src/util/analytics'
import stache from 'can-stache'
import '~/src/mobile/util/helpers'
import constants from '~/src/models/constants'
import DefineMap from 'can-define/map/map'


stache.registerPartial('assemble-form', assembleFormTpl)
stache.registerPartial('save-answers-form', saveAnswersFormTpl)
Expand Down Expand Up @@ -112,9 +114,10 @@ export default Component.extend({
},

'button.save-answers click': function (el, ev) {
console.log("clicked!")
ev.preventDefault()

const button = new Map({ next: constants.qIDSUCCESS })
const button = new DefineMap({ next: constants.qIDSUCCESS })

const vm = this.viewModel
let postBody = {
Expand Down
2 changes: 1 addition & 1 deletion src/mobile/pages/save-answers-form.stache
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<button
type="submit"
on:el:click="scope.vm.navigate(button, scope.element, scope.event)"
{{! on:el:click="scope.vm.navigate(button, scope.element, scope.event)"}}
class="btn btn-default btn-navigate save-answers"
aui-action="send">
{{getButtonLabel(scope.helpers.parseText(button.label))}}
Expand Down

0 comments on commit 531aa36

Please sign in to comment.