Update to Learning Outcomes edit page

The table now has 3 new columns of data that can be edited.
Added a form to create a new learning outcome.

app/controllers/OutcomesController.php

@@ -14,8 +14,11 @@ class OutcomesController extends \BaseController {
         $title = "Learning Outcomes";
         $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
+        // $semesters_ids = Session::get('semesters_ids');
+        // $semesters = Semester::whereIn('id',$semesters_ids)->get();
 
         return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools'));
+        //return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools','semesters'));
     }
 
     // TODO: Change to home page
@@ -295,6 +298,85 @@ class OutcomesController extends \BaseController {
         return;
     }
 
+    /**
+    *Copy of update(), but also updates activation_date, deactivation_date and level
+    */
+    public function updateMore()
+    {
+        $outcomeArray = json_decode(Input::get('outcomeArray'), true);
+        Session::flash('status', 'success');
+        Session::flash('message', 'Learning Outcomes updated.');
+
+        foreach ($outcomeArray as $outcomeObject)
+        {
+
+
+            $validator = Validator::make(
+                array(
+                    'name' => $outcomeObject['name'],
+                    'definition' => $outcomeObject['definition'],
+                    'expected_outcome' => $outcomeObject['expected_outcome']
+                    // TODO- validar los otros 3 valores
+                ),
+                array(
+                    'name' => 'required',
+                    'definition' => 'required',
+                    'expected_outcome' => 'required|numeric'
+                    // TODO- los requisitos de los otros 3 valores
+                )
+            );
+
+            if(!$validator->fails())
+            {
+                try
+                {
+                    $outcome = Outcome::withTrashed()
+                        ->where('id','=', $outcomeObject['id'])
+                        ->firstOrFail();
+                    $outcome->name = $outcomeObject['name'];
+                    $outcome->definition = $outcomeObject['definition'];
+                    $outcome->expected_outcome = $outcomeObject['expected_outcome'];
+                    $outcome->activation_date = $outcomeObject['activation_date'];
+                    $outcome->deactivation_date = $outcomeObject['deactivation_date'];
+                    $outcome->level = $outcomeObject['level'];
+                    $outcome->save();
+
+                    // If delete is 1, and outcome isn't already trashed, delete
+                    if($outcomeObject['delete']==1 && !$outcome->trashed())
+                        $outcome->delete();
+                    // If delete is 0, and outcome is already trashed, restore
+                    elseif($outcomeObject['delete']==0 && $outcome->trashed())
+                        $outcome->restore();
+                }
+
+                catch(Exception $e)
+                {
+
+                    Session::flash('message', $e->getMessage());
+                }
+            }
+            else
+            {
+                /** Prepare error message */
+                $message = 'Error(s) updating the Learning Outcomes: <ul>';
+
+                foreach ($validator->messages()->all('<li>:message</li>') as $validationError)
+                {
+                    $message.=$validationError;
+                }
+
+                $message.='</ul>';
+
+                /** Send error message and old data */
+                Session::flash('status', 'danger');
+                Session::flash('message', $message);
+                return;
+            }
+        }
+
+        return;
+    }
+
     public function fetchCriteria()
     {
 
@@ -391,7 +473,7 @@ class OutcomesController extends \BaseController {
             /** Send error message and old data */
             Session::flash('status', 'warning');
             Session::flash('message', $message);
-            return Redirect::to('learning-outcomes-criteria')->withInput();
+            return Redirect::to('learning-outcomes')->withInput();
         }
         else
         {
@@ -405,7 +487,7 @@ class OutcomesController extends \BaseController {
             {
                 Session::flash('status', 'success');
                 Session::flash('message', '<p>Learning Outcome added.</p>');
-                return Redirect::to('learning-outcomes-criteria');
+                return Redirect::to('learning-outcomes');
             }
 
             /** If saving fails, send error message and old data */
@@ -413,7 +495,7 @@ class OutcomesController extends \BaseController {
             {
                 Session::flash('status', 'warning');
                 Session::flash('message', '<p>Error adding Learning Outcome. Please try again later.</p>');
-                return Redirect::to('learning-outcomes-criteria')->withInput();
+                return Redirect::to('learning-outcomes')->withInput();
             }
         }
     }

app/routes.php

@@ -255,6 +255,7 @@ Route::group(array('before' => 'auth|has_access'), function()
         // TODO: Change later
         Route::get('new-learning-outcomes', 'OutcomesController@newIndex');
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
+        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'));
 

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)
                 {