root 3 rokov pred
rodič
commit
8967457b41

+ 1 - 1
composer.json

@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.2.5",
         "ext-json": "*",
-        "barryvdh/laravel-dompdf": "^0.9.0",
+        "barryvdh/laravel-dompdf": "^1.0",
         "doctrine/dbal": "2.*",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",

+ 21 - 15
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "34df0ad7656ca9400a6f4e20eb6b5ea4",
+    "content-hash": "8061210e82f08a2d56c8b3c70d3c8412",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -60,34 +60,40 @@
         },
         {
             "name": "barryvdh/laravel-dompdf",
-            "version": "v0.9.0",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b"
+                "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b",
-                "reference": "5b99e1f94157d74e450f4c97e8444fcaffa2144b",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/e3f429e97087b2ef19b83e5ed313f080f2477685",
+                "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685",
                 "shasum": ""
             },
             "require": {
                 "dompdf/dompdf": "^1",
-                "illuminate/support": "^5.5|^6|^7|^8",
-                "php": "^7.1 || ^8.0"
+                "illuminate/support": "^6|^7|^8|^9",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "nunomaduro/larastan": "^1|^2",
+                "orchestra/testbench": "^4|^5|^6|^7",
+                "phpro/grumphp": "^1",
+                "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.9-dev"
+                    "dev-master": "1.0-dev"
                 },
                 "laravel": {
                     "providers": [
                         "Barryvdh\\DomPDF\\ServiceProvider"
                     ],
                     "aliases": {
-                        "PDF": "Barryvdh\\DomPDF\\Facade"
+                        "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
                     }
                 }
             },
@@ -112,17 +118,17 @@
                 "laravel",
                 "pdf"
             ],
-            "support": {
-                "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
-                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.9.0"
-            },
             "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
                 {
                     "url": "https://github.com/barryvdh",
                     "type": "github"
                 }
             ],
-            "time": "2020-12-27T12:05:53+00:00"
+            "time": "2022-01-29T08:02:59+00:00"
         },
         {
             "name": "brick/math",
@@ -7390,5 +7396,5 @@
         "ext-json": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "1.1.0"
 }

+ 2 - 2
resources/views/app/patient/note/segment-slim.blade.php

@@ -10,7 +10,7 @@ $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) ==
      data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
      data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
 
-    <div class="d-flex align-items-start bg-light text-secondary {{$segment->heading ? 'p-1' : 'py-1 pr-1'}}">
+    <div class="d-flex align-items-start bg-light text-dark {{$segment->heading ? 'p-1' : 'py-1 pr-1'}}">
 
     <!-- title -->
 
@@ -73,4 +73,4 @@ $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) ==
 
 
 
-</div>
+</div>

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

@@ -59,7 +59,7 @@ if ($point && @$point->data) {
                                     </div>
                                     <div class="col-6">
                                         <select class="form-control form-control-sm" v-model="data.current_overall_health_level">
-                                            <option value="0">0 - Very poor health</option>
+                                            <option value="0">0 - Very low</option>
                                             <option value="1">1</option>
                                             <option value="2">2</option>
                                             <option value="3">3</option>
@@ -69,7 +69,7 @@ if ($point && @$point->data) {
                                             <option value="7">7</option>
                                             <option value="8">8</option>
                                             <option value="9">9</option>
-                                            <option value="10">10 - Excellent health</option>
+                                            <option value="10">10 - Very hight</option>
                                         </select>
                                     </div>
                                 </div>
@@ -430,4 +430,4 @@ if ($point && @$point->data) {
             });
         };
     })();
-</script>
+</script>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 18 - 0
resources/views/app/patient/segment-templates/ns_weight_loss_new_patient/edit.blade.php


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 18 - 0
resources/views/app/patient/segment-templates/ns_weight_loss_new_patient/summary.blade.php


+ 1 - 1
resources/views/app/patient/segment-templates/omega_informed_consent/edit.blade.php

@@ -24,7 +24,7 @@ if (!!@$point->data) {
                 <input type="checkbox" data-name="informed_consent" {{@($contentData["informed_consent"] ? 'checked' : '')}}>
             </div>
             <div>
-                <div>This is a {{$note->method}} visit that was performed on {{friendly_date($note->effective_dateest)}}. Verbal consent to participate in a video visit was obtained.</div>
+                <div>This is a {{$note->method}} visit that was performed on {{friendly_date($note->effective_dateest)}}. Verbal consent to participate was obtained.</div>
                 <div>This visit occurred during the Coronavirus (COVID-19) Public Health Emergency.</div>
                 <div>I discussed with the patient the nature of our visit, that:</div>
                 <div class="ml-3">- I would evaluate the patient and recommend diagnostics and treatments based on my assessment.</div>

+ 1 - 1
resources/views/app/patient/segment-templates/omega_informed_consent/summary.blade.php

@@ -23,7 +23,7 @@ if (!!@$point->data) {
     <div class="flex-grow-1">
     @if(@($contentData["informed_consent"]))
         <div>
-            <div>This is a {{$note->method}} visit that was performed on {{friendly_date($note->effective_dateest)}}. Verbal consent to participate in a video visit was obtained.</div>
+            <div>This is a {{$note->method}} visit that was performed on {{friendly_date($note->effective_dateest)}}. Verbal consent to participate was obtained.</div>
             <div>This visit occurred during the Coronavirus (COVID-19) Public Health Emergency.</div>
             <div>I discussed with the patient the nature of our visit, that:</div>
             <div class="ml-3">- I would evaluate the patient and recommend diagnostics and treatments based on my assessment.</div>

+ 2 - 2
resources/views/app/patient/vitals-settings.blade.php

@@ -6,7 +6,7 @@
     <hr class="m-neg-4">
 
     <div class="row" id="vitals-settings-{{$patient->uid}}">
-        <div class="col-5 border-right">
+        <div class="col-12 border-right">
             <div class="d-flex align-items-baseline">
                 <b>BMI/Weight Management</b>
                 <span class="mx-2 text-secondary">|</span>
@@ -16,7 +16,7 @@
                 @include('app.patient.vitals-settings.bmi-management-summary')
             </div>
         </div>
-        <div class="col-7">
+        <div class="col-12">
             <div class="d-flex align-items-baseline">
                 <b>BP Management</b>
                 <span class="mx-2 text-secondary">|</span>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov