Added outcome reports

app/controllers/OutcomesController.php

@@ -172,7 +172,9 @@ class OutcomesController extends \BaseController {
             return $carry->merge(Activity::where('course_id', '=', $course->id)->get());
         }, new \Illuminate\Database\Eloquent\Collection);
 
-        return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities'));
+        $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()
     {
@@ -196,7 +198,9 @@ class OutcomesController extends \BaseController {
             return $carry->merge(Activity::where('course_id', '=', $course->id)->get());
         }, new \Illuminate\Database\Eloquent\Collection);
 
-        return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities'));
+        $report_link = URL::action('OutcomesController@newReportAll');
+
+        return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities', 'report_link'));
     }
 
     public function newReport($id)
@@ -207,15 +211,19 @@ class OutcomesController extends \BaseController {
         $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()); });
-        $title = $outcome->name;
-        $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);
+        $title = $outcome->name . ' Report';
+
+
+        return View::make('local.managers.admins.new-report', compact('title', 'outcome', 'objectives'));
+
+    }
+
+    public function newReportAll()
+    {
+        $outcomes = Outcome::with('objectives')->get();
+        $title = 'All Outcomes Report';
 
-        return View::make('local.managers.admins.new-learning-outcome', compact('title', 'outcome', 'courses', 'activities'));
+        return View::make('local.managers.admins.new-report-all', compact('title', 'outcomes'));
 
     }
 

app/routes.php

@@ -356,6 +356,8 @@ Route::group(array('before' => 'auth|has_access'), function()
         // 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');
 
     });
 

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

@@ -17,7 +17,7 @@
             <h3>Courses</h3>
         </div>
         <div class="col-md-2">
-            <a href="" class="btn btn-lg btn-default" role="button">Report</a>
+            <a href="{{ $report_link }}" class="btn btn-lg btn-default" role="button">Report</a>
         </div>
     </div>
     <div class="row">

app/views/local/managers/admins/new-report-all.blade.php

@@ -0,0 +1,65 @@
+@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')
+    @endif
+@stop
+
+@section('main')
+    <div class="row">
+        <div class="col-md-12">
+            <table class="table table-striped table-condensed editable-table">
+                <thead><tr class="center-text">
+                    <th class="col-md-2">Outcomes</th>
+                    <th class="col-md-4">Learning Objectives</th>
+                    <th class="col-md-4">Transformative Actions</th>
+                    <th class="col-md-2">Expected Metric</th>
+                </thead>
+                <tbody>
+                @foreach ($outcomes as $outcome)
+                    @foreach ($outcome->objectives as $i => $objective)
+                        <tr data-id="{{$outcome->id}}">
+                            @if ($i == 0)
+                                <td contenteditable="true" class="name col-md-2" rowspan="{{ $outcome->objectives->count() }}">{{ $outcome->name }}</td>
+                            @endif
+                            <td contenteditable="true" class="name col-md-4" >{{ $objective->text }}</td>
+{{--                             TODO: Use correct data--}}
+                            <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ 'TODO' }}</td>
+                            <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
+                        </tr>
+                    @endforeach
+                @endforeach
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+    // ------------------------------------------------------------------------
+    // Page Load
+    // ------------------------------------------------------------------------
+
+    // ------------------------------------------------------------------------
+    // Events
+    // ------------------------------------------------------------------------
+
+
+
+    // ------------------------------------------------------------------------
+    // Functions
+    // ------------------------------------------------------------------------
+
+@stop

app/views/local/managers/admins/new-report.blade.php

@@ -0,0 +1,60 @@
+@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')
+    @endif
+@stop
+
+@section('main')
+    <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">
+                <thead><tr class="center-text">
+                    <th class="col-md-4">Learning Objectives</th>
+                    <th class="col-md-6">Transformative Actions</th>
+                    <th class="col-md-2">Expected Metric</th>
+
+                </thead>
+                <tbody>
+                @foreach ($objectives as $objective)
+                    <tr data-id="{{ $objective->id }}">
+                        <td contenteditable="true" class="name col-md-4" >{{ $objective->text }}</td>
+                        {{-- TODO: Use correct data --}}
+                        <td contenteditable="true" data-type="textarea" class="definition col-md-6" >{{ 'TODO' }}</td>
+                        <td contenteditable="true" class="expected-outcome col-md-1" >{{ $outcome->expected_outcome }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop
+
+@section('javascript')
+
+    // ------------------------------------------------------------------------
+    // Page Load
+    // ------------------------------------------------------------------------
+
+    // ------------------------------------------------------------------------
+    // Events
+    // ------------------------------------------------------------------------
+
+
+
+    // ------------------------------------------------------------------------
+    // Functions
+    // ------------------------------------------------------------------------
+
+@stop

composer.json

@@ -12,7 +12,8 @@
 	},
 	"require-dev": {
 		"way/generators": "~2.0",
-		"fzaninotto/faker": "1.5.*@dev"
+		"fzaninotto/faker": "1.5.*@dev",
+		"barryvdh/laravel-ide-helper": "1.11"
 		},
 	"autoload": {
 		"classmap": [