fixed: broken multiple-constraint feature (probably broken for a long…

… time)

public/js/src/module/form.js

@@ -16,18 +16,13 @@ Form.constraintNames = Array.from(Array(21)).map(
     (val, i) => `constraint${i !== 0 ? i : ''}`
 );
 
-Form.extendedBy = 'what';
+Form.prototype.extendedBy = 'OpenClinica';
 
-Object.defineProperty(Form, 'extendedBy', {
-    value: 'OpenClinica',
-    writable: false
-});
-
-Object.defineProperty(Form, 'constraintClassesInvalid', {
+Object.defineProperty(Form.prototype, 'constraintClassesInvalid', {
     get: () => Form.constraintNames.map((n) => `invalid-${n}`),
 });
 
-Object.defineProperty(Form, 'constraintAttributes', {
+Object.defineProperty(Form.prototype, 'constraintAttributes', {
     get: () =>
         Form.constraintNames.map((n, i) => `data-${i === 0 ? n : `oc-${n}`}`),
 });

public/js/src/module/input.js

@@ -1,13 +1,13 @@
 // Modify the Enketo Core input module.
 
 import inputModule from 'enketo-core/src/js/input';
-/* eslint import/no-cycle: "off" */
-import { Form } from './form';
 
 // Obtain multiple constraints
 inputModule.getConstraint = function (control) {
     // The array index corresponds to the number used in oc:constraint
     // Note if a spot is missing, e.g. constraint11, this will (deliberately) result in an undefined value,
 
-    return Form.constraintAttributes.map((attr) => control.getAttribute(attr));
+    return this.form.constraintAttributes.map((attr) =>
+        control.getAttribute(attr)
+    );
 };

test/client/form-extensions.spec.js

@@ -38,5 +38,3 @@ describe('Extended Form Class', () => {
         expect(form.constraintClassesInvalid.length).to.be.above(1);
     });
 });
-
-