Merge branch 'dev' into dev-vj

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

@@ -0,0 +1,18 @@
+<?php
+
+if (!$contentData || !isset($contentData['value'])) {
+    $contentData = [
+        'value' => ''
+    ];
+}
+$formID = rand(0, 100000);
+?>
+<div id="ros_{{$formID}}">
+    <input type="hidden" name="data" value="{{json_encode(['value'=>$contentData['value']])}}">
+    <?php if (isset($section)) : ?>
+        <input type="hidden" name="section_uid" value="<?= $section->uid ?>">
+    <?php endif; ?>
+    <div class="form-group mb-2">
+        <div note-rte note-rte-ros data-content="{{$contentData['value']}}" class="form-group mb-2 border-left border-right rte-holder"></div>
+    </div>
+</div>

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

@@ -0,0 +1,23 @@
+<?php 
+$contentData = [
+    'value'=>''
+];
+$isempty = false;
+if ($patient->canvas_data) {
+    $canvasData = json_decode($patient->canvas_data, true);
+    if (isset($canvasData["ros"])) {
+        $contentData = $canvasData["ros"];
+    }
+    else {
+        $isempty = true;
+    }
+}
+else {
+    $isempty = true;
+}
+
+if($isempty) {
+    echo '<span class="text-secondary">No ROS data</span>';
+}else {
+    echo $contentData['value'];
+}

resources/views/app/patient/dashboard.blade.php

@@ -304,6 +304,21 @@
                     </div>
                 </div>--}}
 
+                {{-- ROS --}}
+                <div class="pt-2 mt-2 border-top">
+                    <div class="note-section">
+                        <div class="d-flex align-items-center pb-2">
+                            <h6 class="my-0 font-weight-bold text-secondary">ROS</h6>
+                            <span class="mx-2 text-secondary">|</span>
+                            @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'ros'])
+                            @include('app.patient.note.section_script')
+                        </div>
+                        <div class="bg-light border p-2 mb-3">
+                            @include('app.patient.canvas-sections.ros.summary')
+                        </div>
+                    </div>
+                </div>
+
                 {{-- history_medical --}}
                 <div class="pt-2 mt-2 border-top">
                     <div class="d-flex align-items-center pb-2">