Updates

Author: CamilleBeau

modules/candidate_parameters/ajax/getData.php

@@ -578,7 +578,13 @@ function getDODFields(): array
     $db     = \NDB_Factory::singleton()->database();
 
     $candidateData = $db->pselectRow(
-        'SELECT PSCID,DoD, DoB FROM candidate where CandID =:candid',
+        'SELECT
+            PSCID,
+            DoD,
+            DoD_precision,
+            DoB
+        FROM candidate
+        WHERE CandID =:candid',
         ['candid' => $candID]
     );
     if ($candidateData === null) {
@@ -606,11 +612,12 @@ function getDODFields(): array
     $dob = $dobDate ? $dobDate->format($dobProcessedFormat) : null;
 
     $result = [
-        'pscid'     => $candidateData['PSCID'],
-        'candID'    => $candID->__toString(),
-        'dod'       => $dod,
-        'dob'       => $dob,
-        'dodFormat' => $config->getSetting('dodFormat'),
+        'pscid'         => $candidateData['PSCID'],
+        'candID'        => $candID->__toString(),
+        'dod'           => $dod,
+        'dob'           => $dob,
+        'dod_precision' => $candidateData['DoD_precision'],
+        'dodFormat'     => $config->getSetting('dodFormat'),
     ];
     return $result;
 }

modules/candidate_parameters/jsx/CandidateDOB.js

@@ -91,6 +91,12 @@ class CandidateDOB extends Component {
     }
 
     let dateFormat = this.state.data.dobFormat;
+
+    let dobValue = this.state.formData.dob || '';
+    if (dateFormat == 'Ym' && this.state.formData.dob) {
+      dobValue = dobValue.slice(0, 7);
+    }
+
     let disabled = true;
     let updateButton = null;
     if (loris.userHasPermission('candidate_dob_edit')) {
@@ -126,7 +132,7 @@ class CandidateDOB extends Component {
           <DateElement
             label={t('DoB', {ns: 'loris'})}
             name='dob'
-            dateFormat={dateFormat}
+            dateFormat={dobValue}
             value={this.state.formData.dob}
             onUserInput={this.setFormData}
             disabled={disabled}

modules/candidate_parameters/jsx/CandidateDOD.js

@@ -65,7 +65,13 @@ class CandidateDOD extends Component {
    * @param {*} value
    */
   setFormData(formElement, value) {
-    let formData = this.state.formData;
+    let formData = {...this.state.formData};
+
+    // Clear the DOD if indicated as unknown
+    if (formElement === 'dod_precision' && value === 'unknown') {
+      formData.dod = '';
+    }
+
     formData[formElement] = value;
     this.setState({
       formData: formData,
@@ -89,20 +95,30 @@ class CandidateDOD extends Component {
       return <Loader/>;
     }
 
-    let dateFormat = this.state.data.dodFormat;
     let disabled = true;
     let updateButton = null;
     if (loris.userHasPermission('candidate_dod_edit')) {
       disabled = false;
       updateButton = <ButtonElement label={t('Update', {ns: 'loris'})}/>;
     }
+
     let precisionOptions = {
-      'known_year_month' : t('Known year and month'),
-      'known_year' : t('Known year'),
-      'unknown' : t('Unknown date'),
+      'known_year_month': t('I know the year and month of death'),
+      'known_year': t('I know the year of death'),
+      'unknown': t('I do not know the date of death'),
     };
+
     let required = this.state.formData.dod_precision != 'unknown';
 
+    let dateFormat = this.state.data.dodFormat;
+
+    let dodValue = this.state.formData.dod || '';
+    if (dateFormat == 'Ymd') {
+      precisionOptions['known_full'] = t('I know the full date of death');
+    } else if (dateFormat == 'Ym' && this.state.formData.dod) {
+      dodValue = dodValue.slice(0, 7);
+    }
+
     return (
       <div className='row'>
         <FormElement

modules/candidate_parameters/locale/candidate_parameters.pot

@@ -227,3 +227,18 @@ msgstr ""
 
 msgid "Comments: "
 msgstr ""
+
+msgid "I know the year and month of death"
+msgstr ""
+
+msgid "I know the year of death"
+msgstr ""
+
+msgid "I do not know the date of death"
+msgstr ""
+
+msgid "I know the full date of death"
+msgstr ""
+
+msgid "Precision of date:"
+msgstr ""