Merge branch 'master' into dev-vj

app/Http/Controllers/NoteController.php

@@ -83,6 +83,7 @@ class NoteController extends Controller
                 'key' => $sectionTemplate->internal_name,
                 'data' => $request->get('data')
             ];
+
             $response = $this->calljava($request, '/client/updateCanvasData', $data);
             //TODO: handle $response->success == false
 

public/js/mc.js

@@ -349,6 +349,6 @@ function initPatientPresenceIndicator() {
                     }
                 }, 'json');
             }
-        }, 2500000);
+        }, 2500);
     }
 }

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

@@ -30,7 +30,7 @@ $formID = rand(0, 100000);
                 watch: {
                     $data: {
                         handler: function(val, oldVal) {
-                            $(this.$el).closest('form').find('[name="canvasData"]').val(JSON.stringify({
+                            $(this.$el).closest('form').find('[name="data"]').val(JSON.stringify({
                                 count: this.count,
                                 unknown: this.unknown,
                                 items: this.cleanArray(this.items)

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

@@ -10,7 +10,7 @@ if(!$contentData) {
 $formID = rand(0, 100000);
 ?>
 <div id="fhxSection">
-    <input type="hidden" name="data" value="">
+    <input type="hidden" name="data" value="{{json_encode($contentData)}}">
     <div class="border border-secondary rounded mb-2 p-2">
         <label class="my-0 d-flex align-items-center">
             <input type="checkbox" class="my-0 mr-2" v-model="unknown" name="unknown">

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

@@ -44,7 +44,7 @@ if(!$contentData) {
 $formID = rand(0, 100000);
 ?>
 <div id="pmhx_{{ $formID }}">
-    <input type="hidden" name="data" value="">
+    <input type="hidden" name="data" value="{{json_encode($contentData)}}">
     <div class="mb-3 d-flex align-items-start">
         <div class="width-100px mr-3">
             <label class="text-secondary mb-1">Blood Type</label>

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

@@ -30,7 +30,7 @@ if(!$contentData) {
 $formID = rand(0, 100000);
 ?>
 <div id="pshx_{{ $formID }}">
-    <input type="hidden" name="data" value="">
+    <input type="hidden" name="data" value="{{json_encode($contentData)}}">
     <div class="row">
         <div class="col-12">
             <div class="font-weight-bold my-1">Common Surgeries</div>
@@ -167,7 +167,7 @@ $formID = rand(0, 100000);
                 watch: {
                     $data: {
                         handler: function(val, oldVal) {
-                            $(this.$el).closest('form').find('[name="canvasData"]').val(JSON.stringify({
+                            $(this.$el).closest('#pshx_{{ $formID }}').find('[name="data"]').val(JSON.stringify({
                                 common: this.cleanObject(this.common),
                                 customFields: this.customFields,
                                 comments: this.comments,

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

@@ -33,7 +33,7 @@ if(!$contentData) {
 $formID = rand(0, 100000);
 ?>
 <div id="sochx_{{ $formID }}">
-    <input type="hidden" name="data" value="">
+    <input type="hidden" name="data" value="{{json_encode($contentData)}}">
     <div class="row">
         @for ($i = 0; $i < count($fields); $i++)
             <div class="col-md-3">

resources/views/app/patient/note/note-section-list.blade.php

@@ -181,7 +181,6 @@ if ($latestSectionTS === 0 || $latestSectionTS < $sectionTS) {
 
             var _form = _section.find('form[processed]')[0];
             if(_form){
-                console.log("Form found: ", _form);
                 console.log("Form found. submitting normally");
                 $.post("/process_form_submit", $(_form).serialize(), function(resp) {
                     handleSubmitResponse(resp,_section, summaryContainer)

resources/views/app/video/call.blade.php

@@ -547,7 +547,7 @@
                     this.refresh();
                     window.setInterval(function() {
                         self.refresh();
-                    }, 2500000);
+                    }, 2500);
                 },
                 methods: {
                     refresh: function() {

resources/views/layouts/template.blade.php

@@ -255,7 +255,7 @@
                     $('.current-work').html(_data);
                     initFastLoad($('.current-work'));
                 });
-            }, 2500000);
+            }, 2500);
         });
     </script>
     <script>

storage/sections/physical-activity-assessment/form.blade.php

@@ -9,7 +9,7 @@ if (!$contentData) {
 $formID = rand(0, 100000);
 
 ?>
-<form method="POST" action="/process_form_submit" onsubmit="return submitForm_NoteSection_{{ $formID }}(this);">
+<form processed method="POST" action="/process_form_submit" onsubmit="return submitForm_NoteSection_{{ $formID }}(this);">
     <?php if($section): ?>
     <input type="hidden" name="section_uid" value="<?= $section->uid?>">
     <?php else: ?>
@@ -805,26 +805,8 @@ $formID = rand(0, 100000);
             </label>
         </div>
     </div>
-
-    <div class="form-group m-0 d-flex">
-        <button class="btn btn-sm btn-primary mr-2">Done</button>
-        {{--<button class="btn btn-sm btn-default border" onclick="return cancelForm_NoteSection_{{ $formID }}(this)">Cancel</button>--}}
-    </div>
 </form>
 <script>
-    function submitForm_NoteSection_{{ $formID }}(_form) {
-        showMask();
-        $.post(_form.action, $(_form).serialize(), function (_data) {
-            fastReload();
-        });
-        return false;
-    }
-
-    function cancelForm_NoteSection_{{ $formID }}(_trigger) {
-        $(_trigger).closest('.note-section').toggleClass('edit');
-        return false;
-    }
-
     function onGemVChange_{{ $formID }}(_field) {
         let name = _field.name, span = $('span[field="' + _field.name + '"]');
         if (span.length) {