Browse Source

Use "last, first" for pro name display in all places

Vijayakrishnan Krishnan 5 years ago
parent
commit
0d84e37e30
2 changed files with 19 additions and 6 deletions
  1. 13 0
      app/Models/Pro.php
  2. 6 6
      resources/views/app/patient/care-month/dashboard.blade.php

+ 13 - 0
app/Models/Pro.php

@@ -8,6 +8,19 @@ class Pro extends Model
 {
     protected $table = 'pro';
 
+    public function displayName() {
+        $name = [];
+        if(!empty($this->name_last)) $name[] = $this->name_last;
+        if(!empty($this->name_first)) $name[] = $this->name_first;
+        if(!count($name)) {
+            $name = $this->name_display;
+        }
+        else {
+            $name = implode(", ", $name);
+        }
+        return $name;
+    }
+
     public function cmBills()
     {
         return $this->hasMany(Bill::class, 'cm_pro_id');

+ 6 - 6
resources/views/app/patient/care-month/dashboard.blade.php

@@ -87,19 +87,19 @@
         <div class="row m-negator bg-light py-1 text-sm-incl-children">
             <div class="col-3 pl-3-5">
                 <span class="text-secondary">MCP:</span>
-                <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->mcp ? $careMonth->mcp->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">CM:</span>
-                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">RMM:</span>
-                <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->rmmPro ? $careMonth->rmmPro->displayName() : '-' }}</span>
             </div>
             <div class="col-3">
                 <span class="text-secondary">RME:</span>
-                <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->name_display : '-' }}</span>
+                <span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
             </div>
         </div>
 
@@ -169,7 +169,7 @@
                                     <select class="form-control form-control-sm" name="proUid">
                                         <option value="">-- Select Pro --</option>
                                         @foreach($pros as $pro)
-                                        <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                        <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -319,7 +319,7 @@
                                     <select class="form-control form-control-sm" name="proUid">
                                         <option value="">-- Select Pro --</option>
                                         @foreach($pros as $pro)
-                                            <option value="{{ $pro->uid }}">{{ $pro->name_display }}</option>
+                                            <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
                                         @endforeach
                                     </select>
                                 </div>