New pages for activities and courses

app/controllers/ActivitiesController.php

@@ -67,6 +67,22 @@ class ActivitiesController extends \BaseController {
         }
     }
 
+    public function newCreate($course = null)
+    {
+        $title = 'Create Activity';
+        $activity_types = [];
+        $instruments = [];
+        $courses = Course::where('user_id', Auth::user()->id)->get();
+        $outcomes = Outcome::with('objectives')->get();
+        $objectives = [];
+        $outcomes->each(function($outcome) {
+            $objectives[$outcome->id] = $outcome->objectives;
+        });
+        $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'));
+    }
+
     /**
      *
      */

app/controllers/CoursesController.php

@@ -1,6 +1,7 @@
 <?php
 
-class CoursesController extends \BaseController {
+class
+CoursesController extends \BaseController {
 
 	/**
 	 * Display the specified resource.
@@ -40,7 +41,22 @@ class CoursesController extends \BaseController {
 		return View::make('local.professors.course', compact('title', 'course', 'activities', 'students', 'outcomes', 'outcomes_achieved', 'outcomes_attempted', 'active_semesters'));
 	}
 
+	public function newShow($id)
+    {
+        $course = Course::findOrFail($id);
+        $title = $course->name;
+        $semesters = Semester::where('is_visible', '1')->orderBy('start', 'asc')->get();
+        $is_active_semester = $semesters->filter(function($semester) {
+            return Semester::where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get()->has($semester->id);
+        });
+//        $active_semesters = Semester::select('id')->where('is_visible', 1)->where('start', '<=', date('Y-m-d H:i:s'))->where('end', '>=', date('Y-m-d H:i:s'))->get()->toArray()[0];
+        $activities = $course->activities;
 
+//        var_dump($active_semesters);
+//        var_dump($course->semester->id);
+
+        return View::make('local.managers.admins.new-course-show', compact('title','course', 'semesters', 'activities', 'is_active_semester'));
+    }
 
 	/**
 	 * Display the specified course, but with limited information.

app/controllers/OutcomesController.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Database\Eloquent\Collection;
+
 class OutcomesController extends \BaseController {
 
 
@@ -158,48 +160,41 @@ class OutcomesController extends \BaseController {
     public function newShow($id)
     {
 //        DB::disableQueryLog();
-        $outcome = Outcome::find($id);
-        $title = $outcome->name;
-        $objectives = $outcome->objectives;
-        $criteria = $outcome->criteria;
-        $programs = $objectives->map(function ($objective) { return $objective->program; })
-            ->merge($criteria->map(function ($criteria) { return $criteria->program; }))
-            ->filter(function ($program) { return $program->users->contains(Auth::user()); });
-        $courses = $programs->reduce(function ($carry, $program) {
-            return $carry->merge($program->courses);
-        }, new \Illuminate\Database\Eloquent\Collection);
-        $activities = $programs->reduce(function ($carry, $course) {
-            return $carry->merge(Activity::where('course_id', '=', $course->id)->get());
-        }, new \Illuminate\Database\Eloquent\Collection);
-
-        $report_link = URL::action('OutcomesController@newReport', ['id' => $outcome->id]);
-
-        return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities', 'report_link'));
-    }
-    public function newShowAll()
-    {
-//        DB::disableQueryLog();
-        $title = 'All Domains';
-        $outcome = Outcome::with('objectives', 'criteria')->get();
-        $objectives = $outcome->reduce(function ($carry, $outcome) {
-            return $carry->merge($outcome->objectives);
-        }, new \Illuminate\Database\Eloquent\Collection);
-        $criteria = $outcome->reduce(function ($carry, $outcome) {
-            return $carry->merge($outcome->criteria);
-        }, new \Illuminate\Database\Eloquent\Collection);
-        $programs = $objectives->map(function ($objective) { return $objective->program; })
-            ->merge($criteria->map(function ($criteria) { return $criteria->program; }))
-            ->filter(function ($program) { return $program->users->contains(Auth::user()); });
-
-        $courses = $programs->reduce(function ($carry, $program) {
-            return $carry->merge($program->courses);
-        }, new \Illuminate\Database\Eloquent\Collection);
-        $activities = $programs->reduce(function ($carry, $course) {
-            return $carry->merge(Activity::where('course_id', '=', $course->id)->get());
-        }, new \Illuminate\Database\Eloquent\Collection);
+//        $outcome = null;
+        if ($id === 'all') {
+            $outcome = Outcome::with('objectives.criteria')->get();
+            $title = 'All Outcomes';
+            $criteria = $outcome->reduce(function($carry, $outcome) {
+                return $carry->merge($outcome->criteria);
+            }, Collection::make([]));
+            $report_link = URL::action('OutcomesController@newReportAll');
+        } else {
+            $outcome = Outcome::with(['objectives.criteria'])->find($id);
+            $title = $outcome->name;
+            $criteria = $outcome->criteria->load('rubrics');
+            $report_link = URL::action('OutcomesController@newReport', ['id' => $outcome->id]);
+        }
 
-        $report_link = URL::action('OutcomesController@newReportAll');
+//        $objectives = $outcome->objectives;
+//        var_dump(get_class_methods($criteria));
+//        var_dump($criteria);
+        $rubrics = $criteria->reduce(function($carry, $crit) {
+            return $carry->merge($crit->rubrics);
+        }, Collection::make([]))->load('activities');
+        $activities = $rubrics->reduce(function($carry, $rubric) {
+            return $carry->merge($rubric->activities);
+        }, Collection::make([]));
+        $courses = $activities->reduce(function($carry, $activity) {
+            if ($activity->course !== null) {
+                $carry->push($activity->course);
+            }
+            return $carry;
+        }, Collection::make([]));
+        $activities = $activities->filter(function($activity) {
+            return ($activity->course === null);
+        });
 
+//        var_dump(DB::getQueryLog());
         return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities', 'report_link'));
     }
 

app/models/Course.php

@@ -20,11 +20,17 @@ class Course extends Eloquent
     return $this->belongsTo('User')->orderBy('surnames', 'asc')->orderBy('first_name', 'asc');
   }
 
+  // TODO: Remove
   public function activities()
   {
     return $this->hasMany('Activity')->orderBy('date', 'asc');
   }
 
+  public function activity()
+  {
+      return $this->belongsTo('Activity');
+  }
+
   public function assessedActivities()
   {
     return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->orderBy('date', 'asc');

app/models/Criterion.php

@@ -4,15 +4,28 @@ use Illuminate\Database\Eloquent\SoftDeletingTrait;
 
 class Criterion extends Eloquent
 {
-	use SoftDeletingTrait;
-	protected $dates = ['deleted_at'];
+    use SoftDeletingTrait;
+    protected $dates = ['deleted_at'];
 
-	protected $table = 'criteria';
+    protected $table = 'new_criteria';
 
-	public function outcomes()
-	{
-		return $this->belongs('Outcome');
-	}
+    public function outcomes()
+    {
+//	    return $this->belongs('Objective')->belongs('Outcome');
+//	    TODO: Changes here
+//		return $this->belongs('Outcome');
+        return $this->hasManyThrough('Outcome', 'Objective');
+    }
+
+    public function objectives()
+    {
+        return $this->belongsToMany('Objective');
+    }
+
+    public function rubrics()
+    {
+        return $this->belongsToMany('Rubric', 'new_criterion_rubric');
+    }
 
 	/**
 	 * Return the program that the criterion belongs to

app/models/Objective.php

@@ -25,4 +25,14 @@ class Objective extends Eloquent
   	return $this->belongsToMany('Outcome', 'objective_outcome', 'objective_id', 'outcome_id');
   }
 
+    /**
+     * Return the program that the objective belongs to
+     *
+     * @return Illuminate\Database\Eloquent\Model
+     */
+    public function criteria()
+    {
+        return $this->hasMany('Criterion');
+    }
+
 }

app/models/Outcome.php

@@ -11,7 +11,7 @@ class Outcome extends Eloquent
 
 	public function criteria()
 	{
-	   return $this->hasMany('Criterion')->orderBy('name');
+	   return $this->hasManyThrough('Criterion', 'Objective')->orderBy('name');
 	}
 
 	/**
@@ -21,6 +21,7 @@ class Outcome extends Eloquent
 	 */
 	public function objectives()
 	{
-		return $this->belongsToMany('Objective', 'objective_outcome');
+	    return $this->hasMany('Objective');
+//		return $this->belongsToMany('Objective', 'objective_outcome');
 	}
 }

