Merge branch 'dev' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -2601,7 +2601,7 @@ ORDER BY c.name_last, c.name_first
     public function visitTemplate(Request $request, VisitTemplate $visitTemplate){
         $visitTemplateSegmentTemplates = VisitTemplateSegmentTemplate::query();
         $visitTemplateSegmentTemplates = $visitTemplateSegmentTemplates->where('visit_template_id', $visitTemplate->id);
-        $visitTemplateSegmentTemplates = $visitTemplateSegmentTemplates->orderBy('position_index', 'DESC');
+        $visitTemplateSegmentTemplates = $visitTemplateSegmentTemplates->orderBy('position_index', 'ASC');
         $visitTemplateSegmentTemplates = $visitTemplateSegmentTemplates->paginate(50);
         return view('app.practice-management.visit-templates.visit-template-segment-templates.index', compact('visitTemplate','visitTemplateSegmentTemplates'));
     }

app/Models/Pro.php

@@ -140,8 +140,12 @@ class Pro extends Model
     }
 
     public function visitTemplates() {
-        //TODO: use visit access
-        return VisitTemplate::select('visit_template.*')->join('visit_template_access', 'visit_template.id', 'visit_template_access.visit_template_id')->where('visit_template_access.pro_id', $this->id)->where('visit_template.is_active', true)->get();
+        if($this->pro_type == 'ADMIN'){
+            return VisitTemplate::where('is_active' , true)->get();
+        }
+
+        $accesses = VisitTemplateAccess::where('pro_id', $this->id)->where('is_active', true)->pluck('visit_template_id')->toArray();
+        return VisitTemplate::whereIn('id', $accesses)->get();
     }
 
     public function currentWork() {

resources/views/app/practice-management/visit-templates/visit-template-accesses/create.blade.php

@@ -1,13 +1,14 @@
 <div id="createVisitTemplateProAccess">
 	<div moe>
 		<a start show href="#">Create</a>
-		<form url="/api/visitTemplateAccess/create" class="mt-2">
+		<form url="/api/visitTemplateAccess/createBulk" class="mt-2">
 			<input type="hidden" name="visitTemplateUid" value="{{ $visitTemplate->uid }}">
+			<input type="hidden" name="proUids" />
 
 			<div class="sm-section" style="width: 250px !important;">
 				<div class="">
 					<label class="mb-1 text-secondary">Pro:</label>
-					<select id="searchForProInput" name="proUid" class="form-control input-sm"></select>
+					<select id="searchForProInput" name="proUid" class="form-control input-sm" multiple></select>
 				</div>
 			</div>
 
@@ -49,6 +50,10 @@
 						};
 					}
 				}
+			}).on('change', function(e) {
+				var proUids = $('#searchForProInput').val();
+				proUids = proUids.join('|');
+				$('input[name=proUids]').val(proUids);
 			});
 		}
 		addMCInitializer('createVisitTemplateProAccess', init, '#createVisitTemplateProAccess');

resources/views/app/practice-management/visit-templates/visit-template-accesses/index.blade.php

@@ -1,6 +1,11 @@
 @extends('app.practice-management.visit-templates.single')
 @section('visitTemplateTab')
 <div class="row">
+    <div class="col-12">
+        <div class="alert alert-info">
+            <i class="fas fa-info-circle"></i> Note: <b>Admins</b> have access to all templates.
+        </div>
+    </div>
     <div class="col-md-12">
         <div class="card mb-2">
             <div class="card-header border-bottom-0 px-1 py-2 d-flex align-items-center">
@@ -20,6 +25,7 @@
                         <thead class="bg-light">
                             <tr>
                                 <th class="border-0">Pro</th>
+                                <th class="border-0">Pro Type</th>
                                 <th class="border-0">Type</th>
                                 <th class="border-0">Status</th>
                                 <th class="border-0">&nbsp;</th>
@@ -29,6 +35,7 @@
                             @foreach($visitTemplateAccesses as $access)
                             <tr>
                                 <td>{{ $access->pro->displayName() }}</td>
+                                <td>{{ $access->pro->pro_type }}</td>
                                 <td>{{ $access->type }}</td>
                                 <td>
                                     <div>
@@ -62,7 +69,7 @@
                             @endforeach
                             @if(!count($visitTemplateAccesses))
                             <tr>
-                                <td colspan="8">No records found!</td>
+                                <td colspan="5">No records found!</td>
                             </tr>
                             @endif
                         </tbody>