diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index 0be5d656..ab230514 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -72,7 +72,7 @@ var FormSchema = new Schema({ }, language: { type: String, - enum: ['english', 'french', 'spanish'], + enum: ['english', 'french', 'spanish', 'german', 'italian'], required: 'Form must have a language', default: 'english' }, diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index 7458e7d2..f2b6739d 100755 --- a/app/models/user.server.model.js +++ b/app/models/user.server.model.js @@ -94,7 +94,7 @@ var UserSchema = new Schema({ }, language: { type: String, - enum: ['english', 'french', 'spanish'], + enum: ['english', 'french', 'spanish', 'italian', 'german'], default: 'english', required: 'User must have a language' }, diff --git a/bower.json b/bower.json index dd22b494..c4595134 100755 --- a/bower.json +++ b/bower.json @@ -33,9 +33,9 @@ "angular-input-stars": "https://github.com/whitef0x0/angular-input-stars.git#master", "raven-js": "^3.0.4", "tableExport.jquery.plugin": "^1.5.1", - "angular-translate": "~2.11.0", "js-yaml": "^3.6.1", - "angular-ui-select": "whitef0x0/ui-select#compiled" + "angular-ui-select": "whitef0x0/ui-select#compiled", + "angular-translate": "~2.11.0" }, "resolutions": { "angular-bootstrap": "^0.14.0", diff --git a/config/env/all.js b/config/env/all.js index 4d2d5440..609b6d9b 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -99,10 +99,14 @@ module.exports = { ], unit_tests: [ 'public/lib/angular-mocks/angular-mocks.js', - 'public/modules/*/tests/unit/**/*.js' + 'public/modules/*/tests/unit/**/*.js', + '!public/modules/**/demo/**/*.js', + '!public/modules/**/node_modules/**/*.js' ], e2e_tests: [ - 'public/modules/*/tests/e2e/**.js' + 'public/modules/*/tests/e2e/**.js', + '!public/modules/**/demo/**/*.js', + '!public/modules/**/node_modules/**/*.js' ] } }; diff --git a/public/dist/application.js b/public/dist/application.js index a96f0d11..5bcea3e1 100644 --- a/public/dist/application.js +++ b/public/dist/application.js @@ -170,240 +170,7 @@ angular.module('NodeForm.templates', []).run(['$templateCache', function($templa $templateCache.put("modules/forms/admin/views/directiveViews/form/configure-form.client.view.html", "
# | {{value.title}} | OscarEMR User Profile | Percentage Complete | Time Elapsed | Device | Location | IP Address | Date Submitted (UTC) | Generated PDF | |
---|---|---|---|---|---|---|---|---|---|---|
{{$index+1}} | {{field.fieldValue}} | User Profile #{{row.oscarDemoNum}} | {{row.percentageComplete}}% | {{row.timeElapsed}} | {{row.device.name}}, {{row.device.type}} | {{row.geoLocation.city}}, {{row.geoLocation.country}} | {{row.ipAddr}} | {{row.created | date:'yyyy-MM-dd HH:mm:ss'}} | Generated PDF |
# | {{value.title}} | OscarEMR User Profile | Percentage Complete | Time Elapsed | Device | Location | IP Address | Date Submitted (UTC) | Generated PDF | |
---|---|---|---|---|---|---|---|---|---|---|
{{$index+1}} | {{field.fieldValue}} | User Profile #{{row.oscarDemoNum}} | {{row.percentageComplete}}% | {{row.timeElapsed}} | {{row.device.name}}, {{row.device.type}} | {{row.geoLocation.city}}, {{row.geoLocation.country}} | {{row.ipAddr}} | {{row.created | date:\'yyyy-MM-dd HH:mm:ss\'}} | Generated PDF |
{{pageData.introParagraph}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{field.description}}
{{myform.startPage.introParagraph}}
Before you continue, make sure to check your email for our verification. If you don\'t receive it within 24h drop us a line at polydaic@gmail.com
Enter your account email.
Enter your account email.
Check your email and click on the activation link to activate your account. If you have any questions drop us a line at polydaic@gmail.com
Enter your account email.
Check your email and click on the activation link to activate your account. If you have any questions drop us a line at polydaic@gmail.com
{{field.description}} diff --git a/public/modules/forms/base/views/directiveViews/field/textfield.html b/public/modules/forms/base/views/directiveViews/field/textfield.html index 6cfda36c..fc281d65 100755 --- a/public/modules/forms/base/views/directiveViews/field/textfield.html +++ b/public/modules/forms/base/views/directiveViews/field/textfield.html @@ -29,9 +29,6 @@ ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }" value="field.fieldValue" - ng-model="field.fieldValue" - ng-model-options="{ debounce: 250 }" - value="field.fieldValue" ng-focus="setActiveField(field._id, index, true)" on-enter-or-tab-key="nextField()" on-tab-and-shift-key="prevField()" diff --git a/public/modules/forms/base/views/directiveViews/field/yes_no.html b/public/modules/forms/base/views/directiveViews/field/yes_no.html index 5765fbbd..ff4640f6 100644 --- a/public/modules/forms/base/views/directiveViews/field/yes_no.html +++ b/public/modules/forms/base/views/directiveViews/field/yes_no.html @@ -27,8 +27,8 @@ style="opacity: 0; margin-left: 0px;" ng-model="field.fieldValue" ng-focus="setActiveField(field._id, index, true)" - ng-model-options="{ debounce: 250 }" - ng-required="field.required" + ng-model-options="{ debounce: 250 }" + ng-required="field.required" ng-change="$root.nextField()" ng-disabled="field.disabled" />