From b39aeb3bc918e924dd387fe235722a795b661b9d Mon Sep 17 00:00:00 2001 From: mitch Date: Fri, 31 Jan 2025 17:03:24 -0500 Subject: [PATCH 1/6] add min/max ranges to proper fiels --- src/mobile/pages/fields/field/field.js | 8 +++++ .../pages/fields/field/views/datemdy.stache | 16 ++++----- .../fields/field/views/invalid-prompt.stache | 15 ++++----- .../pages/fields/field/views/number.stache | 33 ++++++++----------- .../fields/field/views/numberdollar.stache | 33 ++++++++----------- 5 files changed, 47 insertions(+), 58 deletions(-) diff --git a/src/mobile/pages/fields/field/field.js b/src/mobile/pages/fields/field/field.js index 9a6906763..a83b361dd 100644 --- a/src/mobile/pages/fields/field/field.js +++ b/src/mobile/pages/fields/field/field.js @@ -173,6 +173,14 @@ export const FieldVM = DefineMap.extend('FieldVM', { get () { const min = this.field.min || 'any' const max = this.field.max || 'any' + const isDateMDY = this.field.type === 'datemdy' + + if (isDateMDY) { + let minDate = moment(min, 'MMDDYYYY').format('MM/DD/YYYY') + let maxDate = moment(max, 'MMDDYYYY').format('MM/DD/YYYY') + return `(${minDate} ~~~ ${maxDate})` + } + return `(${min} ~~~ ${max})` } }, diff --git a/src/mobile/pages/fields/field/views/datemdy.stache b/src/mobile/pages/fields/field/views/datemdy.stache index 5c1dc7944..f946523f4 100644 --- a/src/mobile/pages/fields/field/views/datemdy.stache +++ b/src/mobile/pages/fields/field/views/datemdy.stache @@ -8,16 +8,14 @@ {{#if(field.required)}}({{lang.Required}}){{/if}}
- +
+ {{#if(showMinMaxPrompt)}} + {{minMaxPrompt}} + {{/if}} {{> invalid-prompt-tpl }} - + \ No newline at end of file diff --git a/src/mobile/pages/fields/field/views/invalid-prompt.stache b/src/mobile/pages/fields/field/views/invalid-prompt.stache index 79ac918f4..f493b9f10 100644 --- a/src/mobile/pages/fields/field/views/invalid-prompt.stache +++ b/src/mobile/pages/fields/field/views/invalid-prompt.stache @@ -1,10 +1,7 @@ {{#if(showInvalidPrompt)}} - -{{/if}} + +{{/if}} \ No newline at end of file diff --git a/src/mobile/pages/fields/field/views/number.stache b/src/mobile/pages/fields/field/views/number.stache index 0b4a4fa89..c03300338 100644 --- a/src/mobile/pages/fields/field/views/number.stache +++ b/src/mobile/pages/fields/field/views/number.stache @@ -7,26 +7,19 @@ {{#if(field.required)}}({{lang.Required}}){{/if}}
- - {{#if(field.calculator)}} - - {{/if}} + + {{#if(field.calculator)}} + + {{/if}}
+ {{#if(showMinMaxPrompt)}} + {{minMaxPrompt}} + {{/if}} {{> invalid-prompt-tpl }} - + \ No newline at end of file diff --git a/src/mobile/pages/fields/field/views/numberdollar.stache b/src/mobile/pages/fields/field/views/numberdollar.stache index 84f8b4452..df70df09a 100644 --- a/src/mobile/pages/fields/field/views/numberdollar.stache +++ b/src/mobile/pages/fields/field/views/numberdollar.stache @@ -9,27 +9,20 @@
$ - - {{#if(field.calculator)}} - - {{/if}} + + {{#if(field.calculator)}} + + {{/if}}
+ {{#if(showMinMaxPrompt)}} + {{minMaxPrompt}} + {{/if}} {{> invalid-prompt-tpl }} - + \ No newline at end of file From 915555793e0c9ee32eb0bb17e86fcd332e17ca8b Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Mon, 3 Feb 2025 09:32:15 -0600 Subject: [PATCH 2/6] prerelease version update --- index.dev.html | 2 +- index.html | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/footer/footerVersion.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.dev.html b/index.dev.html index ce8ce4cd0..762e9ffb9 100644 --- a/index.dev.html +++ b/index.dev.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/index.html b/index.html index 762e9ffb9..bbbaa7af4 100644 --- a/index.html +++ b/index.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 444199c1d..1c2127d0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.0", + "version": "8.4.1-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@caliorg/a2jviewer", - "version": "8.4.0", + "version": "8.4.1-0", "license": "GNU AGPL v3.0", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", diff --git a/package.json b/package.json index 4c7fd33ce..18b173f6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.0", + "version": "8.4.1-0", "description": "A2J Viewer standalone and preview app.", "main": "a2jviewer/app", "scripts": { diff --git a/src/footer/footerVersion.js b/src/footer/footerVersion.js index de7d3ed1d..26c50b1a6 100644 --- a/src/footer/footerVersion.js +++ b/src/footer/footerVersion.js @@ -1,7 +1,7 @@ const version = { - number: '8.4.0', - date: '2024-12-11' + number: '8.4.1-0', + date: '2025-02-03' } export default version From c76fa0f50907cbf15d86fa1263af964b828198d7 Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Mon, 3 Feb 2025 09:32:51 -0600 Subject: [PATCH 3/6] 8.4.1-1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c2127d0f..d389ef2f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-0", + "version": "8.4.1-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@caliorg/a2jviewer", - "version": "8.4.1-0", + "version": "8.4.1-1", "license": "GNU AGPL v3.0", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", diff --git a/package.json b/package.json index 18b173f6e..eeb3dcabc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-0", + "version": "8.4.1-1", "description": "A2J Viewer standalone and preview app.", "main": "a2jviewer/app", "scripts": { From 24a1c181b2d7a2416ca23ddcf4af05271e821741 Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Mon, 3 Feb 2025 09:35:29 -0600 Subject: [PATCH 4/6] 8.4.1-2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d389ef2f5..f84d0babd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-1", + "version": "8.4.1-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@caliorg/a2jviewer", - "version": "8.4.1-1", + "version": "8.4.1-2", "license": "GNU AGPL v3.0", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", diff --git a/package.json b/package.json index eeb3dcabc..6fe8b5f98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-1", + "version": "8.4.1-2", "description": "A2J Viewer standalone and preview app.", "main": "a2jviewer/app", "scripts": { From c7df6ccf41717a47304e59f22cf25613eb6af39d Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Mon, 3 Feb 2025 09:36:18 -0600 Subject: [PATCH 5/6] Update footerVersion --- src/footer/footerVersion.js | 2 +- src/mobile/pages/fields/field/field.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/footer/footerVersion.js b/src/footer/footerVersion.js index 26c50b1a6..380a15952 100644 --- a/src/footer/footerVersion.js +++ b/src/footer/footerVersion.js @@ -1,6 +1,6 @@ const version = { - number: '8.4.1-0', + number: '8.4.1-2', date: '2025-02-03' } diff --git a/src/mobile/pages/fields/field/field.js b/src/mobile/pages/fields/field/field.js index a83b361dd..0384a9fa3 100644 --- a/src/mobile/pages/fields/field/field.js +++ b/src/mobile/pages/fields/field/field.js @@ -180,7 +180,7 @@ export const FieldVM = DefineMap.extend('FieldVM', { let maxDate = moment(max, 'MMDDYYYY').format('MM/DD/YYYY') return `(${minDate} ~~~ ${maxDate})` } - + return `(${min} ~~~ ${max})` } }, From 141fede8d646ba1c9cb56f26f6d1675203d60c79 Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Wed, 12 Feb 2025 23:12:22 -0600 Subject: [PATCH 6/6] pre release --- index.dev.html | 2 +- index.html | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/footer/footerVersion.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.dev.html b/index.dev.html index 762e9ffb9..bbbaa7af4 100644 --- a/index.dev.html +++ b/index.dev.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/index.html b/index.html index bbbaa7af4..e1c51903b 100644 --- a/index.html +++ b/index.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f84d0babd..47ddc3d42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-2", + "version": "8.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@caliorg/a2jviewer", - "version": "8.4.1-2", + "version": "8.4.1", "license": "GNU AGPL v3.0", "dependencies": { "@caliorg/a2jdeps": "^7.1.7", diff --git a/package.json b/package.json index 6fe8b5f98..c39514611 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@caliorg/a2jviewer", - "version": "8.4.1-2", + "version": "8.4.1", "description": "A2J Viewer standalone and preview app.", "main": "a2jviewer/app", "scripts": { diff --git a/src/footer/footerVersion.js b/src/footer/footerVersion.js index 380a15952..1260d927f 100644 --- a/src/footer/footerVersion.js +++ b/src/footer/footerVersion.js @@ -1,7 +1,7 @@ const version = { - number: '8.4.1-2', - date: '2025-02-03' + number: '8.4.1', + date: '2025-02-13' } export default version