New outcome mapping added

app/controllers/ActivitiesController.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Database\Eloquent\Collection;
+
 class ActivitiesController extends \BaseController {
 
     /**
@@ -67,20 +69,43 @@ class ActivitiesController extends \BaseController {
         }
     }
 
-    public function newCreate($course = null)
+    public function newCreate($course_id = null)
     {
         $title = 'Create Activity';
         $activity_types = [];
-        $instruments = [];
+        $instruments = Rubric::all();
         $courses = Course::where('user_id', Auth::user()->id)->get();
         $outcomes = Outcome::with('objectives')->get();
-        $objectives = [];
-        $outcomes->each(function($outcome) {
-            $objectives[$outcome->id] = $outcome->objectives;
+//        var_dump($outcomes[0]->objectives);
+        $objectives_by_outcome = Collection::make([]);
+        $outcomes->each(function($outcome) use (&$objectives_by_outcome) {
+//            var_dump($outcome->objectives);
+            $objectives_by_outcome->put($outcome->id, $outcome->objectives);
+//            var_dump($objectives);
+        });
+        $criteria_by_objective = Collection::make([]);
+        $objectives_by_outcome->each(function($objectives) use (&$criteria_by_objective) {
+            $objectives->each(function($objective) use (&$criteria_by_objective) {
+                $criteria_by_objective->put($objective->id, $objective->criteria);
+            });
         });
         $transforming_actions = [];
-//        var_dump($objectives['1']);
-        return View::make('local.managers.admins.new-activity-create', compact('title', 'activity_types', 'instruments', 'courses', 'outcomes', 'objectives', 'transforming_actions'));
+        $course = Course::find($course_id);
+//        var_dump($criteria_by_objective);
+//        return $objectives->toJson();
+        return View::make('local.managers.admins.new-activity-create',
+            compact(
+                'title',
+                'course',
+                'activity_types',
+                'instruments',
+                'courses',
+                'outcomes',
+                'objectives_by_outcome',
+                'criteria_by_objective',
+                'transforming_actions'
+            )
+        );
     }
 
     /**

app/controllers/OutcomesController.php

@@ -17,15 +17,17 @@ class OutcomesController extends \BaseController {
 
         return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools'));
     }
+
     // TODO: Change to home page
     public function newIndex()
     {
         $title = "Learning Outcomes";
-        $outcomes = Outcome::withTrashed()->orderBy('name', 'ASC')->get();
+//        TODO: Check when semester doesnt exist or session is empty
+        $selected_semester = Semester::find(Session::get('semesters_ids')[0]);
+        $outcomes = Outcome::withTrashed()->where('deactivation_date', '>=', $selected_semester->start)->orWhere('deactivation_date', null)->orderBy('name', 'ASC')->get();
         $schools = School::orderBy('name', 'ASC')->get();
 
         return View::make('local.managers.admins.new-learning-outcomes', compact('title', 'outcomes', 'schools'));
-//        return View::make('local.managers.admins.learning-outcomes', compact('title', 'outcomes', 'schools'));
     }
 
     public function show($id)

app/database/migrations/2020_05_15_123430_create_new_outcomes_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreateNewOutcomesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('new_outcomes', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->string('name');
+			$table->text('definition');
+			$table->decimal('expected_outcome', 5, 2)->default('66.66');
+			$table->timestamps();
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('new_outcomes');
+	}
+
+}

app/database/migrations/2020_05_15_123902_add_mapping_columns_to_outcomes_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AddMappingColumnsToOutcomesTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->integer('new_outcome_id')->unsigned()->nullable();
+			$table->date('deactivation_date')->nullable();
+
+			$table->foreign('new_outcome_id')->references('id')->on('outcomes');
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('outcomes', function(Blueprint $table)
+		{
+			$table->dropForeign(['new_outcome_id']);
+
+			$table->dropColumn('deactivation_date');
+			$table->dropColumn('new_outcome_id');
+		});
+	}
+
+}

app/models/Objective.php

@@ -25,6 +25,11 @@ class Objective extends Eloquent
   	return $this->belongsToMany('Outcome', 'objective_outcome', 'objective_id', 'outcome_id');
   }
 
+  public function outcome()
+  {
+      return $this->belongsTo('Outcome');
+  }
+
     /**
      * Return the program that the objective belongs to
      *

app/views/local/managers/admins/new-activity-create.blade.php

@@ -5,6 +5,36 @@
 @stop
 @section('main')
 
+    <!-- New Rubric Modal -->
+    <div class="modal fade" id="newRubricModal" tabindex="-1" role="dialog" aria-labelledby="newRubricModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-sm">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                    <h4 class="modal-title" id="newRubricModalLabel">New Instrument</h4>
+                </div>
+                <div class="modal-body">
+                    {{ Form::open(array('action' => array('RubricsController@create'))) }}
+                    <div class="form-group">
+                        {{ Form::label('name', 'Name') }}
+                        {{ Form::text('name', Input::old('name'), array('class' => 'form-control')) }}
+                    </div>
+                    <div class="form-group">
+                        {{ Form::label('criteria', 'Criteria') }}
+                        <select id="criteria" name="criteria" class="form-control" multiple required>
+                        </select>
+                        {{ Form::textarea('criteria', Input::old('description'), array('class' => 'form-control', 'rows'=> 5, 'placeholder'=>'Minimum 10 characters')) }}
+                    </div>
+                    <div class="btn-group" role="group">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="submit" class="btn btn-default btn-primary">Submit</button>
+                    </div>
+                    {{ Form::close() }}
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-md-12">
             <div class="panel panel-default panel-button">
@@ -12,10 +42,7 @@
                     Create new activity
                 </div>
                 <div class="panel-body">
-
-
-                    {{ Form::open(array('action' => 'CoursesController@update')) }}
-
+                    {{ Form::open(array('action' => 'ActivitiesController@update')) }}
                     <div class="form-group">
                         {{ Form::label('activity_type', 'Activity Type') }}
                         <select id="activity_type" name="activity_type" class="form-control">
@@ -30,25 +57,13 @@
 {{--                        {{ Form::text('activity_type', Input::old('activity_Type'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>5)) }}--}}
                     </div>
                     
-                    <div class="form-group">
-                        {{ Form::label('instrument', 'Instrument') }}
-                        <select id="instrument" name="instrument" class="form-control">
-                            @foreach ($instruments as $instrument)
-                                {{--                                @if(Input::old('instrument')!=$instrument)--}}
-                                {{--                                    <option value="{{ $instrument }}">{{ $instrument }} ({{ $program->school->name }})</option>--}}
-                                {{--                                @else--}}
-                                {{--                                    <option selected value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option>--}}
-                                {{--                                @endif--}}
-                            @endforeach
-                        </select>
-                        {{--                        {{ Form::text('instrument', Input::old('instrument'), array('class' => 'form-control', 'placeholder'=>'TEST', 'maxLength'=>5)) }}--}}
-                    </div>
+
                     <div class="form-group">
                         {{ Form::label('outcome', 'Learning Outcome') }}
                         <select id="outcome" name="outcome" class="form-control">
                             @foreach ($outcomes as $outcome)
                                 @if(Input::old('outcome')!=$outcome->id)
-                                    <option value="{{ $outcome->id }}">{{ $outcome->name }})</option>
+                                    <option value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @else
                                     <option selected value="{{ $outcome->id }}">{{ $outcome->name }}</option>
                                 @endif
@@ -57,17 +72,38 @@
                     </div>
                     <div class="form-group">
                         {{ Form::label('objective', 'Learning Objective') }}
-                        <select id="objective" name="objective[]" class="form-control" multiple>
-                            @foreach ($objectives as $objective)
-                                @if(Input::old('objective')!=$objective->id)
-                                    <option value="{{ $objective->id }}">{{ $objective->name }}</option>
+                        <select id="objective" name="objective[]" class="form-control" multiple required>
+                            @if(Input::old('outcome')!=null)
+                                @foreach ($objectives_by_outcome[Input::old('outcome')] as $objective)
+                                    @if(Input::old('objective')!=$objective->id)
+                                        <option value="{{ $objective->id }}">{{ $objective->text }}</option>
+                                    @else
+                                        <option selected value="{{ $objective->id }}">{{ $objective->text }}</option>
+                                    @endif
+                                @endforeach
+                            @else
+                                @foreach ($objectives_by_outcome[$outcomes->first()->id] as $objective)
+                                    <option value="{{ $objective->id }}">{{ $objective->text }}</option>
+                                @endforeach
+                            @endif
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        {{ Form::label('instrument', 'Instrument') }}
+                        <select id="instrument" name="instrument" class="form-control">
+                            @foreach ($instruments as $instrument)
+                                @if(Input::old('instrument')!=$instrument->id)
+                                    <option value="{{ $instrument->id }}">{{ $instrument->name }}</option>
                                 @else
-                                    <option selected value="{{ $objective->id }}">{{ $objective->name }}</option>
+                                    <option selected value="{{ $instrument->id }}">{{ $instrument->name }}</option>
                                 @endif
                             @endforeach
                         </select>
                     </div>
                     <div class="form-group">
+                        <button type="button" data-toggle="modal" data-target="#newRubricModal" class="btn btn-sm btn-default">New Instrument</button>
+                    </div>
+                    <div class="form-group">
                         {{ Form::label('transforming_action', 'Transforming Actions') }}
                         <select id="transforming_action" name="transforming_action[]" class="form-control" multiple>
                             @foreach ($transforming_actions as $transforming_action)
@@ -84,24 +120,6 @@
 
                     {{ Form::submit('Submit', array('class' => 'btn btn-primary btn-block', 'name'=>'create_activity')) }}
                     {{ Form::close() }}
-
-                    <br>
-
-                    @if(Session::has('courses'))
-                        <p><strong>The following courses were updated:</strong></p>
-                        <ul>
-                            @foreach(json_decode(Session::get('courses')) as $course)
-                                <li>
-
-                                    @if(Session::has('show_sections'))
-                                        {{ $course->code }}{{ $course->number }}-{{ $course->section }}
-                                    @else
-                                        {{ $course->code }}{{ $course->number }}
-                                    @endif
-                                </li>
-                            @endforeach
-                        </ul>
-                    @endif
                 </div>
             </div>
         </div>
@@ -115,16 +133,39 @@
     // --------------------------------------------------------------------------
     // Page load
     // --------------------------------------------------------------------------
-
+    const objectives = {{ $objectives_by_outcome->toJson() }};
+    const criteria = {{ $criteria_by_objective->toJson() }};
+    const outcomesSelect = document.getElementById('outcome');
+    const objectivesSelect = document.getElementById('objective');
+    const criteriaSelect = document.getElementById('criteria');
 
     // --------------------------------------------------------------------------
     // Functions
     // --------------------------------------------------------------------------
 
-
-
     // --------------------------------------------------------------------------
     // Events
     // --------------------------------------------------------------------------
+    outcomesSelect.addEventListener('change', (event) => {
+        var objectivesSelectOptions = [];
+        objectives[event.target.value].forEach((objective) => {
+            objectivesSelectOptions.push(`<option value="${objective.id}">${objective.text}</option>`);
+        });
+        objectivesSelect.innerHTML = objectivesSelectOptions.join();
+    });
+
+    objectivesSelect.addEventListener('change', (event) => {
+        var criteriaSelectOptions = [];
+        var selectedObjectives = Array.from(objectivesSelect.selectedOptions).map(v => value);
+        selectedObjectives.forEach((objectiveId) => {
+            criteria[objectiveId].forEach((criteriaArray) => {
+                criteriaArray.forEach((criteria) => {
+                    criteriaSelectOptions.push(`<option value="${criteria.id}">${criteria.name}</option>`);
+                });
+            });
+        });
+        criteriaSelect.innerHTML = criteriaSelectOptions.join();
+    });
+
 
 @stop

app/views/local/managers/admins/new-course-show.blade.php

@@ -28,7 +28,7 @@
             @if(!$activities->isEmpty())
 
                 @if ($is_active_semester)
-                    <button data-toggle="modal" data-target="#newActivityModal" class="btn btn-sm btn-default pull-right"> New Activity</button>
+                    <a href="{{ URL::action('ActivitiesController@newCreate', ['course_id' => $course->id]) }}" class="btn btn-sm btn-default pull-right">New Activity</a>
                 @endif
 
                 <table class="table table-striped table-condensed">
@@ -89,34 +89,6 @@
 @stop
 
 @section('included-js')
-
-    <!-- New Activity Modal -->
-    <div class="modal fade" id="newActivityModal" tabindex="-1" role="dialog" aria-labelledby="newActivityModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-sm">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                    <h4 class="modal-title" id="newActivityModalLabel">New Activity</h4>
-                </div>
-                <div class="modal-body">
-                    {{ Form::open(array('action' => array('ActivitiesController@create', $course->id))) }}
-                    <div class="form-group">
-                        {{ Form::label('name', 'Name') }}
-                        {{ Form::text('name', Input::old('name'), array('class' => 'form-control')) }}
-                    </div>
-                    <div class="form-group">
-                        {{ Form::label('description', 'Description') }}
-                        {{ Form::textarea('description', Input::old('description'), array('class' => 'form-control', 'rows'=> 5, 'placeholder'=>'Minimum 10 characters')) }}
-                    </div>
-                    <div class="btn-group" role="group">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        <button type="submit" class="btn btn-default btn-primary">Submit</button>
-                    </div>
-                    {{ Form::close() }}
-                </div>
-            </div>
-        </div>
-    </div>
     <!-- HighCharts -->
     <script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
     <!--script src="http://code.highcharts.com/modules/exporting.js"></script -->