My report of changes and additions I made during the semester.

app/controllers/ProgramsController.php

@@ -82,13 +82,48 @@ class ProgramsController extends \BaseController
 
 public function showReport()
 {
+
+
+  // create an array with the ID of Semesters selected in the form
+  $selected_semesters_id = array();
+  $semesters = Semester::all();
+  foreach ($semesters as $semester) {
+    if ($semester->is_visible){
+      if (Input::get('semester'.$semester->id)!=null){
+        array_push($selected_semesters_id, $semester->id);
+      }
+    }
+  }
+  $selected_semesters = DB::table('semesters')
+                        ->wherein('semesters.id',$selected_semesters_id)
+                        ->get();
+
+  // create a srting with the selected metodos de divulgfacion
+  $selected_divulgaciones = '';
+  $divulgaciones = array('profesores','comiteDepartamental','comiteFacultadEscuela',
+                      'pleno','estudiantes','administrativos','senado','comunidadWeb',
+                      'otros');
+  foreach ($divulgaciones as $divulgacion) {
+    if (Input::get($divulgacion)!=null){
+      $selected_divulgaciones = $selected_divulgaciones.'\n'.Input::get($divulgacion);
+    }
+  }
+
   //OUTCOMES Join criteria join program
   $programs = DB::table('programs')
-                        ->select('id')
+                        ->select('id','name')
                         ->orderBy('name', 'asc')
                         ->get();
 
 
+
+   // $program
+   $tables_names = '{';
+   foreach ($programs as $program) {
+     $tables_names = $tables_names.'"table'.$program->id.'" : "'.$program->name.'",';// code...
+   }
+   $tables_names = $tables_names.'}';
+
    $title = "Programs Reports";
    // $title = "Program Report: ".$program->name;
 
@@ -102,7 +137,7 @@ public function showReport()
                            ->join('programs','programs.id','=','criteria.program_id')
                            ->join('courses','courses.program_id','=','programs.id')
                            ->where('programs.id',$program->id)
-                           ->select('outcomes.name')
+                           ->select('outcomes.name','outcomes.activation_date')
                            ->distinct()
                            ->orderBy('outcomes.name', 'asc')
                            ->get();
@@ -133,7 +168,7 @@ public function showReport()
    }
 
 
