Merge pull request #84 from helsingborg-stad/3.0/fix/notices-form-bui…

…lder 3.0/fix/notices form builder
helsingborg-stad · Sep 8, 2023 · 03c5bbf · 03c5bbf
2 parents 2a34fc5 + cad3420
commit 03c5bbf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/source/php/App.php b/source/php/App.php
@@ -164,11 +164,13 @@ public function updateFieldKeys($postId)
                     }
 
                     // Loop through all other field labels
-                    if ($fieldObject['_name'] == 'label' && !empty($oldValues[$key][$fieldKey]) && $newValues[$key][$fieldKey] != $oldValues[$key][$fieldKey]) {
-                        $updatedValues[] = array(
-                            'old' => sanitize_title($oldValues[$key][$fieldKey]),
-                            'new' => sanitize_title($newValues[$key][$fieldKey])
-                        );
+                    if (is_array($newValues[$key][$fieldKey]) && is_array($oldValues[$key][$fieldKey])) {
+                        if ($fieldObject['_name'] == 'label' && !empty($oldValues[$key][$fieldKey]) && $newValues[$key][$fieldKey] != $oldValues[$key][$fieldKey]) {
+                            $updatedValues[] = array(
+                                'old' => sanitize_title($oldValues[$key][$fieldKey]),
+                                'new' => sanitize_title($newValues[$key][$fieldKey])
+                            );
+                        }
                     }
                 }
             }

diff --git a/source/php/Module/Form.php b/source/php/Module/Form.php
@@ -310,9 +310,10 @@ private function setAttributeList($field)
 
         $field['attributeList'] = [];
 
-        if (!empty($field['value_type']) && $field['value_type' === 'date']) {
-            $field['attributeList']['min'] = SanitizeData::formatDate($field['min_value']);
-            $field['attributeList']['max'] = SanitizeData::formatDate($field['max_value']);
+
+        if (!empty($field['value_type']) && $field['value_type']  === 'date') {
+            $field['attributeList']['min'] = \ModularityFormBuilder\Helper\SanitizeData::formatDate($field['min_value']);
+            $field['attributeList']['max'] = \ModularityFormBuilder\Helper\SanitizeData::formatDate($field['max_value']);
         } elseif (!empty($field['value_type']) && $field['value_type'] === 'time') {
             $field['attributeList']['min'] = trim($field['min_time_value']);
             $field['attributeList']['max'] = trim($field['max_time_value']);

diff --git a/source/php/Module/views/fields/checkbox.blade.php b/source/php/Module/views/fields/checkbox.blade.php
@@ -28,7 +28,7 @@ class="form-group c-field checkbox-group {{$field['required'] ? 'checkbox-group-
                         'value' => $value['value'],
                         'label' => $value['value'],
                         'attributeList' => [
-                            'conditional' => $value['conditional_value'],
+                            'conditional' => !empty($value['conditional_value']) ? $value['conditional_value'] : false,
                             'name' => sanitize_title($field['label']) . '[]',
                         ]
                     ])

diff --git a/source/php/Module/views/fields/input.blade.php b/source/php/Module/views/fields/input.blade.php
@@ -6,7 +6,7 @@
                 'label' => $field['label'],            
                 'type' => $field['value_type'],
                 'value' => '',
-                'invalidMessage' => $field['invalidMessages'][$field['value_type']],     
+                'invalidMessage' => !empty($field['invalidMessages'][$field['value_type']]) ? $field['invalidMessages'][$field['value_type']] : 'Invalid value',     
                 'name' => sanitize_title($field['label']),
                 'description' => (!empty($field['description'])) ? ModularityFormBuilder\Helper\SanitizeData::convertLinks(
                     $field['description']

diff --git a/source/php/Module/views/fields/sender.blade.php b/source/php/Module/views/fields/sender.blade.php
@@ -97,7 +97,7 @@
                     'type' => 'number',
                     'id' =>  $module_id . "-phone-" . uniqid(),
                     'invalidMessage' => $field['invalidMessages']['number'],
-                    'value' => $user_details['phone'],
+                    'value' => !empty($user_details['phone']) ? $user_details['phone'] : false,
                     'name' => sanitize_title($field['labels']['phone']),
                     'required' => in_array('phone', $field['required_fields']),
                     'autocomplete' => 'tel',
@@ -163,7 +163,7 @@
                         'label' => $field['labels']['street_address'],
                         'type' => 'text',
                         'id' =>  $module_id . "-address-street-" . uniqid(),
-                        'value' => $user_details['address'],
+                        'value' => !empty($user_details['address']) ? $user_details['address'] : false,
                         'name' => sanitize_title($field['labels']['address']) . '[' . sanitize_title($field['labels']['street_address']) . ']',
                         'required' => in_array('address', $field['required_fields']),
                         'autocomplete' => 'street-address',
@@ -182,7 +182,7 @@
                     'type' => 'number',
                     'id' =>  $module_id . "-address-postal-code-" . uniqid(),
                     'invalidMessage' => $field['invalidMessages']['number'],
-                    'value' => $user_details['postal_code'],
+                    'value' => !empty($user_details['postal_code']) ? $user_details['postal_code'] : false,
                     'name' => sanitize_title($field['labels']['address']) . '[' . sanitize_title($field['labels']['postal_code']) . ']',
                     'required' => in_array('postal_code', $field['required_fields']),
                     'autocomplete' => 'postal-code'
@@ -196,7 +196,7 @@
                     'label' => $field['labels']['city'],
                     'type' => 'text',
                     'id' =>  $module_id . "-address-city-" . uniqid(),
-                    'value' => $user_details['city'],
+                    'value' => !empty($user_details['city']) ? $user_details['city'] : false,
                     'name' => sanitize_title($field['labels']['address']) . '[' . sanitize_title($field['labels']['city']) . ']',
                     'required' => in_array('city', $field['required_fields']),
                     'autocomplete' => 'on'