updated streamline-setup v2

docker/streamline-src/Modules/Patients/Resources/views/patients/index.blade.php

@@ -51,13 +51,12 @@
 
         <div class="col-md-2">
             <button type="submit" class="btn btn-rounded btn-success"><span class="glyphicon glyphicon-search"></span> {{ __('patients.search') }}</button>
-            <span class="label label-info float-right" style="font-size: 12.5px;"> {{ $patientCount }} {{ __('patients.patients_registered') }}</span>
+            <span class="label label-info float-right" style="font-size: 12.5px;"> {{ count($patient_numbers) }} {{ __('patients.patients_registered') }}</span>
         </div>
-
     </div>
 
-    @if(isset($criteria) && isset($resultCount))
-    <p>{{ __('patients.search_criteria') }} : <code>{{ $criteria }}</code> &nbsp;&nbsp;&nbsp;{{ __('patients.total_results') }} : <code>{{ $resultCount }}</code> &nbsp;&nbsp;&nbsp;<a href="{{ route('patients.index') }}">{{ __('patients.clear_search') }}</a></p>
+    @if(isset($criteria))
+    <p>{{ __('patients.search_criteria') }} : <code>{{ $criteria }}</code></p>
     @endif
     {{ Form::close() }}
 
@@ -78,8 +77,7 @@
                 </tr>
             </thead>
             <tbody>
-                @if(count($patients) > 0)
-                @foreach($patients as $patient)
+            @foreach($patients as $patient)
                 <tr>
                     <td>{{ $patient->number }}</td>
                     <td>{!! insurance_flag($patient->id) !!}</td>
@@ -92,8 +90,8 @@
                     </td>
                     <td>{{ get_patients_age($patient->date_of_birth) }}</td>
                     <td>{{ $patient->phone }}</td>
-                    <td><?php echo isset($categories[$patient->category_id]) ? $categories[$patient->category_id] : "N/A"; ?></td>
-                    <td>{{ isset($patient_villages[$patient->village_id]) ? $patient_villages[$patient->village_id] : '' }}</td>
+                    <td>{{ $categories[$patient->category_id] ?? "N/A" }}</td>
+                    <td>{{ $villages[$patient->village_id] ?? '' }}</td>
                     <td><a href="/patients/{{ $patient->id }}/" class="btn btn-rounded btn-info btn-sm"><i class="fa fa-info-circle"></i> {{ __('patients.details') }}</a></td>
                     <td>
                         <a href="/patients/{{ $patient->id }}/edit/" class="btn btn-warning btn-rounded btn-sm"><i class="fa fa-pencil"></i> {{ __('patients.edit') }}</a>
@@ -102,10 +100,7 @@
                         <a href="/patient_episodes/set_patient_id/{{ $patient->id }}" class="btn btn-rounded btn-primary btn-sm"><i class="fa fa-hand-pointer-o"></i> <strong>{{ __('patients.select') }}</strong></a>
                     </td>
                 </tr>
-                @endforeach
-                @else
-                <tr class="warning"><td class="center" colspan="10"><code>{{ __('patients.no_records_found') }}</code></td></tr>
-                @endif
+            @endforeach
             </tbody>
 
         </table>
@@ -177,30 +172,6 @@ $('#previous_numbers .typeahead').typeahead(
     }
 );
 
-$('#first_names .typeahead').typeahead(
-        {
-            hint: true,
-            highlight: true,
-            minLength: 1
-        },
-        {
-            name: 'first_names',
-            source: substringMatcher(<?php echo json_encode($first_names); ?>)
-        }
-);
-
-$('#last_names .typeahead').typeahead(
-        {
-            hint: true,
-            highlight: true,
-            minLength: 1
-        },
-        {
-            name: 'last_names',
-            source: substringMatcher(<?php echo json_encode($last_names); ?>)
-        }
-);
-
 $('#villages .typeahead').typeahead(
         {
             hint: true,
@@ -209,7 +180,7 @@ $('#villages .typeahead').typeahead(
         },
         {
             name: 'villages',
-            source: substringMatcher(<?php echo json_encode($villages); ?>)
+            source: substringMatcher(<?php echo json_encode(array_values($villages)); ?>)
         }
 );
 
@@ -275,19 +246,7 @@ $('.table').DataTable({
     ]
 });
 
-
-
-
 $('.sorting').removeClass('sorting');//remove the sorting class
 $('.sorting_asc').removeClass('sorting_asc');//remove the sorting class
 </script>
 @endpush
-
-@push('styles')
-<style type="text/css">
-    .color-bordered-table.success-bordered-table {
-        border-top: 0px;
-    }
-</style>
-@endpush
-