updates on dashboard

app/Models/Client.php

@@ -38,4 +38,8 @@ class Client extends Model
         return $this->hasMany(ActionItem::class, 'client_id', 'id')->orderBy('created_at', 'desc');
     }
 
+    public function infoLines() {
+	return $this->hasMany(ClientInfoLine::class, 'client_id', 'id')->orderBy('created_at', 'desc');
+    }
+
 }

app/Models/ClientInfoLine.php

@@ -12,7 +12,17 @@ class ClientInfoLine extends Model
         return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');
     }
 
-    public function contentDetail() {
-        return json_decode($this->content_detail);
+    public function contentDetail($prop = null) {
+        $x = json_decode($this->content_detail);
+	if(!$prop){        
+		return $x;	
+	}else{
+		$x = json_decode($this->content_detail, true);
+		if(isset($x[$prop])){
+			return $x[$prop];
+		}else{
+			return '';
+		}
+	}
     }
 }

package.json

@@ -11,7 +11,7 @@
     },
     "devDependencies": {
         "axios": "^0.19",
-        "cross-env": "^7.0",
+        "cross-env": "^7.0.2",
         "laravel-mix": "^5.0.1",
         "lodash": "^4.17.13",
         "resolve-url-loader": "^3.1.0",

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

@@ -7,6 +7,16 @@
         <?php $infoLines = json_decode($patient->info_lines);?>
         <?php $infoLines = !$infoLines ? [] : $infoLines; ?>
 
+	<?php
+		function getVal($object, $prop){
+			if(isset($object->$prop)){
+				return $object->prop;
+			}else{
+				return '';
+			}
+		}
+	?>
+
         <div class="row">
             <div class="col-6">
                 {{-- allergies --}}
@@ -27,9 +37,9 @@
                             </form>
                         </div>
 
-			<span class="mx-2 text-secondary">|</span>
+                        <span class="mx-2 text-secondary">|</span>
 
-	    <div moe>
+            <div moe>
                 <a start show class="">Multi</a>
                 <form url="/api/clientInfoLine/createMultiple">
                     <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
@@ -125,7 +135,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -235,14 +245,14 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
                 <form url="/api/clientInfoLine/createMultiple">
                     <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                     <input type="hidden" name="category" value="dx">
-                    <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx's & Focus Areas"></textarea></div>
+                    <div class="mb-2"><textarea class="form-control form-control-sm" rows="8" name="contentTexts" value="" placeholder="Dx & Focus Areas"></textarea></div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -291,23 +301,23 @@
                                                             <input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Title">
                                                         </div>
                                                         <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ $line->contentDetail->{"ICD"} }}" placeholder="ICD">
+                                                            <input type="text" class="form-control form-control-sm" name="ICD" value="{{ getVal($line->contentDetail, "ICD") }}" placeholder="ICD">
                                                         </div>
                                                         <div class="mb-2">
                                                             <select name="Chronic or Acute" class="form-control form-control-sm pl-1">
                                                                 <option>Chronic or Acute (select one)</option>
-                                                                <option {{ $line->contentDetail->{"Chronic or Acute"} === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
-                                                                <option {{ $line->contentDetail->{"Chronic or Acute"} === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
+                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Chronic' ? 'selected' : '' }} value="Chronic">Chronic</option>
+                                                                <option {{ getVal($line->contentDetail, ("Chronic or Acute")) === 'Acute' ? 'selected' : '' }} value="Acute">Acute</option>
                                                             </select>
                                                         </div>
                                                         <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ $line->contentDetail->{"Prognosis"} }}" placeholder="Prognosis">
+                                                            <input type="text" class="form-control form-control-sm" name="Prognosis" value="{{ getVal($line->contentDetail, "Prognosis") }}" placeholder="Prognosis">
                                                         </div>
                                                         <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ $line->contentDetail->{"Treatment Goal"} }}</textarea>
+                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Goal" placeholder="Treatment Goal">{{ getVal($line->contentDetail, "Treatment Goal") }}</textarea>
                                                         </div>
                                                         <div class="mb-2">
