Merge branch 'oniel-progreso' into gabriel_branch

app/controllers/CriteriaController.php

@@ -8,7 +8,7 @@ class CriteriaController extends \BaseController
     /**
      * Display a listing of the resource.
      *
-     * 
+     *
      * @return Response
      */
     public function editProgram()
@@ -236,7 +236,7 @@ class CriteriaController extends \BaseController
         } else {
             // Check criterion uniqueness
             /*if (!$this->isCriterionUnique($clean_input)) {
-                /** Send error message and old data 
+                /** Send error message and old data
                 Session::flash('status', 'danger');
                 Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name and associated program are the same.');
                 return Redirect::to('criteria')->withInput();
@@ -590,7 +590,7 @@ class CriteriaController extends \BaseController
         // el ID de los semestres que el usuario tiene seleccionado.
         $semesters_ids = Session::get('semesters_ids');
         // buscar informacion de los semestres seleccionados
-        $semesters = Semester::whereIn('id', $semesters_ids)->get();
+        $semesters = Semester::whereIn('id',$semesters_ids)->get();
 
         $title = "Learning Outcomes and Criteria";
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
@@ -599,6 +599,48 @@ class CriteriaController extends \BaseController
 
         // se annadio la nueva variable
         return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
+
+    }
+
+    // copie index() y lo edite
+    public function objectivesIndex()
+    {
+        if(Auth::user()->role==1)
+        {
+          //uscar todos los objetivos
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+        elseif(Auth::user()->role==2)
+        {
+          //buscar los objetivos de la departamento (school)
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->where('programs.school_id',Auth::user()->school_id)
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+        elseif((Auth::user()->role==3) || (Auth::user()->role==4))
+        {
+          //buscar los objetivos de los programas cuales el profesor esta
+          $objectives = DB::table('program_user')
+                                ->join('objectives','objectives.program_id','=','program_user.program_id')
+                                ->join('programs','programs.id','=','program_user.program_id')
+                                ->where('program_user.user_id',Auth::user()->id)
+                                ->select('objectives.id','objectives.text','programs.name')
+                                ->orderBy('objectives.text', 'asc')
+                                ->get();
+        }
+
+        $title = "Learning Objectives and Criteria";
+
+        return View::make('global.view-objectives-criteria', compact('title', 'objectives'));
     }
 
     public function destroy()

app/routes.php

@@ -226,9 +226,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     // Show users all learning outcomes and criteria
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
+    Route::post('fetchOutcome', array('before' => 'csrf', 'uses'=>'OutcomesController@fetchOutcome'));
+    // Show users all objectives and criteria
     Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
-    Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
-    Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
+    Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses'=>'ObjectivesController@fetchObjectiveForCriteria'));
 
     // Show professor overview to users with courses
     Route::get('professor', 'ProfessorsController@overview');
@@ -257,8 +258,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
-        Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
-        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
+        Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
+        Route::post('crtiteria/update', array('before' => 'csrf', 'uses'=>'CriteriaController@update'));
+        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses'=>'CriteriaController@destroy'));
 
         Route::get('administrator/users/{query?}', 'UsersController@index');
 
@@ -353,7 +355,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('updateObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@update'));
         Route::post('fetchObjectiveWithTrashed', array('before' => 'csrf', 'uses' => 'Objective2Controller@fetchObjectiveWithTrashed'));
 
-        // Five year plans, 
+        // Five year plans,
         Route::get('five-year-plans', 'FiveYearPlansController@index');
         Route::get('program/{program}/five-year-plans/create', 'FiveYearPlansController@create');
         Route::get('program/{program}/five-year-plans/{five_year_plan}', 'FiveYearPlansController@show');
@@ -410,6 +412,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
+        Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
         Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         // Assessment reports

app/views/layouts/master.blade.php

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

app/views/local/managers/admins/_navigation.blade.php

@@ -82,4 +82,4 @@
     </li>
     </ul>
   </div>
-</div>
+</div>

app/views/local/managers/admins/learning-outcomes.blade.php

@@ -15,33 +15,110 @@
     <div class="row">
         <div class="col-md-12">
             <p>Click on the values you want to change. Invalid values will be rejected automatically. To save your changes, click the 'Save' button at the bottom of the page.</p>
-            <table class="table table-striped table-condensed editable-table">
+            <table class="table table-striped table-condensed editable-table" id='outcomes_table'>
                 <thead><tr class="center-text">
                     <th class="col-md-4">Learning Outcome</th>
                     <th class="col-md-7">Definition</th>
                     <th class="col-md-1">Expected Value</th>
+                    <th class="col-md-2">Activation date</th>
+                    <th class="col-md-2">Deactivation date</th>
+                    <th class="col-md-1">Level</th>
 
                 </thead>
                 <tbody>
-                @foreach ($outcomes as $outcome)
-                    <tr data-id="{{ $outcome->id }}">
-                        <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
-                        <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
-                        <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
-                    </tr>
-                @endforeach
+                  @foreach ($outcomes as $outcome)
+                    {{-- @foreach ($semesters as $semester) --}}
+                      {{-- display an outcome only if it is part of a currently selected semester --}}
+                      @if ((($outcome->deactivation_date == '0000-00-00') or ($outcome->deactivation_date == ''))
+                            // and ($outcome->activation_date >= $semester->start && $outcome->activation_date <= $semester->end)
+                            )
+                            <tr data-id="{{ $outcome->id }}">
+                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
+                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
+                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
+                                <td contenteditable="true" class="activation-date col-md-2" >{{ $outcome->activation_date }}</td>
+                                <td contenteditable="true" class="deactivation-date col-md-2" >{{ $outcome->deactivation_date }}</td>
+                                <td contenteditable="true" class="level col-md-1" >{{ $outcome->level }}</td>
+                            </tr>
+                      @endif
+                    {{-- @endforeach --}}
+                  @endforeach
+                  @foreach ($outcomes as $outcome)
+                    {{-- @foreach ($semesters as $semester) --}}
+                      {{-- display an outcome only if it is part of a currently selected semester --}}
+                      @if ((($outcome->deactivation_date != '0000-00-00') and ($outcome->deactivation_date != ''))
+                            // and ($outcome->deactivation_date != '0000-00-00') and ($outcome->deactivation_date != '')
+                            )
+                            <tr data-id="{{ $outcome->id }}">
+                                <td contenteditable="true" class="name col-md-4" >{{ $outcome->name }}</td>
+                                <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ $outcome->definition }}</td>
+                                <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
+                                <td contenteditable="true" class="activation-date col-md-2" >{{ $outcome->activation_date }}</td>
+                                <td contenteditable="true" class="deactivation-date col-md-2" >{{ $outcome->deactivation_date }}</td>
+                                <td contenteditable="true" class="level col-md-1" >{{ $outcome->level }}</td>
+                            </tr>
+                      @endif
+                    {{-- @endforeach --}}
+                  @endforeach
                 </tbody>
             </table>
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12"><button class="btn btn-lg btn-primary center-block">Save</button></div>
+      <div class="col-md-6"><button class="btn btn-lg btn-secondary center-block" id='show'>New Outcome</button></div>
+      <div class="col-md-6"><button class="btn btn-lg btn-primary center-block" id='save'>Save</button></div>
     </div>
+
+  <div class="" id='new_outcome_form'>
+    <h2>Add a new Learning Outcomes</h2>
+    {{-- For for adding a new outcome --}}
+    {{ Form::open(array('action' => 'OutcomesController@create')) }}
+      <div class="form-group">
+          {{ Form::label('name', 'Name') }}
+          {{ Form::text('name', '', array('class' => 'form-control', 'id'=>'outcome_name')) }}
+      </div>
+      <div class="form-group">
+          {{ Form::label('definition', 'Definition') }}
+          {{ Form::textarea('definition', 'At least 10 characters long', array('class' => 'form-control', 'id'=>'outcome_definition')) }}
+      </div>
+      Due to technical limitationss, the following must be edited after adding the new Outcome:
+      {{-- the technical limitation is: the Outcome Model has to be edited --}}
+      <ul>
+       <li>Expected Outcome</li>
+       <li>Activation Date</li>
+       <li>Deactivation Date</li>
+       <li>Level</li>
+      </ul>
+
+      <div class="row">
+        <div class="col-md-6"><button type="reset" class="btn btn-lg btn-secondary center-block" id='hide'>Hide Form</button></div>
+        <div class="col-md-6"><button type="submit" class="btn btn-lg btn-primary center-block">Submit New Outcome</button></div>
+      </div>
+      {{ Form::close() }}
+
+    <hr>
+  </div>
 @stop
 
 @section('javascript')
 
-        $('button').on('click', function(e)
+        $('#new_outcome_form').hide();
+
+        //show form
+        $('#show').on('click', function(e)
+        {
+          $('#new_outcome_form').show();
+          $('#show').hide();
+        });
+
+        //hide form
+        $('#hide').on('click', function(e)
+        {
+          $('#new_outcome_form').hide();
+          $('#show').show();
+        });
+
+        $('#save').on('click', function(e)
         {
             e.preventDefault();
 
@@ -56,6 +133,9 @@
                 outcomeObject.name= $(this).children('.name').text();
                 outcomeObject.definition= $(this).children('.definition').text();
                 outcomeObject.expected_outcome= $(this).children('.expected-outcome').text();
+                outcomeObject.activation_date= $(this).children('.activation-date').text();
+                outcomeObject.deactivation_date= $(this).children('.deactivation-date').text();
+                outcomeObject.level= $(this).children('.level').text();
 
                 if($(this).find('.glyphicon-eye-close').length>0)
                 {
@@ -70,7 +150,7 @@
             });
 
             $.post(
-                "{{ URL::action('OutcomesController@update') }}",
+                "{{ URL::action('OutcomesController@updateMore') }}",
                 { outcomeArray: JSON.stringify(outcomeArray)},
                 function(data)
                 {

app/views/local/managers/pCoords/_navigation.blade.php

@@ -57,4 +57,4 @@
       </li>
     </ul>
   </div>
-</div>
+</div>

app/views/local/managers/sCoords/_navigation.blade.php

@@ -56,4 +56,4 @@
       </li>
     </ul>
   </div>
-</div>
+</div>