瀏覽代碼

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
 
300
 
301
     public function index()
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
         $title = "Learning Outcomes and Criteria";
311
         $title = "Learning Outcomes and Criteria";
304
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
312
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
305
         $schools = School::orderBy('name', 'ASC')->get();
313
         $schools = School::orderBy('name', 'ASC')->get();
306
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
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
     <div class="col-md-3">
18
     <div class="col-md-3">
19
       <div class="list-group">
19
       <div class="list-group">
20
         @foreach ($outcomes as $outcome)
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
         @endforeach
29
         @endforeach
23
       </div>
30
       </div>
24
     </div>
31
     </div>