DoB input should support "numbers of years" (#122)

1.3.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-user-management",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "dist/index.js",
   "dependencies": {
     "@fastify/autoload": "^5.8.0",

src/lib/validator-dob.ts

@@ -2,31 +2,36 @@ import { DateTime } from 'luxon';
 import { IValidator } from './validation';
 
 export default class ValidatorDateOfBirth implements IValidator {
-  isValid(input: string) : boolean | string {
+  isValid(input: string) : boolean {
     try {
-      const parsed = parse(input);
-      return parsed.isValid && parsed.diffNow('hours').hours <= 0;
+      const parsed = this.parse(input);
+      return parsed.isValid && parsed < DateTime.now();
     } catch (e) {
       return false;
     }
   }
 
   format(input : string) : string {
-    const parsed = parse(input);
+    const parsed = this.parse(input);
     const asISODate = parsed.toISODate();
-    if (!asISODate) {
+    if (!this.isValid(input) || !asISODate) {
       return input;
     }
 
     return asISODate;
   }
 
   get defaultError(): string {
-    return 'Not a valid Date of Birth (eg. 1990-02-26)';
+    return 'Not a valid Date of Birth (eg. 1990-02-26 or 25)';
   }
-}
 
-const parse = (input: string) => {
-  const strippedInput = input.replace(/ /ig, '');
-  return DateTime.fromISO(strippedInput);
-};
+  private parse(input: string): DateTime {
+    const strippedInput = input.replace(/\s/ig, '');
+    const asNumber = Number(strippedInput);
+    if (!isNaN(asNumber) && asNumber > 0) {
+      return DateTime.now().minus({ years: asNumber });
+    }
+
+    return DateTime.fromISO(strippedInput);
+  }
+}

src/liquid/components/contact_type_dob.html

@@ -0,0 +1,21 @@
+<div class="control">
+  <input 
+    name="{{ include.prop_name }}" 
+    {% if include.isInYears %} type="text" {%else%} type="date" {%endif%}
+    class="input"
+    {% if data[include.prop_name] %} value="{{ data[include.prop_name] }}" {% endif %} 
+  />
+</div>
+
+<div class="field">
+  <div class="control">
+    <input 
+      type="checkbox" 
+      name="option_dob_unknown" 
+      hx-target="#div_{{include.prefix}}{{include.prop.property_name}}"
+      hx-post="/place/dob?place_type={{include.place_type}}&prefix={{include.prefix}}&prop_type={{include.prop.type}}" 
+      {% if include.isInYears %} checked {% endif%} 
+    />
+    <label>Date of birth unknown</label>
+  </div>
+</div>

src/liquid/components/contact_type_property.html

@@ -1,26 +1,43 @@
 {% if include.prop.type != 'generated' %}
   {% capture prop_name %}{{ include.prefix }}{{include.prop.property_name}}{% endcapture %}
-  <div class="field">
+
+  <div id="div_{{ include.prefix }}{{include.prop.property_name}}" class="field">
     <label class="label">
-      {{include.prop.friendly_name}}
+      {% if data['option_dob_unknown'] %}
+        Age in Years
+      {%else%}
+        {{include.prop.friendly_name}}
+      {% endif%}
     </label>
-    <div class="control">
-      {% if include.prop.type == 'select_one' or include.prop.type == 'select_multiple' %}
-        {%
-          include "components/contact_type_select.html"
+    {% if include.prop.type == 'dob' %}
+      {%
+        include "components/contact_type_dob.html"
           prop_name=prop_name
+          isInYears=data['option_dob_unknown']
+          place_type=include.place_type
+          prefix=include.prefix
           prop=include.prop
           data=data
-        %}
-      {% else %}
-        <input
-          name="{{ prop_name }}"
-          type="{% if include.prop.type == 'dob' %}date{% else %}text{% endif %}"
-          class="input"
-          {% if false and include.prop.type == 'regex' %} pattern="{{ include.prop.parameter }}" {% endif %}
-          {% if data[prop_name] %} value="{{ data[prop_name] }}" {% endif %}
-        />
-      {% endif %}
-    </div>
+      %}
+    {% else %}
+      <div class="control">
+        {% if include.prop.type == 'select_one' or include.prop.type == 'select_multiple' %}
+          {%
+            include "components/contact_type_select.html"
+              prop_name=prop_name
+              prop=include.prop
+              data=data
+          %}
+        {% else %}
+          <input
+            name="{{ prop_name }}"
+            type="{% if include.prop.type == 'dob' %}date{% else %}text{% endif %}"
+            class="input"
+            {% if false and include.prop.type == 'regex' %} pattern="{{ include.prop.parameter }}" {% endif %}
+            {% if data[prop_name] %} value="{{ data[prop_name] }}" {% endif %}
+          />
+        {% endif %}
+      </div>
+    {% endif %}
   </div>
 {% endif %}

src/liquid/place/create_form.html

@@ -18,14 +18,14 @@
 
     {% for prop in contactType.place_properties %}
       {%
-        include "components/contact_type_property.html" prefix="place_" prop=prop
+        include "components/contact_type_property.html" prefix="place_" prop=prop place_type=contactType.name
       %}
     {% endfor %}
   </section>
   <section class="section is-small">
     {% for prop in contactType.contact_properties %}
       {%
-        include "components/contact_type_property.html" prefix="contact_" prop=prop
+        include "components/contact_type_property.html" prefix="contact_" prop=prop place_type=contactType.name
       %}
     {% endfor %}
   </section>

src/routes/add-place.ts

@@ -31,6 +31,19 @@ export default async function addPlace(fastify: FastifyInstance) {
     return resp.view('src/liquid/app/view.html', tmplData);
   });
 
+  fastify.post('/place/dob', async (req, resp) => {
+    const { place_type, prefix, prop_type } = req.query as any;
+    const contactType = Config.getContactType(place_type).contact_properties.find(prop => prop.type === prop_type);
+    return resp.view('src/liquid/components/contact_type_property.html', {
+      data: req.body,
+      include: {
+        prefix: prefix,
+        place_type: place_type,
+        prop: contactType
+      }
+    });
+  });
+
   // you want to create a place? replace a contact? you'll have to go through me first
   fastify.post('/place', async (req, resp) => {
     const { op, type: placeType } = req.query as any;

test/lib/validation.spec.ts

@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import { expect } from 'chai';
 
 import { Validation } from '../../src/lib/validation';
@@ -55,8 +56,12 @@ const scenarios: Scenario[] = [
   { type: 'dob', prop: '2030-05-25', isValid: false },
   { type: 'dob', prop: '2016-05-25', isValid: true, altered: '2016-05-25' },
   { type: 'dob', prop: ' 20 16- 05- 25 ', isValid: true, altered: '2016-05-25' },
-
-
+  { type: 'dob', prop: '20', isValid: true, altered: DateTime.now().minus({ years: 20 }).toISODate() },
+  { type: 'dob', prop: ' 20 ', isValid: true, altered: DateTime.now().minus({ years: 20 }).toISODate() },
+  { type: 'dob', prop: 'abc', isValid: false, altered: 'abc' },
+  { type: 'dob', prop: '  1 0   0 ', isValid: true, altered: DateTime.now().minus({ years: 100 }).toISODate() },
+  { type: 'dob', prop: '-1', isValid: false, altered: '-1' },
+
   { type: 'select_one', prop: ' male', isValid: true, propertyParameter: GENDER_OPTIONS },
   { type: 'select_one', prop: 'female ', isValid: true, propertyParameter: GENDER_OPTIONS },
   { type: 'select_one', prop: 'FeMale ', isValid: false, propertyParameter: GENDER_OPTIONS },