Преглед на файлове

update a la pagina de "Learning Outcomes and Criteria"

esta pagina ahora enseña los learning outcomes basados en el/los semestres que el usuario tenga seleccionado.
onielm преди 4 години
родител
ревизия
d4db51024b
променени са 2 файла, в които са добавени 18 реда и са изтрити 2 реда
  1. 10
    1
      app/controllers/CriteriaController.php
  2. 8
    1
      app/views/global/view-learning-outcomes-criteria.blade.php

+ 10
- 1
app/controllers/CriteriaController.php Целия файл

@@ -300,12 +300,21 @@ class CriteriaController extends \BaseController {
300 300
 
301 301
     public function index()
302 302
     {
303
+        // para conseguir el ID de los semestres que el usuario tiene seleccionado.
304
+        $semesters_ids = array();
305
+        foreach(Session::get('semesters_ids') as $id){
306
+          array_push($semesters_ids, $id);
307
+        }
308
+        // buscar informacion de los semestres seleccionados
309
+        $semesters = Semester::whereIn('id',$semesters_ids)->get();
310
+
303 311
         $title = "Learning Outcomes and Criteria";
304 312
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
305 313
         $schools = School::orderBy('name', 'ASC')->get();
306 314
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
307 315
 
308
-        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria'));
316
+        // se annadio la nueva variable
317
+        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
309 318
 
310 319
     }
311 320
 

+ 8
- 1
app/views/global/view-learning-outcomes-criteria.blade.php Целия файл

@@ -18,7 +18,14 @@
18 18
     <div class="col-md-3">
19 19
       <div class="list-group">
20 20
         @foreach ($outcomes as $outcome)
21
-          <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li>
21
+          @foreach ($semesters as $semester)
22
+            {{-- activation_date --}}
23
+            @if(!$outcome->deleted_at && $outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)
24
+              {{-- <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }}</li> --}}
25
+              <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }} [{{$semester->code}}]</li>
26
+              {{-- <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">[{{$semester->code}}] {{ $outcome->name }}</li> --}}
27
+            @endif
28
+          @endforeach
22 29
         @endforeach
23 30
       </div>
24 31
     </div>