resolve merge conflicts

idtlabs-xyz · Aug 1, 2017 · b32e527 · b32e527
2 parents f094bbf + a48edd1
commit b32e527
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/webform_cac/src/Element/ContactCac.php b/webform_cac/src/Element/ContactCac.php
@@ -35,14 +35,25 @@ public static function getCompositeElements() {
       '#type' => 'number',
       '#title' => t('Shares %'),
     ];
+    $elements['occupation'] = [
+      '#type' => 'textfield',
+      '#title' => t('Occupation'),
+    ];
+    $elements['other_directorship'] = [
+      '#type' => 'textfield',
+      '#title' => t('Particulars of other Directorship'),
+    ];
+    $elements['appointment_date'] = [
+      '#type' => 'date',
+      '#title' => t('Date of Appointment'),
+    ];
+
+
+
+
+
+
 
-/*    $elements['identification_fid'] = [
-      '#title' => t('Identification'),
-      '#type' => 'managed_file',
-      '#upload_validators' => [
-        'file_validate_extensions' => ['gif png jpg jpeg'],
-      ],
-    ];*/
 
 
     return $elements;

diff --git a/webform_cac/src/Plugin/WebformElement/WebformContactCaC.php b/webform_cac/src/Plugin/WebformElement/WebformContactCaC.php
@@ -59,6 +59,12 @@ protected function formatTextItemValue(array $element, WebformSubmissionInterfac
     if (!empty($value['phone'])) {
       $lines['phone'] = $value['phone'];
     }
+    if (!empty($value['occupation'])) {
+      $lines['occupation'] = $value['occupation'];
+    }
+    if (!empty($value['other_directorship'])) {
+      $lines['other_directorship'] = $value['other_directorship'];
+    }
     return $lines;
   }