-                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ $line->contentDetail->{"Treatment Plan"} }}</textarea>
+                                                            <textarea type="text" class="form-control form-control-sm" name="Treatment Plan" placeholder="Treatment Plan">{{ getVal($line->contentDetail, "Treatment Plan") }}</textarea>
                                                         </div>
                                                         <div class="d-flex align-items-center">
                                                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -317,9 +327,9 @@
                                                 </div>
                                                 <span class="font-weight-bold">{{$line->contentText}}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">{{ $line->contentDetail->{"Chronic or Acute"} }}</span>
+                                                <span class="text-secondary">{{ getVal($line->contentDetail, "Chronic or Acute") }}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">ICD: {{ $line->contentDetail->{"ICD"} ? $line->contentDetail->{"ICD"} : '-' }}</span>
+                                                <span class="text-secondary">ICD: {{ getVal($line->contentDetail, "ICD") ? $line->contentDetail("ICD") : '-' }}</span>
                                             </div>
                                         </td>
                                     </tr>
@@ -361,7 +371,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -414,12 +424,12 @@
                                                         <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                                         <input type="hidden" name="category" value="care_team">
                                                         <div class="mb-2"><input type="text" class="form-control form-control-sm" name="contentText" value="{{$line->contentText}}" placeholder="Name"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="{{$line->contentDetail->{'Specialty'} }}" placeholder="Specialty"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="{{$line->contentDetail->{'Organization'} }}" placeholder="Organization"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="{{$line->contentDetail->{'Phone'} }}" placeholder="Phone"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="{{$line->contentDetail->{'Fax'} }}" placeholder="Fax"></div>
-                                                        <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="{{$line->contentDetail->{'Next Appointment'} }}" placeholder="Next Appointment"></div>
-                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="{{$line->contentDetail->{'Memo'} }}" placeholder="Memo"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Specialty" value="{{ getVal($line->contentDetail, 'Specialty') }}" placeholder="Specialty"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Organization" value="{{getVal($line->contentDetail, 'Organization') }}" placeholder="Organization"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Phone" value="{{getVal($line->contentDetail, 'Phone') }}" placeholder="Phone"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Fax" value="{{getVal($line->contentDetail, 'Fax') }}" placeholder="Fax"></div>
+                                                        <div class="mb-2"><input type="date" class="form-control form-control-sm" name="Next Appointment" value="{{getVal($line->contentDetail, 'Next Appointment') }}" placeholder="Next Appointment"></div>
+                                                        <div class="mb-2"><input type="text" class="form-control form-control-sm" name="Memo" value="{{getVal($line->contentDetail, 'Memo') }}" placeholder="Memo"></div>
                                                         <div class="d-flex align-items-center">
                                                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -428,9 +438,9 @@
                                                 </div>
                                                 <span class="font-weight-bold">{{$line->contentText}}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">{{ $line->contentDetail->{"Specialty"} }}</span>
+                                                <span class="text-secondary">{{ getVal($line->contentDetail, 'Specialty') }}</span>
                                                 <span class="text-secondary mx-1">/</span>
-                                                <span class="text-secondary">Next Apt: {{ $line->contentDetail->{"Next Appointment"} ? $line->contentDetail->{"Next Appointment"} : '-' }}</span>
+                                                <span class="text-secondary">Next Apt: {{ getVal($line->contentDetail, 'Next Appointment') ? $line->contentDetail('Next Appointment') : '-' }}</span>
                                             </div>
                                         </td>
                                     </tr>
@@ -478,7 +488,7 @@
                                 </div>
                             </form>
                         </div>
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -556,7 +566,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -635,7 +645,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -714,9 +724,9 @@
                                 </div>
                             </form>
                         </div>
-                    
 
-			 <span class="mx-2 text-secondary">|</span>
+
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -795,7 +805,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -875,7 +885,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>
@@ -955,7 +965,7 @@
                             </form>
                         </div>
 
-			 <span class="mx-2 text-secondary">|</span>
+                         <span class="mx-2 text-secondary">|</span>
 
             <div moe>
                 <a start show class="">Multi</a>