-   return View::make('local.managers.shared.program_report', compact('title','programs_info'));
+   return View::make('local.managers.shared.program_report', compact('title','programs_info','selected_divulgaciones','selected_semesters','tables_names'));
 }
 
   /**
@@ -197,8 +232,9 @@ public function showReport()
     $title = "Programs by School";
     $programs = Program::orderBy('name')->get();
     $schools = School::all();
+    $semesters = Semester::all();
 
-    return View::make('local.managers.shared.programs', compact('programs', 'schools', 'title'));
+    return View::make('local.managers.shared.programs', compact('programs', 'schools', 'semesters', 'title'));
   }
 
   /**

app/routes.php

@@ -291,7 +291,7 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('school-coordinator', 'SchoolCoordinatorsController@overview');
         Route::get('school/{id}', 'SchoolsController@show');
         Route::get('program/{id}', 'ProgramsController@show');
-        Route::get('programs/report', 'ProgramsController@showReport');
+        Route::post('programs/report', 'ProgramsController@showReport');
         Route::get('programs', 'ProgramsController@index');
         Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
 

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -13,10 +13,35 @@
 @stop
 
 @section('main')
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+  <script type="text/javascript">
+  function filterOutcomes() {
+    // Declare variables
+    var input, filter, div, li, i, outcomeText;
+    input = document.getElementById('userInput');
+    filter = input.value.toUpperCase();
+    div = document.getElementById("list");
+    li = div.getElementsByTagName('li');
+
+    // Loop through all list items, and hide those who don't match the search query
+    for (i = 0; i < li.length; i++) {
+      outcomeText = li[i].textContent;
+      if (outcomeText.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
+  }
+  </script>
 
   <div class="row">
     <div class="col-md-3">
-      <div class="list-group">
+      <input class="form-control" type="text" id="userInput" onkeyup="filterOutcomes()" placeholder="Search for Learning Outcomes..">
+      <div class="list-group" id='list'>
         @foreach ($outcomes as $outcome)
           @foreach ($semesters as $semester)
             @if(!$outcome->deleted_at && $outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)

app/views/global/view-objectives-criteria.blade.php

@@ -13,10 +13,35 @@
 @stop
 
 @section('main')
+  {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+  {{-- TODO: no reconoce acentos --}}
+  <script type="text/javascript">
+  function filterObjectives() {
+    // Declare variables
+    var input, filter, div, li, i, objectiveText;
+    input = document.getElementById('userInput');
+    filter = input.value.toUpperCase();
+    div = document.getElementById("list");
+    li = div.getElementsByTagName('li');
+
+    // Loop through all list items, and hide those who don't match the search query
+    for (i = 0; i < li.length; i++) {
+      objectiveText = li[i].textContent;
+      if (objectiveText.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
+  }
+  </script>
 
   <div class="row">
     <div class="col-md-3">
-      <div class="list-group">
+      <input class="form-control" type="text" id="userInput" onkeyup="filterObjectives()" placeholder="Search for Learning Outcomes..">
+      <div class="list-group" id='list'>
         @foreach ($objectives as $objective)
           <li data-objective-id="{{ $objective->id }}"class="list-group-item">{{ $objective->text }}</li>
         @endforeach

app/views/layouts/master.blade.php

@@ -164,7 +164,7 @@
         /////
 
         var table = null;
-        var tables = [];
+        // var tables = [];
         $('.datatable').each(function()
         {
             table = $(this).DataTable({
@@ -271,7 +271,7 @@
                     }
                 ],
             });
-            tables.push(table);
+            // tables.push(table);
 
             // Apply the search
             table.columns().every( function ()

app/views/local/managers/shared/programs.blade.php

@@ -11,7 +11,76 @@
 @stop
 
 @section('main')
-  <a href="{{ action('ProgramsController@showReport'); }}" class="btn btn-primary pull-right" alt="print">Report</a>
+  <button class="btn btn-lg btn-primary pull-right" id='show'>Custom Report</button>
+  <div class="" id='make_report'>
+    <hr>
+    <b><h3>Report Options</h3><br></b>
+    {{-- For for adding a new outcome --}}
+    {{ Form::open(array('action' => 'ProgramsController@showReport')) }}
+    <div class="row">
+      <div class="col-md-1">
+      </div>
+      <div class="col-md-5">
+      {{ Form::label('name', 'Select which semesters to report on') }}<br>
+          @foreach ($semesters as $semester)
+            @if ($semester->is_visible)
+              <div class="form-group">
+                <input type="checkbox" id="semester{{$semester->id}}" name="semester{{$semester->id}}" value="semester{{$semester->id}}">
+                <label for="semester{{$semester->id}}">{{$semester->name}}({{$semester->code}})</label>
+                {{-- {{ Form::checkbox('semester'.$semester->id, $semester->name, array('class' => 'form-control', 'id'=>$semester->id)) }}
+                {{ Form::label('semester'.$semester->id, $semester->name.'('.$semester->code.')') }}<br> --}}
+              </div>
+            @endif
+          @endforeach
+      </div>
+      <div class="col-md-6">
+        {{ Form::label('divulgacion', 'Select metodos de divulgacion') }}<br>
+        <div class="form-group">
+          <input type="checkbox" id="profesores" name="profesores" value="Profesores (pares)">
+          <label for="profesores">Profesores (pares)</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comiteDepartamental" name="comiteDepartamental" value="Comites de curriculo departamental">
+          <label for="comiteDepartamental">Comites de curriculo departamental</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comiteFacultadEscuela" name="comiteFacultadEscuela" value="Comites de curriculo  de Facultad o Escuela">
+          <label for="comiteFacultadEscuela">Comites de curriculo  de Facultad o Escuela</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="pleno" name="pleno" value="Pleno de la Facultad">
+          <label for="pleno">Pleno de la Facultad</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="estudiantes" name="estudiantes" value="Estudiantes">
+          <label for="estudiantes">Estudiantes</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="administrativos" name="administrativos" value="Administrativos">
+          <label for="administrativos">Administrativos</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="senado" name="senado" value="Senado">
+          <label for="senado">Senado</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="comunidadWeb" name="comunidadWeb" value="Comunidad (pagina web)">
+          <label for="comunidadWeb">Comunidad (pagina web)</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" id="otros" name="otros" value="Otros">
+          <label for="otros">Otro- <input type="text" id='otherBox'></label>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class=""><button type="submit" id='submit' class="btn btn-lg btn-primary center-block">Create Report</button></div>
+    </div>
+    {{ Form::close() }}
+    <hr>
+    <button class="btn btn-lg btn-primary pull-right" id='hide'>Hide Form</button>
+  </div>
+
 <div class="row">
   <div class="col-md-12">
       <table class="table table-condensed table-stripedd datatable">
@@ -48,3 +117,27 @@
 @include('global._datatables_js')
 
 @stop
+
+@section('javascript')
+
+      $('#make_report').hide();
+
+      //show form
+      $('#show').on('click', function(e)
+      {
+        $('#make_report').show();
+        $('#show').hide();
+      });
+
+      //hide form
+      $('#hide').on('click', function(e)
+      {
+        $('#make_report').hide();
+        $('#show').show();
+      });
+
+      //on submit, change value of the checkbox input of id 'other'
+      $('#submit').click(function(){
+        $('#otros').val('Otro- '+$('#otherBox').val());
+      });
+@stop