Forráskód Böngészése

fixed measurements removed filter

= 4 éve
szülő
commit
83e1cc3989

+ 1 - 2
app/Http/Controllers/HomeController.php

@@ -287,10 +287,9 @@ class HomeController extends Controller
 
         $milliseconds = strtotime(date('Y-m-d')) . '000';
 
-        $measurements_filter = $request->get('measurements_filter');
         $measurements = $performer->pro->getMeasurements();
 
-        return view('app/dashboard', compact('keyNumbers', 'reimbursement', 'milliseconds', 'measurements', 'measurements_filter'));
+        return view('app/dashboard', compact('keyNumbers', 'reimbursement', 'milliseconds', 'measurements'));
     }
 
     public function dashboardAppointments(Request $request, $from, $to) {

+ 2 - 2
app/Models/Pro.php

@@ -322,7 +322,7 @@ class Pro extends Model
         return $allowed ? $clientPrograms : FALSE;
     }
 
-    public function getMeasurements($_onlyUnstamped = false)
+    public function getMeasurements($_onlyUnstamped = true)
     {
         $measurementsQuery = Measurement::where('is_removed', false);
         if ($this->pro_type != 'ADMIN') {
@@ -341,7 +341,7 @@ class Pro extends Model
                 });
         }
 	$x = [];
-        $measurements = $measurementsQuery->orderBy('id', 'desc')->paginate(50)->get();
+        $measurements = $measurementsQuery->orderBy('id', 'desc')->paginate(50);
 
         // eager load stuff needed in JS
         foreach ($measurements as $measurement) {

+ 0 - 14
resources/views/app/dashboard/measurements.blade.php

@@ -1,19 +1,5 @@
 <div class="d-flex align-items-end mb-3">
     <b class="large">Measurements in {{friendly_month(date('Y-m-d'))}}</b>
-    @if($pro->pro_type !== 'ADMIN')
-    <form method="GET" action="/mc/" class="ml-auto d-inline-flex align-items-center">
-        <div class="ml-auto d-inline-flex align-items-center">
-            <label class="text-secondary mr-2 my-0 text-nowrap">Filter by status:</label>
-            <select name="measurements_filter" class="form-control form-control-sm">
-                <option {{$measurements_filter == 'ALL'? 'selected':''}} value="ALL">All</option>
-                <option {{$measurements_filter == 'NEED_ACK'? 'selected':''}} value="NEED_ACK">Needs Stamping</option>
-            </select>
-        </div>
-        <div class="ml-2">
-            <button  class="btn btn-primary btn-sm">Filter</button>
-        </div>
-    </form>
-    @endif
 </div>
 <table class="table table-striped table-sm table-bordered mb-0">
     <thead>