app/models/Rubric.php

@@ -19,12 +19,9 @@ class Rubric extends Eloquent
     return $this->belongsTo('User')->orderBy('created_at');
   }
 
-  /*
-   * TODO Check if this is true later.
-  */
   public function activities()
   {
-    return $this->hasMany('Activity');
+    return $this->belongsToMany('Activity', 'new_rubric_activity');
   }
 
   public function getCriterion($id, $criterion_id)

app/routes.php

@@ -275,7 +275,7 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('courses/reassign', 'CoursesController@reassign');
         Route::post('courses/update', array('before' => 'csrf', 'uses'=>'CoursesController@update'));
 
-
+        Route::get('activities/create', 'ActivitiesController@newCreate');
 
     });
 
@@ -355,10 +355,9 @@ Route::group(array('before' => 'auth|has_access'), function()
         Route::get('learning-outcomes/show/{id}', 'OutcomesController@show');
         // TODO: Change route name
         Route::get('learning-outcomes/newshow/{id}', 'OutcomesController@newShow');
-        Route::get('learning-outcomes/newshowall', 'OutcomesController@newShowAll');
         Route::get('new-report/{id}', 'OutcomesController@newReport');
         Route::get('new-report-all', 'OutcomesController@newReportAll');
-
+        Route::get('courses/{id}', 'CoursesController@newShow');
     });
 
 

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

