فهرست منبع

made covid intake a global singleton

= 3 سال پیش
والد
کامیت
a969d566a2

+ 5 - 3
resources/views/app/patient/segment-templates/covid_intake/edit.blade.php

@@ -3,9 +3,9 @@
 use App\Models\Point;
 
 $category = 'COVID_INTAKE';
-$endPoint = 'upsertNoteSingleton';
+$endPoint = 'upsertGlobalSingleton';
 
-$point = Point::where('added_in_segment_id', $segment->id)->where('category', $category)->orderBy('id', 'DESC')->first();
+$point = Point::getGlobalSingletonOfCategory($patient, 'COVID_INTAKE', true);
 $contentData = [
     "ans_how_are_you" => '',
     "ans_is_address_correct" => null, // yes/no
@@ -127,9 +127,11 @@ $contentData = [
     "ans_edu_provided_cdc_guidelines" => null, // checkbox
 
 ];
+
 if (!!@$point->data) {
-    $contentData = json_decode($point->data, true);
+    $contentData = $point->data;
 }
+
 ?>
 <div visit-moe close-on-save close-on-cancel class="d-block p-3">
     <form show url="/api/visitPoint/<?= $endPoint ?>" class="mcp-theme-1">

+ 4 - 3
resources/views/app/patient/segment-templates/covid_intake/summary.blade.php

@@ -3,9 +3,10 @@
 use App\Models\Point;
 
 $category = 'COVID_INTAKE';
-$endPoint = 'upsertNoteSingleton';
+$endPoint = 'upsertGlobalSingleton';
+
+$point = Point::getGlobalSingletonOfCategory($patient, 'COVID_INTAKE', true);
 
-$point = Point::where('added_in_segment_id', $segment->id)->where('category', $category)->orderBy('id', 'DESC')->first();
 $contentData = [
     "ans_how_are_you" => '',
     "ans_is_address_correct" => null, // yes/no
@@ -114,7 +115,7 @@ $contentData = [
 
 ];
 if (!!@$point->data) {
-    $contentData = json_decode($point->data, true);
+    $contentData = $point->data;
 }
 ?>
 <div class="events-none form-read-mode">