Merge branch 'master' into perf-optim

composer.lock

@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "79bc18d26350e10b687172be8875756f",
+    "content-hash": "251c36933c01e97b8318d13231ee67d6",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -390,16 +390,16 @@
         },
         {
             "name": "fideloper/proxy",
-            "version": "4.3.0",
+            "version": "4.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fideloper/TrustedProxy.git",
-                "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a"
+                "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
-                "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
+                "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
                 "shasum": ""
             },
             "require": {
@@ -440,7 +440,7 @@
                 "proxy",
                 "trusted proxy"
             ],
-            "time": "2020-02-22T01:51:47+00:00"
+            "time": "2020-06-23T01:36:47+00:00"
         },
         {
             "name": "fruitcake/laravel-cors",
@@ -701,16 +701,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v7.16.1",
+            "version": "v7.17.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "dc9cd8338d222dec2d9962553639e08c4585fa5b"
+                "reference": "d16ff3a0a66d98e04163456b39c4b7302cf50a40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/dc9cd8338d222dec2d9962553639e08c4585fa5b",
-                "reference": "dc9cd8338d222dec2d9962553639e08c4585fa5b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/d16ff3a0a66d98e04163456b39c4b7302cf50a40",
+                "reference": "d16ff3a0a66d98e04163456b39c4b7302cf50a40",
                 "shasum": ""
             },
             "require": {
@@ -854,7 +854,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-06-16T14:31:25+00:00"
+            "time": "2020-06-24T13:11:25+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4173,30 +4173,33 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be"
+                "reference": "6c6a7c533469873deacf998237e7649fc6b36223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
-                "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/6c6a7c533469873deacf998237e7649fc6b36223",
+                "reference": "6c6a7c533469873deacf998237e7649fc6b36223",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "~2.0",
                 "lib-pcre": ">=7.0",
-                "php": ">=5.6.0"
+                "php": "^7.3.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
+                "phpunit/phpunit": "^8.0.0 || ^9.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -4234,7 +4237,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2019-12-26T09:49:15+00:00"
+            "time": "2020-05-19T14:25:16+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -5782,7 +5785,9 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2.5"
+        "php": "^7.2.5",
+        "ext-json": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

public/css/z.css

@@ -0,0 +1,26 @@
+.z {
+    font-size: 0.81em;
+    padding: 40px 0;
+} .z button {
+    background: #efefef;
+    border: 1px solid #767676;
+    display: block;
+    font-size: 0.9em;
+    margin-bottom: 2px;
+    width: 64px;
+} .z h4 {
+    display: inline-block;
+    margin: 0;
+}
+
+.z [data-title]:before {
+    content: attr(data-title) ': ';
+    font-weight: 500;
+}
+
+.z .hbox {
+    align-items: center;
+    display: flex;
+} .z .hbox > *:not(:first-child) {
+    margin-left: 20px;
+}

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

@@ -5,6 +5,57 @@
 @endsection
 
 @section('inner-content')
+    <div>
+        <h1>Sample info line moe</h1>
+        <div moe>
+            <form show url="/api/clientInfoLine/create">
+                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                <input type="text" name="category" value="" value="" placeholder="category"><br>
+                <input type="text" name="contentText" placeholder="content text"><br>
+                <input type="text" name="whatDoesTheFoxSay" placeholder="What does the fox say?"><br>
+                <button submit>Submit</button>
+            </form>
+        </div>
+    </div>
+
+    <div>
+        <h1>Sample measurement moe</h1>
+        <div moe>
+            <form show url="/api/measurement/create">
+                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                <input type="text" name="label" value="" value="" placeholder="label"><br>
+                <input type="text" name="value" placeholder="value"><br>
+                <input type="date" name="effectiveDate" placeholder="value"><br>
+                <input type="text" name="memo" placeholder="memo"><br>
+                <button submit>Submit</button>
+            </form>
+        </div>
+        <div>
+            <h1>Measurments</h1>
+            <?php $measurements = json_decode($patient->latest_measurements);?>
+            <table class="table table-striped table-sm">
+                <thead>
+                    <tr>
+                        <th>Label</th>
+                        <th>Value</th>
+                        <th>Effective date</th>
+                        <th>Memo</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($measurements as $label => $data)
+                    <tr>
+                        <td>{{$label}}</td>
+                        <td>{{$data->value}}</td>
+                        <td>{{$data->effectiveDate}}</td>
+                        <td>{{$data->memo}}</td>
+                    </tr>
+                    @endforeach
+                    
+                </tbody>
+            </table>
+        </div>
+    </div>
     <pre>
         CARE PLAN: [edit]
 

resources/views/layouts/patient.blade.php

@@ -318,6 +318,61 @@
                     </div>
                 </div>
 
+
+
+                <div class=z>
+                    @if($patient->is_duplicate)
+                        <h5>This chart is a duplicate of <a href=javascript:void(0)>Cooper, Amiele</a>.</h5><br>
+                    @endif
+                    <div class=hbox>
+                        <section>
+                            <div>
+                                <h4>{{$patient->name_last}}, {{$patient->name_first}}</h4>
+                                <i>#{{$patient->chart_number}}</i>
+                            </div>
+                            <div>Born <b>{{$patient->dob}}</b>, <b>{{$patient->age_in_years}}</b> y.o {{$patient->sex}}</div>
+                        </section>
+                        @if($patient->mcp)
+                        <section>
+                            <div data-title=PCP>{{$patient->mcp->name_last}}, {{$patient->mcp->name_first}}</div>
+                            <div data-title=MA>{{$patient->mcp->name_last}}, {{$patient->mcp->name_first}}</div>
+                        </section>
+                        @endif
+                        <section data-title=MCN>
+                            @if($patient->mcn)
+                                @if($patient->was_medicare_validation_successful)
+                                    <div>
+                                        Valid #,
+                                        @if($patient->is_part_b_primary == 'YES')
+                                            Medicare Part B <i class="fa fa-check"></i>
+                                        @else
+                                            Not Medicare Part B <i class="fa fa-times"></i>
+                                            @if($patient->is_medicare_advantage == 'YES')
+                                                , Medicare Advantage,
+                                                {{$patient->medicare_advantage_plan}}
+                                            @endif
+                                        @endif
+                                    </div>
+                                @else
+                                    {{$patient->mcn}}
+                                    <div>INVALID! <i class="fa fa-times"></i></div>
+                                @endif
+                            @else
+                                <div>None provided. <i class="fa fa-times"></i></div>
+                            @endif
+                        </section>
+                        <section>
+                            <div data-title=Allergies>Grass, Pollen, Latex</div>
+                            <div data-title=Focus>T2DM, CAD, HTN, Weight Loss</div>
+                            <div data-title="Next Appt">{{$patient->mcp_onboarding_visit_date}}</div>
+                        </section>
+                        <section>
+                            <button>+ Note</button>
+                            <button>Pt. Ed.</button>
+                            <button>Video</button>
+                        </section>
+                    </div>
+                </div> <!-- z -->
             </main>
         </div>
     </div>

resources/views/layouts/template.blade.php

@@ -16,6 +16,7 @@
     <link href="{{ asset('/css/style.css') }}" rel="stylesheet">
     <link href="{{ asset('/css/yemi.css') }}" rel="stylesheet">
     <link rel="stylesheet" href="{{ asset('/css/toastr.min.css') }}">
+    <link href="{{asset('/css/z.css')}}" rel=stylesheet>
     <!-- Styles -->
 
     <script src="{{ asset('js/app.js') }}" type="application/javascript"></script>