@@ -0,0 +1,130 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @include('local.managers.admins._navigation')
+@stop
+@section('main')
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-default panel-button">
+                <div class="panel-heading">
+                    Create new activity
+                </div>
+                <div class="panel-body">
+
+
+                    {{ Form::open(array('action' => 'CoursesController@update')) }}
+
+                    <div class="form-group">
+                        {{ Form::label('activity_type', 'Activity Type') }}
+                        <select id="activity_type" name="activity_type" class="form-control">
+                            @foreach ($activity_types as $activity_type)
+{{--                                @if(Input::old('activity_type')!=$activity_type)--}}
+{{--                                    <option value="{{ $activity_type }}">{{ $activity_type }} ({{ $program->school->name }})</option>--}}
+{{--                                @else--}}
+{{--                                    <option selected value="{{ $program->id }}">{{ $program->name }} ({{ $program->school->name }})</option>--}}
+{{--                                @endif--}}
+                            @endforeach
+                        </select>
+{{--                        {{ 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>
+                                @else
+                                    <option selected value="{{ $outcome->id }}">{{ $outcome->name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </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>
+                                @else
+                                    <option selected value="{{ $objective->id }}">{{ $objective->name }}</option>
+                                @endif
+                            @endforeach
+                        </select>
+                    </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)
+{{--                                @if(Input::old('transforming_action')!=$transforming_action->id)--}}
+{{--                                    <option value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option>--}}
+{{--                                @else--}}
+{{--                                    <option selected value="{{ $transforming_action->id }}">{{ $transforming_action->name }}</option>--}}
+{{--                                @endif--}}
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <br>
+
+                    {{ 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>
+
+
+    </div>
+@stop
+
+@section('javascript')
+
+    // --------------------------------------------------------------------------
+    // Page load
+    // --------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------
+    // Functions
+    // --------------------------------------------------------------------------
+
+
+
+    // --------------------------------------------------------------------------
+    // Events
+    // --------------------------------------------------------------------------
+
+@stop

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

@@ -0,0 +1,103 @@
+@extends('layouts.master')
+
+@section('navigation')
+    @if(Auth::user()->role==1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role==2)
+        @include('local.managers.sCoords._navigation')
+    @elseif(Auth::user()->role==3)
+        @include('local.managers.pCoords._navigation')
+    @else
+        @include('local.professors._navigation')
+    @endif
+@stop
+
+@section('main')
+
+    <div class="row">
+        <div class="col-md-12">
+            <p>{{$course->name}}</p>
+        </div>
+    </div>
+
+
+    <div class="row">
+        <div class="col-md-12">
+            <h3>Activities</h3>
+
+            @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>
+                @endif
+
+                <table class="table table-striped table-condensed">
+                    <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Date</th>
+                        <th>Updated</th>
+                        <th>Assessed</th>
+                        <th>Published</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @foreach ($activities as $activity)
+                        <tr>
+                            <td>{{ link_to_action('ActivitiesController@show', $activity->name, $parameters = array('id'=>$activity->id)) }}</td>
+                            <td>{{ date('M d, Y', strtotime($activity->date)) }}</td>
+                            <td>{{ date('M d, Y', strtotime($activity->updated_at)) }}</td>
+                            <td>
+                                @if($activity->outcomes_attempted!=NULL)
+                                    <span class="glyphicon glyphicon-ok"></span>
+                                @endif
+                            </td>
+                            <td>
+                                @if($activity->outcomes_attempted!=NULL && !$activity->draft)
+                                    <span class="glyphicon glyphicon-ok"></span>
+                                @endif
+                            </td>
+                        </tr>
+                    @endforeach
+
+                    @if (!$is_active_semester)
+                        <tr>
+                            <td colspan="3"><div class="alert alert-info">The semester for this course is inactive. You cannot create any more activities.</div></td>
+                        </tr>
+                    @endif
+                    </tbody>
+                </table>
+
+                <p>Unplublished activity results are <strong>not considered</strong> in the graph above.</p>
+
+            @else
+                <div class="alert alert-info">
+                    @if($is_active_semester)
+                        <p>
+                            No activities.
+                            <a data-toggle="modal" data-target="#newActivityModal">
+                                Create one.
+                            </a>
+                        </p>
+                    @else
+                        <p>The semester for this course is inactive. You cannot create any activities.</p>
+                    @endif
+                </div>
+            @endif
+        </div>
+    </div>
+@stop
+
+@section('included-js')
+
+    <!-- HighCharts -->
+    <script src="{{ asset('vendor/highcharts/highcharts.js') }}"></script>
+    <!--script src="http://code.highcharts.com/modules/exporting.js"></script -->
+
+@stop
+
+@section('javascript')
+
+
+@stop
+

app/views/local/managers/admins/new-learning-outcome.blade.php

@@ -24,7 +24,7 @@
         @foreach($courses as $course)
             <div class="col-md-2">
 {{--                TODO: Add href --}}
-                <a href="" style="text-decoration: none">
+                <a href="{{ URL::action('CoursesController@newShow', ['id' => $course->id]) }}" style="text-decoration: none">
                     <div class="panel panel-default" style="height: 10rem">
                         <div class="panel-heading">
                             <h5 class="panel-title">{{ $course->code }}</h5>

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

@@ -14,7 +14,7 @@
 
     <div class="row">
         <div class="col-md-6">
-            <a href="{{ URL::action('OutcomesController@newShowAll') }}" class="btn btn-lg btn-default">Show all domains</a>
+            <a href="{{ URL::action('OutcomesController@newShow', ['id' => 'all']) }}" class="btn btn-lg btn-default">Show courses and activities for all domains</a>
         </div>
     </div>
     <br>