Merge remote-tracking branch 'origin/dev' into dev-vj

resources/views/app/patient/canvas-sections/dx/form.blade.php

@@ -1,4 +1,10 @@
 <?php
+if(!isset($contentData['items'])){
+    $contentData['items'] = [];
+}
+if(!is_array($contentData['items'])){
+    $contentData['items'] = [];
+}
 if(!$contentData || !isset($contentData['items']) || !count($contentData['items'])) {
     $contentData = [
         "items" => [

resources/views/app/patient/canvas-sections/dx/summary.php

@@ -7,6 +7,7 @@ if($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["dx"])) {
         $contentData = $canvasData["dx"];
+
         if(!isset($contentData['items'])){
             $contentData['items'] = [];
         }