Push reportes, bugs,

app/controllers/AnnualPlansController.php

@@ -46,7 +46,7 @@ class AnnualPlansController extends \BaseController
     $annual_plans = DB::select("select semester_start, semester_end, program_id, annual_plans.id, academic_year from annual_plans, annual_cycle   where annual_plans.annual_cycle_id = annual_cycle.id and program_id ={$program_id} order by id desc");
 
 
-    return View::make('local.managers.sCoords.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
+    return View::make('local.managers.shared.view-annual-plans', compact('title', 'program_id', 'annual_plans'));
   }
 
   /**
@@ -135,10 +135,14 @@ class AnnualPlansController extends \BaseController
     $title = "Annual Plans";
     //$typ_parts = DB::select("select * from typ_parts");
 
-//     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
+    //     $current_typ = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'))[0];
     $current_typ_arr = DB::select("select * from three_year_plan where year_start <=" . date('Y') . " and year_end >=" . date('Y'));
-// 	var_dump($current_typ);exit();
-	if(!empty($current_typ_arr))$current_typ=$current_typ_arr[0];else {$current_typ= new stdClass();$current_typ->id=0;}
+    // 	var_dump($current_typ);exit();
+    if (!empty($current_typ_arr)) $current_typ = $current_typ_arr[0];
+    else {
+      $current_typ = new stdClass();
+      $current_typ->id = 0;
+    }
 
 
     $program = Program::where('id', '=', $program_id)->first();
@@ -155,7 +159,7 @@ class AnnualPlansController extends \BaseController
     }*/
     $alltyp = DB::select('select * from three_year_plan order by id desc');
     $current_typ = $current_typ->id;
-    return View::make('local.managers.sCoords.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
+    return View::make('local.managers.shared.annual-plans', compact('title', 'annual_plans', 'current_typ', 'program', 'outcomes', 'allSemesterOrder', 'alltyp'));
   }
 
   public function fetchInfo()

app/controllers/CriteriaController.php

@@ -121,11 +121,12 @@ class CriteriaController extends \BaseController
 
                 $program_ids = DB::table('program_user')
                     ->where('user_id', Auth::user()->id)
-                    ->lists('id');
+                    ->lists('program_id');
 
                 break;
         }
         $outcome_id = Input::get('outcomeID');
+        Log::info($outcome_id);
 
         $json = DB::table('objectives')
             ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
@@ -135,6 +136,13 @@ class CriteriaController extends \BaseController
             ->select('objectives.*', 'objective_outcome.*')
             ->distinct()
             ->get();
+        Log::info(DB::table('objectives')
+            ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+            ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+            ->where('outcome_id', '=', $outcome_id)
+            ->whereIn('program_id', $program_ids)
+            ->select('objectives.*', 'objective_outcome.*')
+            ->distinct()->toSql());
         foreach ($json as $objective) {
             $objective->program_ids = json_encode(DB::table('objective_program')
                 ->where('objective_id', $objective->objective_id)

app/controllers/Objective2Controller.php

@@ -78,9 +78,10 @@ class Objective2Controller extends \BaseController
 
 		$clean_input['outcome_id'] = Input::get('outcome');
 		$counter = Input::get('counter') + 0;
+		Log::info($clean_input);
 
-		for ($i = 0; $i < $counter; $i++) {
-			$clean_input['outcome_id'][$i] = trim(preg_replace('/\t+/', '', $clean_input['outcome_id'][$i]));
+		foreach ($clean_input['outcome_id'] as $index => $outcome_id) {
+			$clean_input['outcome_id'][$index] = trim(preg_replace('/\t+/', '', $clean_input['outcome_id'][$index]));
 		}
 
 		$clean_input['program_id'] = Input::get('program_id');

app/controllers/OutcomesController.php

@@ -987,14 +987,14 @@ class OutcomesController extends \BaseController
     }
 
 
-    // Report for a single professor with a single learning outcome
-    public function professorAssessmentReport($outcome_id)
+    // Report for a single professor //with a single learning outcome
+    public function professorAssessmentReport()
     {
-        $outcome = Outcome::find($outcome_id);
+        //$outcome = Outcome::find($outcome_id);
 
-        if (!$outcome)
-            App::abort('404');
-        $title = "My Courses' Assessment Report: " . $outcome->name;
+        //if (!$outcome)
+        //    App::abort('404');
+        $title = "My Courses' Assessment Report";
         $activity_criterion = DB::table('assessments')->lists('activity_criterion_id');
         $courses = DB::table("courses")
             ->join('activities', 'activities.course_id', '=', 'courses.id')
@@ -1022,6 +1022,8 @@ class OutcomesController extends \BaseController
             ->get();*/
 
 
-        return View::make('local.professors.assessment_report', compact('title', 'outcome', 'courses'));
+
+
+        return View::make('local.professors.new_assessment_report', compact('title', 'courses'));
     }
 }

app/controllers/TemplatesController.php

@@ -47,10 +47,10 @@ class TemplatesController extends \BaseController
 		}
 		$templates = Template::orderBy('name')->get();
 
-		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates', 'schools', 'templates'));
+		return View::make('local.managers.shared.rubric_list', compact('title', 'global_templates', 'schools', 'templates', 'role'));
 	}
 
-	public function schoolCoordinatorIndex()
+	/*public function schoolCoordinatorIndex()
 	{
 		$title = 'Rubric List';
 
@@ -63,7 +63,7 @@ class TemplatesController extends \BaseController
 		$templates = Template::orderBy('name')->get();
 
 		return View::make('local.managers.admins.rubric_list', compact('title', 'global_templates', 'schools', 'templates'));
-	}
+	}*/
 
 	public function show(Template $template)
 	{

app/controllers/TransformativeActionsController.php

@@ -1258,11 +1258,11 @@ class TransformativeActionsController extends \BaseController
     Log::info($semesters);
 
 
-    if (in_array(0, $semesters)) {
+    /* if (in_array(0, $semesters)) {
       $semesters = DB::table('semesters')->where('is_visible', 1)->lists('id');
-    }
+    }*/
 
-    if (in_array(0, $programs)) {
+    /*  if (in_array(0, $programs)) {
 
       $role = Auth::user()->role;
 
@@ -1277,10 +1277,10 @@ class TransformativeActionsController extends \BaseController
           $programs = DB::table('program_user')->where('user_id', Auth::user()->id)->lists('program_id');
           break;
       }
-    }
+    }*/
 
     $typ_semester_outcome = DB::table('typ_semester_outcome')
-      ->whereIn('semester_id', $semesters)
+      ->where('semester_id', $semesters)
       ->where('outcome_id', $outcome_id)
       ->lists('id');
 
@@ -1313,8 +1313,8 @@ class TransformativeActionsController extends \BaseController
 
 
     $grouped_courses = DB::table('courses')
-      ->whereIn('program_id', $programs)
-      ->whereIn('semester_id', $semesters)
+      ->where('program_id', $programs)
+      ->where('semester_id', $semesters)
       ->join('activities', 'activities.course_id', '=', 'courses.id')
       ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
       ->join('transformative_activity_criterion as tac', 'tac.activity_criterion_id', '=', 'activity_criterion.id')
@@ -1355,22 +1355,22 @@ class TransformativeActionsController extends \BaseController
           ->join('criteria','activity_criterion.criterion_id','=','criteria.id')
           ->where('activity_id', $activity->id)
           ->select('criteria')*/
-          Log::info($activity->trans_action_id);
+          //Log::info($activity->trans_action_id);
           $activity->objectives = DB::table('transformative_objective')
             ->join('objectives', 'transformative_objective.objective_id', '=', 'objectives.id')
             ->where('ta_id', $activity->trans_action_id)
             ->get();
           foreach ($activity->objectives as $objective) {
-            Log::info($activity->activity_id);
-            Log::info($objective->objective_id);
-            Log::info(DB::table('criterion_objective_outcome')
+            // Log::info($activity->activity_id);
+            // Log::info($objective->objective_id);
+            /* Log::info(DB::table('criterion_objective_outcome')
               ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
               ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
               ->where('activity_criterion.activity_id', $activity->activity_id)
               ->where('objective_id', $objective->objective_id)
               ->select('criteria.*')
               ->distinct()
-              ->toSql());
+              ->toSql());*/
             $objective->criterion = DB::table('criterion_objective_outcome')
               ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
               ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')

app/models/Activity.php

@@ -108,6 +108,149 @@ class Activity extends Eloquent
     return $criteria_achieved_percentage;
   }
 
+  public function allActivityCriterionInfo()
+  {
+
+    $activity_criterion = DB::table('activity_criterion')
+      ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+      ->where('activity_id', $this->id)
+      ->get();
+
+
+
+
+    return $activity_criterion;
+  }
+
+  public function getOutcomeReport()
+  {
+    $outcomes = DB::table('activity_criterion')
+      ->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+      ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+      ->where('activity_criterion.activity_id', $this->id)
+      ->select('outcomes.*')
+      ->distinct()
+      ->get();
+    $rubric = $this->rubric[0];
+
+    /*
+
+    foreach($outcomes as $outcome){
+      $ac_criteria = DB::table('criterion_objective_outcome as cobo')
+      ->join('activity_criterion as ac','ac.criterion_id','=','cobo.criterion_id')
+      ->where("outcome_id",$outcome->id)
+      ->where("activity_id",$this->id)
+      ->select('ac.*')
+      ->distinct()
+      ->get();
+      $conteo_de_criterios = 0;
+      $students_who_achieved =[];
+
+      $outcome->students_attempted = DB::table("assessments")
+      ->join("activity_criterion as ac", 'ac.id','=','assessments.activity_criterion_id')
+      ->join("criterion_objective_outcome as cobo",'cobo.criterion_id','=','ac.criterion_id')
+      ->where('outcome_id',$outcome->id)
+      ->where('ac.activity_id',$this->id)
+      ->count();
+      
+
+      foreach($ac_criteria as $criterion){
+        $students_attempted = Criterion::students_attempted($criterion->criterion_id, $this->id);
+        $students_achieved = DB::table('assessments')
+				->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+				->where('activity_criterion.id', $criterion->id)
+				->where('assessments.score', '>=', $rubric->expected_points)
+				->lists("student_id");
+        if((count($students_achieved)/$students_attempted) * 100 >$rubric->expected_percentage){
+          foreach($students_achieved as $stu_id){
+            if(!array_key_exists($stu_id, $students_who_achieved)){
+              $students_who_achieved[$stu_id] = 1;
+            }
+          }
+          $conteo_de_criterios++;
+
+        
+
+
+        }
+
+      }
+      $outcome->students_achieved = count($students_who_achieved);
+
+    }*/
+
+    $students_attempted =  DB::table('assessments')
+      ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+      ->where('activity_criterion.activity_id', $this->id)
+
+      ->get();
+
+    $student_criteria = [];
+
+    foreach ($outcomes as $outcome) {
+      $ac_criteria = DB::table('criterion_objective_outcome as cobo')
+        ->join('activity_criterion as ac', 'ac.criterion_id', '=', 'cobo.criterion_id')
+        ->where("outcome_id", $outcome->id)
+        ->where("activity_id", $this->id)
+        ->select('ac.*')
+        ->distinct()
+        ->lists('id');
+
+      /*$student_achieved = DB::table('assessments')
+        ->whereIn('activity_criterion_id', $ac_criteria)
+        ->where('score', '>=', $rubric->expected_points)
+        ->groupBy('student_id')
+        ->select('student_id', 'count(activity_criterion_id)');
+      $students_attempted = DB::table('assessments as a')
+        ->whereIn('a.activity_criterion_id', $ac_criteria)
+        ->groupBy('a.student_id')
+        ->leftJoin('assessments as b', function ($join) use ($ac_criteria, $rubric) {
+          $join->on('b.student_id', '=', 'a.student_id')
+            ->where('b.activity_criterion_id', '=', 'a.activity_criterion_id')
+            ->where('b.score', '>=', $rubric->expected_points);
+        })
+        ->select('a.student_id', DB::raw('count(`a`.`activity_criterion_id`) attempted'), DB::raw('count(`b`.`activity_criterion_id`) achieved'));
+      Log::info($students_attempted->get());*/
+      $students_attempted = DB::table('assessments as a')
+        ->whereIn('a.activity_criterion_id', $ac_criteria)
+        ->groupBy('a.student_id')
+        ->select(
+          'a.student_id',
+          DB::raw('count(`a`.`activity_criterion_id`) attempted'),
+          DB::raw("count(case when score >= {$rubric->expected_points} then 1 else null end) as achieved")
+        )->get();
+
+      $outcome->attempted = count($students_attempted);
+
+      $conteo_outcome_achieved = 0;
+
+      foreach ($students_attempted as $student) {
+        Log::info($student->achieved / $student->attempted * 100);
+        if ($student->achieved / $student->attempted * 100 >= $outcome->expected_outcome) {
+          $conteo_outcome_achieved++;
+        }
+      }
+      $outcome->achieved = $conteo_outcome_achieved;
+      $outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
+
+
+
+
+
+      /*foreach ($students_attempted as $student) {
+        $student_criteria[$student];
+      }
+
+      $conteo_de_criterios = 0;
+      $students_who_achieved = [];
+      foreach ($ac_criteria as $ac) {
+        $students_attempted = DB::table("assessments")
+          ->where('activity_criterion_id', $ac->id)
+          ->get();
+      }*/
+    }
+    return $outcomes;
+  }
   // o_ach_array
   public function getOAchArrayAttribute($value)
   {

app/models/Course.php

@@ -20,6 +20,8 @@ class Course extends Eloquent
     return $this->belongsTo('User')->orderBy('surnames', 'asc')->orderBy('first_name', 'asc');
   }
 
+
+
   // TODO: Remove
   public function activities()
   {

app/models/Criterion.php

@@ -10,12 +10,19 @@ class Criterion extends Eloquent
 	//     protected $table = 'new_criteria';
 	protected $table = 'criteria';
 
-	public function outcomes()
+	public function outcomes($criterion_id)
 	{
 		//	    return $this->belongs('Objective')->belongs('Outcome');
 		//	    TODO: Changes here
 		//		return $this->belongs('Outcome');
-		return $this->hasManyThrough('Outcome', 'Objective');
+		$outcomes = DB::table('criterion_objective_outcome')
+			->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+			->where('criterion_id', $criterion_id)
+			->select('outcomes.*')
+			->distinct()
+			->get();
+		return $outcomes;
+		//$this->hasManyThrough('Outcome', 'Objective');
 	}
 
 	public function objectives()

app/models/Rubric.php

@@ -13,6 +13,15 @@ class Rubric extends Eloquent
       'name' => 10,
     ],
   ];
+  public function getTitles()
+  {
+    $titles = DB::table('titles')
+      ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
+      ->where('rubric_id', $this->id)
+      ->orderBy('position', "ASC")
+      ->get();
+    return $titles;
+  }
 
   public function professor()
   {

app/routes.php

@@ -349,7 +349,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         // Route::post('storeTypInfo', 'OutcomesController@storeCycleInfo'); //TODO: where is this route supposed to be placed?
         Route::get('programs', 'ProgramsController@index');
-        Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
+        Route::get('template-list', 'TemplatesController@index');
         Route::post('deleteObjective', 'Objective2Controller@delete');
         // Print school report
         Route::get('print_school/{id}', 'SchoolsController@print_school');
@@ -411,7 +411,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('printRubric/{id}', 'TemplatesController@printview');
         Route::get('rubric/{rubric_id}', 'RubricsController@show_limited');
         Route::get('grouped_course/{code}/{number}/{semester_code}', 'CoursesController@showGrouped');
-        Route::get('template-list', 'TemplatesController@schoolCoordinatorIndex');
+        Route::get('template-list', 'TemplatesController@index');
 
         //Criteria and objectives
         Route::get('program-criteria', 'CriteriaController@editProgram');
@@ -538,8 +538,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
         Route::get('learning-objectives-criteria', 'CriteriaController@objectivesIndex');
         // Assessment reports
-        Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');
-        Route::get('professor-assessment-reports', 'OutcomesController@professorAssessmentReports');
+        //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');
+        Route::get('professor-assessment-reports', 'OutcomesController@professorAssessmentReport');
 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
     });

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.master-2')
+@extends('layouts.master-1')
 
 @section('navigation')
     @if(Auth::user()->role==1)

app/views/layouts/master-2.blade.php

@@ -92,7 +92,7 @@
         <div class="container-fluid" style="margin: 48px">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="semesterbar">
+                  <!--  <div class="semesterbar">
                         <p>
                             <strong>Viewing:</strong>
                             @foreach (Session::get('semesters_info') as $semester_info)
@@ -100,7 +100,7 @@
                             @endforeach
                             <a href="#" data-toggle="modal" data-target="#changeTermModal"> <strong>Change</strong></a>
                         </p>
-                    </div>
+                    </div>--> 
                     
                 </div>
             </div>

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

@@ -34,7 +34,7 @@
                 <div id='objectiveGroupFor0' data-value = '1'>
                     <div class="form-group col-md-11">
                         <label>Associated Objectives for Outcome 1</label>
-                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker" onchange ="visiblePrograms('allOutcomes')">
                         </select>
 
                     </div>
@@ -62,15 +62,15 @@
                 </button>
 
                 <!-- Associated Program -->
-                <div class="form-group">
+                <div class="form-group" id = 'program-checkboxes'>
                     {{ Form::label('program_id', 'Associated Program') }}<br>
                     <br>
 
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
-                    <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
-                    @endforeach
+                    <input type="checkbox" id="program-{{ $program->id }}" name="program_id[]" value="{{$program->id}}" >
+                    <label for="program-{{ $program->id }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
+                     @endforeach
 
                 </div>
 
@@ -169,7 +169,7 @@
     <div id='assoc_objectiveGroupFor0' data-value="1">
                         <div class="form-group col-md-11">
                             <label>Associated Objectives for Outcome 1</label>
-                            <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                            <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker" onchange ="visiblePrograms('allAssocOutcomes')">
                                 <option value="0">No associated objectives</option>
                             </select>
     
@@ -190,14 +190,14 @@
                         Add another Outcome
                     </button>
                 <!-- Associated Program -->
-                <div class="form-group">
+                <div class="form-group" id = 'assoc-program-checkboxes'>
 
                     {{ Form::label('program_id2', 'Associated Program') }}<br><br>
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
-                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
-                    @endforeach
+                    <input type="checkbox" id="assoc_program-{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program-{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                     @endforeach
                 </div>
 
 
@@ -292,6 +292,68 @@ e.preventDefault();
 })
 
 
+visibleProgram = {};
+visibleProgram["allAssocOutcomes"]= {}
+visibleProgram["allOutcomes"]={}
+function visiblePrograms(allOutcomesDiv){
+    $('#'+allOutcomesDiv).parent().find('input:checkbox').each(function(index){
+
+        id = $(this).attr('id');
+        $(this).prop( "checked", false );
+        program_id = $(this).val();
+        if(!(program_id in visibleProgram[allOutcomesDiv])){
+            visibleProgram[allOutcomesDiv][program_id] ={};
+        }
+        visibleProgram[allOutcomesDiv][program_id]["checkbox"] =$(this).detach();
+        $("label[for='"+id+"']").next('br').remove();
+        visibleProgram[allOutcomesDiv][program_id]["label"] =$("label[for='"+id+"']").detach();
+
+    })
+    if(allOutcomesDiv =="allOutcomes"){
+    $('#'+allOutcomesDiv).parent().find("select[name='objective[]']").each(function(index){
+        var the_programs = $(this).find(':selected').data('program-ids');
+        if(!the_programs) return;
+        
+        
+        for(index in the_programs){
+            program_id = the_programs[index];
+            
+            if(program_id in visibleProgram[allOutcomesDiv] && 
+            !($('#program-checkboxes').find('#'+visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id')).val())){
+                visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo('#program-checkboxes');
+                visibleProgram[allOutcomesDiv][program_id]['label'].appendTo("#program-checkboxes");
+                $('#program-checkboxes').append('<br>');
+
+                
+
+            }
+        }
+        
+    })
+    }
+    else{
+        $('#'+allOutcomesDiv).find("select[name='objective[]']").each(function(index){
+        var the_programs = $(this).find(':selected').data('program-ids');
+        if(!the_programs) return;
+        
+        
+        for(index in the_programs){
+            program_id = the_programs[index];
+            if(program_id in visibleProgram[allOutcomesDiv] && 
+            !($('#assoc-program-checkboxes').find('#'+visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id')).val())){
+                visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo('#assoc-program-checkboxes');
+                visibleProgram[allOutcomesDiv][program_id]['label'].appendTo("#assoc-program-checkboxes");
+                $('#assoc-program-checkboxes').append('<br>');
+
+                
+
+            }
+        }
+        
+    })
+    }
+
+}
     function addOptions(select, max, scaleDiv) {
 
         
@@ -477,8 +539,9 @@ function addOutcomeTest() {
         'class': "selectpicker form-control",
         'name': "objective[]",
         'data-live-search': 'true',
-        'id': 'objective_'+counter +'_counter_1'  
-    });
+        'id': 'objective_'+counter +'_counter_1' ,
+        'onchange': "visiblePrograms('allOutcomes')"
+        });
 
     var empty_div = $('<div/>',{
         'class': 'col-md-1'
@@ -544,13 +607,14 @@ function addOutcomeTest() {
 
     }
     //Delete Objective
-    function deleteObjective(objectiveForm, closeObj, objectiveGroup) {
+    function deleteObjective(objectiveForm, closeObj, objectiveGroup, allOutcomes) {
         $div = document.getElementById(objectiveForm);
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
         counter = parseInt($('#'+objectiveGroup).data("value"));
         $('#'+objectiveGroup).data("value", counter-1);
+        visiblePrograms(allOutcomes);
 
 
     }
@@ -567,7 +631,7 @@ function addOutcomeTest() {
             'name': "objective[]",
             'data-live-search': 'true',
             'id': originalObjective+'_counter_' + (assocObjectiveCounter+1).toString(),
-
+            'onchange': "visiblePrograms('allAssocOutcomes')"
 
         });
         var $div = $('<div/>', {
@@ -582,7 +646,7 @@ function addOutcomeTest() {
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'")'
+            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'", "allAssocOutcomes")'
         });
 
         $button.append('X');
@@ -611,8 +675,9 @@ function addOutcomeTest() {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': originalObjective +'_counter_' + (counter+1).toString()
-        });
+            'id': originalObjective +'_counter_' + (counter+1).toString(),
+            'onchange': "visiblePrograms('allOutcomes')"
+                });
         var $div = $('<div/>', {
             'id': 'objectiveForm_'+objForGroup + '_' + counter.toString(),
             'class': 'form-group col-md-10'
@@ -625,8 +690,8 @@ function addOutcomeTest() {
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'")'
-        });
+            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'", "allOutcomes")'
+    });
 
         $button.append('X');
         $divForButton.append($button);
@@ -670,8 +735,8 @@ function addOutcomeTest() {
             'type': 'button',
             'class': 'btn btn-primary',
             'id': 'assoc_close_button'+assocOutcomeCounter,
-            'onclick': '$(this).parent().parent().remove()'
-         });
+            'onclick': '$(this).parent().parent().remove(); visiblePrograms("allAssocOutcomes")'
+        });
 
         var divForGroup = $('<div/>', {
             'id' : 'assocOutcomeGroup'+assocOutcomeCounter.toString(),
@@ -689,8 +754,9 @@ function addOutcomeTest() {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1'  
-        });
+            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1',
+            'onchange': "visiblePrograms('allAssocOutcomes')" 
+            });
 
         var empty_div = $('<div/>',{
             'class': 'col-md-1'
@@ -740,7 +806,7 @@ function addOutcomeTest() {
 
     var assocObjectiveCounter = 1;
 
-    function fetchAssocObjective(outcomeDiv, objectiveGroup) {
+    /*function fetchAssocObjective(outcomeDiv, objectiveGroup) {
         var count = $('#'+outcomeDiv).data('value');
         var allOutcomes =[];
 
@@ -791,21 +857,21 @@ function addOutcomeTest() {
                 for (var i = allObjectives.length - 1; i > 0; i--) {
                     deleteObjective('assoc_objectiveForm_' + objectiveGroup +'_'+i, 'assoc_closeObj_'+objectiveGroup+'_' + i.toString(), objectiveGroup);
                }
-               /* for(var i=1; i<allObjectives.length; i++){
+                for(var i=1; i<allObjectives.length; i++){
                     addAssocObjective();
                     $('#assoc_objective_'+i.toString()).selectpicker('refresh');
                     if($("#assoc_objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
                     $("#assoc_objective_"+i.toString()).val(allObjectives[i].value);
                     $("#assoc_objective_"+i.toString()).selectpicker("refresh");
                     }
-                }*/
+                }
 
 
 
             },
             'json'
         );
-    }
+    }*/
 
     //Fetch objective at creating criteria
     counterForPost = 0;
@@ -830,7 +896,7 @@ function addOutcomeTest() {
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for(index in varArray){
                     objectiveObject = varArray[index];
-                    optionName += '<option value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
+                    optionName += '<option data-program-ids = "'+objectiveObject.program_ids+'" value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
                         objectiveObject.text+'</option>';
 
                 }
@@ -1037,8 +1103,8 @@ var name = criterion.name;
                     options = "<option value ='0'>Nothing Selected</option>";
                     $(first_outcome.assoc_objectives).each(function(index, objective){
 
-options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
-    objective.text+'</option>';
+                        options += '<option data-program-ids = "'+objective.program_ids+'" value ="('+first_outcome.id+','+objective.objective_id+')">'+
+                            objective.text+'</option>';
 
 })
                     /*for(objective_index  in json.objectives_assoc[first_outcome_id]){
@@ -1123,6 +1189,7 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                     }
 
                 }
+                visiblePrograms('allAssocOutcomes');
 
 
                 //counterObj =$('#assoc_objectiveGroup').data('value');
@@ -1173,7 +1240,7 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                         $('#assoc_objective_0').val(0);
                         $('#assoc_objective_0').selectpicker('refresh');
                     }
-                 
+                
                 }
 
                 for (var i = 1; i < json.objectives.length; i++) {
@@ -1193,9 +1260,10 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                 $('input[type=checkbox]').prop('checked', false);
 
                 for (var i = 0; i < program_length; i++) {
-                    $('#assoc_program_id_' + criterion.program[i].program_id).prop("checked", true);
+                    $('#assoc_program-' + criterion.program[i].program_id).prop("checked", true);
                 }
 
+
                 // Select status
 
 
@@ -1203,7 +1271,6 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
 
 
             }
-            
         );
     }
 </script>@stop
@@ -1223,7 +1290,7 @@ fetchCriterionForEditing();
 fetchObjectiveForSelect('outcome0', 'objectiveGroupFor0');
 // setCriterionStatus();
 fetchAllCriterion("select-program", "assoc_outcomes_fetch");
-
+visiblePrograms('allOutcomes');
 // --------------------------------------------------------------------------
 // Functions
 // --------------------------------------------------------------------------

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

@@ -28,8 +28,7 @@
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
           <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
-          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
-        </ul>
+                 </ul>
       </li>
       @if(count(Auth::user()->courses))
       <li> {{ HTML::linkAction('ProfessorsController@overview', 'My Courses', NULL) }}</li>
@@ -50,6 +49,8 @@
           @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
           @endif
+          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
+    
         </ul>
       </li>
 

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

@@ -729,14 +729,13 @@
 
 
 
-
     }
     //Fetch associated objective for editing
 
 
     var assocObjectiveCounter = 1;
 
-    function fetchAssocObjective(outcomeDiv, objectiveGroup) {
+  /*  function fetchAssocObjective(outcomeDiv, objectiveGroup) {
         var count = $('#' + outcomeDiv).data('value');
         var allOutcomes = [];
 
@@ -794,14 +793,14 @@
                         $("#assoc_objective_" + i.toString()).val(allObjectives[i].value);
                         $("#assoc_objective_" + i.toString()).selectpicker("refresh");
                     }
-                }*/
+                }
 
 
 
             },
             'json'
         );
-    }
+    }*/
 
     //Fetch objective at creating criteria
     counterForPost = 0;
@@ -828,8 +827,8 @@
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for (index in varArray) {
                     objectiveObject = varArray[index];
-                    optionName += '<option value ="(' + objectiveObject.outcome_id + ',' + objectiveObject.objective_id + ')">' +
-                        objectiveObject.text + '</option>';
+                    optionName += '<option data-program-ids = "'+objectiveObject.program_ids+'" value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
+                        objectiveObject.text+'</option>';
 
                 }
                 /*
@@ -1032,16 +1031,16 @@ if (!(criterion.activity_criterion.length)) {
                 if (criterion.outcomes.length) 
                     {
                     $('#assoc_outcome_0').val(criterion.outcomes[0].id);
-                                    $('#assoc_outcome_0').selectpicker('refresh');
+                    $('#assoc_outcome_0').selectpicker('refresh');
 
-                                    var first_outcome = criterion.outcomes[0];
-                   options = "<option value ='0'>Nothing Selected</option>";
-                   $(first_outcome.assoc_objectives).each(function(index, objective){
+                    var first_outcome = criterion.outcomes[0];
+                    options = "<option value ='0'>Nothing Selected</option>";
+                    $(first_outcome.assoc_objectives).each(function(index, objective){
 
-options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
-    objective.text+'</option>';
+                        options += '<option data-program-ids = "'+objective.program_ids+'" value ="('+first_outcome.id+','+objective.objective_id+')">'+
+                        objective.text+'</option>';
 
-})
+                    })
                     /*for (objective_index in json.objectives_assoc[first_outcome_id]) {
                         objective = json.objectives_assoc[first_outcome_id][objective_index]
                         options += '<option value ="(' + first_outcome_id + ',' + objective.objective_id + ')">' +
@@ -1052,8 +1051,8 @@ options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'
 
                     if(first_outcome.objectives_criteria.length){
                         objective_id = first_outcome.objectives_criteria[0].objective_id;
-                    value = '('+first_outcome.id+','+objective_id+')';
-                  $('#assoc_objective_0_counter_1').val(value);
+                        value = '('+first_outcome.id+','+objective_id+')';
+                        $('#assoc_objective_0_counter_1').val(value);
                         $('#assoc_objective_0_counter_1').selectpicker('refresh');
 
                     }
@@ -1085,11 +1084,11 @@ options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'
 
 
                 for (var i = 1; i < criterion.outcomes.length; i++) {
-                                   addAssocOutcome(true);
+                    addAssocOutcome(true);
 
 
-                                   $('#assoc_outcome_' + i.toString()).val(criterion.outcomes[i].id);
-                   $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
+                    $('#assoc_outcome_' + i.toString()).val(criterion.outcomes[i].id);
+                    $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
                     var outcome = criterion.outcomes[i];
                     options = "<option value ='0'>Nothing Selected</option>";
@@ -1097,10 +1096,10 @@ options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'
                    
                     $(outcome.assoc_objectives).each(function(index, objective){
 
-options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
-    objective.text+'</option>';
+                    options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
+                        objective.text+'</option>';
 
-})
+                    })
                     /*for (objective_index in json.objectives_assoc[outcome_id]) {
                         objective = json.objectives_assoc[outcome_id][objective_index]
                         options += '<option value ="(' + outcome_id + ',' + objective.objective_id + ')">' +
@@ -1114,10 +1113,10 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                     $('#assoc_objective_'+i+'_counter_1').val(value);
                     $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh')
                     }
-                                        }
+                                        
 
 
-                                        for(var j =1; j<outcome.objectives_criteria.length; j++ ){
+                    for(var j =1; j<outcome.objectives_criteria.length; j++ ){
                         addAssocObjective("assoc_objectiveGroupFor"+i, "assoc_objective_"+i);
                         objective_id =outcome.objectives_criteria[j].objective_id;
                         value = "("+outcome.id+","+objective_id+")";

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

@@ -10,8 +10,7 @@
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
           <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
-          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
-        </ul>
+          </ul>
       </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Management<span class="caret"></span></a>
@@ -44,7 +43,10 @@
           <li>{{ HTML::linkAction('OutcomesController@managerAssessmentReports', 'School Reports') }}</li>
           @if(count(Auth::user()->courses))
           <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'My Courses\' Reports') }}</li>
+          
           @endif
+          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
+    
         </ul>
       </li>
       <li class='dropdown'>

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

@@ -1,163 +0,0 @@
-<script>
-
-$(document).ready(function()
-{
-  // --------------------------------------------------------------------------
-  // Page load
-  // --------------------------------------------------------------------------
-
-  // Hide accordion panel contents by default
-  $('.panel-group .panel-body').hide();
-
-  $('#outcome-display').parent().hide();
-
-  // --------------------------------------------------------------------------
-  // Functions
-  // --------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------
-  // Events
-  // --------------------------------------------------------------------------
-
-  // When list item is clicked, load corresponding info
-  $('.list-group-item').on('click', function()
-  {
-    var id = $(this).data('outcome-id');
-    var name = $(this).data('outcome-name');
-    var semester = $(this).data('semester-id');
-    $.post(
-    "../annual-plan-fetchTYP/{{$program->id}}",
-    { id: id,
-    semester: semester
-  },
-    function(json)
-    {
-        // Retrieve datatable instance
-        var table = $('.datatable').DataTable();
-        alert(json);
-        
-        var objectives = json.unique_objective;
-        var courses = json.courses;
-        var courseHTML = '<ol>';
-        var objectiveHTML = '';
-        var criteria = json.criteria
-        nextLetter ="@";
-        counter = 1;
-        for(course in courses){
-          courseHTML+='<li>'+courses[course].code+' '+courses[course].number+'</li>';
-        }
-        courseHTML += "</ol>"
-        courses = json.courses_objective;
-        for(objective in objectives){
-          for(course in courses[objectives[objective].id]){
-            objectiveHTML += "<strong>"+courses[objectives[objective].id][course].code+" "+courses[objectives[objective].id][course].number +", </strong>";
-          }
-          
-          objectiveHTML += "<ol type ='A' start='"+counter.toString()+"'>";
-          objectiveHTML += "<li>"+objectives[objective].text+"</li>";
-          objectiveHTML += "</ol>";
-          counter++;
-        }
-    
-        for(objective in objectives){
-          $divForEach =$('<div/>',{
-            'id':'objective #'+objectives[objective]
-          });
-
-          $objective = "<h4>"+objectives[objective].text+"</h4>";
-          
-
-          $divForEach.append($objective)
-          $select = $('<select/>',{
-            'class': "selectpicker form-control",
-            'name' : "criteriaFor["+objectives[objective].id+"]",
-            'data-live-search':'true',
-            'id': 'criteriaFor'+objectives[objective].id+'_0'
-
-          })
-          options = ''
-          for (criterion in criteria[objectives[objective].id]){
-            options += "<option value='"+criteria[objectives[objective].id][criterion].id+"'>"+criteria[objectives[objective].id][criterion].name+"</option>";
-          }
-          $select.append(options);
-          $divForEach.append($select);
-          $divForEach.appendTo('#theChange');
-          $select.selectpicker('refresh');
-          
-        }
-        
-        $('#outcome-display').parent().show();
-        $('.no-outcome').parent().hide();
-
-        //Display title and definition
-        $('#outcome-display .panel-title').html(name);
-     
-
-        //Empty table
-        table.clear();
-
-        // Add new criteria
-        if(courses)
-        {
-          $('table').show();
-          
-          
-              table.row.add([
-                courseHTML,
-                objectiveHTML
-              ]);
-        
-        }
-        else
-        {
-          $('table').hide();
-        }
-
-        // Update display
-        table.draw();
-    },
-    'json'
-    );
-
-  })
-});
-
-function addObjectiveTest() {
-  selectObj = document.getElementById('objective_0').innerHTML;
-  var $select = $('<select/>', {
-      'class': "selectpicker form-control",
-      'name': "objective[]",
-      'data-live-search': 'true',
-      'id': 'objective_' + counterObj.toString()
-
-  });
-  var $div = $('<div/>', {
-      'id': 'objectiveForm' + counterObj.toString(),
-      'class': 'form-group col-md-11'
-  });
-  var $divForButton = $('<div/>', {
-      'class': 'col-md-1',
-      'id': 'closeObj' + counterObj.toString()
-
-  });
-  var $button = $('<button/>', {
-      'type': 'button',
-      'class': 'btn btn-primary',
-      'onclick': 'deleteObjective("objectiveForm' + counterObj.toString() + '", "closeObj' + counterObj.toString() + '")'
-  });
-
-  $button.append('X');
-  $divForButton.append($button);
-
-  $div.appendTo('#objectiveGroup')
-  $select.append(selectObj);
-
-  $select.appendTo('#objectiveForm' + counterObj.toString()).selectpicker('refresh');
-  counterObj += 1;
-
-  $divForButton.appendTo('#objectiveGroup');
-  $('#counterObjective').val(counterObj)
-}
-
-</script>
-

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

@@ -43,7 +43,9 @@
                     Add another Objective
                 </button>
                 
-                <br></div><hr>
+                <br>
+            </div>
+            <hr>
                 </div>
                 
                 <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
@@ -853,7 +855,7 @@ function addOutcomeTest() {
                 for (var i = allObjectives.length - 1; i > 0; i--) {
                     deleteObjective('assoc_objectiveForm_' + objectiveGroup +'_'+i, 'assoc_closeObj_'+objectiveGroup+'_' + i.toString(), objectiveGroup);
                 }
- /*               for(var i=1; i<allObjectives.length; i++){
+             for(var i=1; i<allObjectives.length; i++){
                     addAssocObjective();
                     $('#assoc_objective_'+i.toString()).selectpicker('refresh');
                     if($("#assoc_objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
@@ -1239,7 +1241,7 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                         $('#assoc_objective_0').val(0);
                         $('#assoc_objective_0').selectpicker('refresh');
                     }
-                 
+                
                 }
 
                 for (var i = 1; i < json.objectives.length; i++) {

app/views/local/managers/admins/rubric_list.blade.php → app/views/local/managers/shared/rubric_list.blade.php

@@ -1,7 +1,14 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.admins._navigation')
+@if($role==1)
+@include('local.managers.admins._navigation')
+@elseif($role==2)
+@include('local.managers.sCoords._navigation')
+@elseif($role==3)
+@include('local.managers.pCoords._navigation')
+@endif
+   
 @stop
 
 @section('main')

app/views/local/managers/shared/rubrics.blade.php

@@ -1383,7 +1383,7 @@ $('.save').on('click', function(e)
                 htmlString += "<ol style='list-style-position: inside'>"
         
                 objectives = $(this).data('assoc-objectives');
-            objectives = objectives.split(',');
+            //objectives = objectives.split(',');
             htmlString += "<li>" +$(this).data('criterion-name');
             htmlString += "<br><h6>This criterion is associated with these objectives</h6>"
             htmlString +="<ul style='padding-left: 5%; list-style-position: inside'>"

app/views/local/managers/shared/view_formative.blade.php

@@ -43,8 +43,8 @@
         <div class="category" >
           <label for="school">School</label>
           <div class="select">
-            <select multiple class="selectpicker" name="school" id="school">
-              <option value="0" selected="selected">All</option>
+            <select  class="selectpicker" name="school" id="school">
+              
               @foreach ($schools as $school)
                 <option value="{{$school->id}}">{{$school->name}}</option>
               @endforeach
@@ -54,8 +54,8 @@
         <div class="category" >
           <label for="program" >Academic Program</label>
           <div class="select">
-            <select multiple class="selectpicker" name="program" id="program">
-              <option value="0" selected="selected">All</option>
+            <select class="selectpicker" name="program" id="program">
+              
               @foreach ($programs as $program)
                 <option value="{{$program->id}}">{{$program->name}}</option>
               @endforeach
@@ -65,8 +65,8 @@
         <div class="category" >
             <label for="semesters">Semester</label>
             <div class="select">
-              <select multiple class="selectpicker" name="semesters" id="semesters">
-                <option value="0" selected="selected">All</option>
+              <select class="selectpicker" name="semesters" id="semesters">
+                
                 @foreach ($semesters as $semester)
                   <option value="{{$semester->id}}">{{$semester->name}}</option>
                 @endforeach

app/views/local/professors/_navigation.blade.php

@@ -27,7 +27,7 @@
       </li>
       @endif
       <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
-      <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReports', 'Reports') }}</li>
+      <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Reports') }}</li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">

app/views/local/professors/assessment.blade.php

@@ -249,7 +249,9 @@ $('#button-submit-assessment, #button-draft-assessment').on('click', function(e)
 
     $('input[name="weight[]"]').each(function (index){
         activity_criterion_id = $(this).data('activity-criterion-id');
-        weights[activity_criterion_id] = $(this).val();
+        weight = $(this).val();
+        
+        weights[activity_criterion_id] = weight;
     });
 
     // Iterate through all students

app/views/local/professors/new_assessment_report.blade.php

@@ -0,0 +1,311 @@
+@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>This report contains performance information for all your Program's assessed courses during the following semester(s):</p>
+            <ul>
+                @foreach (Session::get('semesters_info') as $semester_info)
+                    <li>{{ $semester_info }}</li>
+                @endforeach
+            </ul>
+
+          
+
+                
+                
+                       
+                                <!-- For each grouped course -->
+                                <ul id = "levelTabs" class="nav nav-tabs" role="tablist">
+                                        
+                                   
+                                @foreach($courses as $index2=>$course)
+                                <?php
+
+                                /*$sections_evaluating = Course::has('activities')
+                                ->whereNotNull('outcomes_attempted')
+                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                ->with(array('activities'=>function($query) use(&$outcome){
+                                    $query->whereNotNull('outcomes_attempted');
+                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                ->where('code', $course->code)->where('number',$course->number)
+                                ->whereIn('semester_id', Session::get('semesters_ids'))
+                                ->get();*/
+
+
+                                $sections_evaluating = Course::has('activities')
+                    
+                    //->whereNotNull('outcomes_attempted')
+                    //->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                    ->with(array('activities'=>function($query) use(&$course){
+                        $activities = DB::table('activities')
+                        ->join('activity_criterion', 'activity_criterion.activity_id', '=', 'activities.id')
+                        ->join('assessments', 'assessments.activity_criterion_id', '=','activity_criterion.id')
+                        //->join('criterion_objective_outcome', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+                        ->where('course_id', $course->id)
+                        //->where('criterion_objective_outcome.outcome_id', $outcome->id)
+                        ->select('activity_id')
+                        ->lists('activity_id');
+
+                        //$query->whereNotNull('outcomes_attempted');
+                        //$query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');
+                    $query->whereIn('id', $activities);
+                } ))
+                        
+
+                    ->where('code', $course->code)->where('number',$course->number)
+                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                    ->get();
+                    
+                    
+                            ?>
+                            @if($sections_evaluating)
+                                   <li role= "presentation">
+                                        <a onclick = "$(this).tab('show')" data-toggle = "tab" href ="#{{ $course->code}}-{{ $course->number }}"
+                                            role ="tab">{{ $course->code}}-{{ $course->number }}</a>
+                                        </li>
+
+                            @section('lists')
+                            <div role = "tabpanel" class = 'tab-pane' id = "{{$course->code}}-{{$course->number}}">
+                                @foreach($sections_evaluating as $index3 => $section)
+                                <h3 style="text-align: center"> Course: {{$course->code}} {{$course->number}}-{{$section->section}}</h3> 
+                                <?php
+                                Log::info($section->publishedActivities);
+                                ?>
+                                @foreach($section->publishedActivities as $index4 => $activity)
+
+                                <h5 style="display: inline;">Activity {{$index4+1}}: </h4>
+                                <p style="display: inline;">{{$activity->name}} <strong>({{$activity->date}})</strong></p>
+                                <br>
+                                <br>
+                                <h5 style="display: inline;">Performance Indicators: </h4>
+                                    <?php
+                                    Log::info($activity->rubric[0]);
+                                    ?>
+                                <p style="display: inline;"><i>{{$activity->rubric[0]->num_scales}} (
+                                <?php
+                                    $titles = $activity->rubric[0]->getTitles();
+                                    ?>
+                                @if(sizeof($titles) != 1)
+                                    @foreach ($titles as $index5=>$rubric_title)
+                                        @if($index5!= ($activity->rubric[0]->num_scales)-1 )
+                                            {{$rubric_title->text}},
+                                        @else
+                                            and {{$rubric_title->text}}
+                                        @endif
+                                            
+                                    @endforeach
+                                )
+                                @else
+                                    {{$titles[0]->text}} )
+                                @endif
+                                </i></p>
+                                <br>
+                                <h5 style="display: inline;">Scale: </h4>
+                                @if($activity->rubric[0]->max_score == 1)
+
+                               <p style="display: inline;">1 point scale</p>
+                                @else
+                                <p style="display: inline;">1-{{$activity->rubric[0]->max_score}} point scale</p>
+
+                                @endif
+                                <br>
+                                <br>
+                                <h4>Perfomance by Learning Outcome Criteria</h4>
+                                <h5 style = "display: inline; margin:30px;">Target by criterion: </h5>
+                                <p  style = "display: inline;"> <i>{{$activity->rubric[0]->expected_points}} or more</i>
+                                </p>
+                                <br>
+                                <h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by criterion: </h5>
+                                <p  style = "display: inline;"> <i>{{$activity->rubric[0]->expected_percentage}} %</i>
+                                </p>
+                                <br>
+
+                                <table class='table table-striped table-condensed datatable'>
+                                <thead>
+                                    <tr>
+                                        <th>
+                                            Criterion
+                                        </th>
+                                        <th>
+                                            Number of Students Assessed
+                                        </th>
+                                        <th>
+                                            Number of students that achieved the target
+                                        </th>
+                                        <th>
+                                            %
+                                        </th>
+                                        <th>
+                                            Outcomes
+                                        </th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($activity->allActivityCriterionInfo() as $index5=>$ac_criterion)
+                                    <tr>
+                                        <td> {{$ac_criterion->name}}</td>
+                                        <td>{{Criterion::students_attempted($ac_criterion->criterion_id, $activity->id)}}
+                                        </td>
+                                        <td>
+                                        {{Criterion::students_achieved($ac_criterion->criterion_id, $activity->id)}}
+
+                                        </td>
+                                        <?php
+
+                                        $out_att = Criterion::students_attempted($ac_criterion->criterion_id, $activity->id);
+                                        $out_ach = Criterion::students_achieved($ac_criterion->criterion_id, $activity->id);
+                                        
+                                        $percentage = "N/A";
+                                        $activity->getOutcomeReport();
+                                        
+
+                                        ?>
+                                        
+                                            @if($out_att==0)
+                                            <td class="col-md-1 danger">{{ $percentage }}</td>
+
+                                            @else
+                                            <?php
+                                            $percentage = round(($out_ach/$out_att)*100, 2)
+                                            ?>
+                                                @if ($percentage>=$activity->rubric[0]->expected_percentage)
+                                                <td class="col-md-1 success">{{ $percentage }}%</td>
+                                                                 
+                                                @else
+                                                <td class="col-md-1 danger">{{ $percentage }}%</td>
+                                                      
+                                                @endif
+
+
+
+                                           @endif
+
+
+                                        
+                                        <td>
+                                            
+                                            
+                                            @foreach(Criterion::outcomes($ac_criterion->criterion_id) as $index6=>$outcome)
+                                            
+                                             {{$index6 + 1}}.   {{$outcome->name}}
+                                             <br>
+                                            
+
+                                            @endforeach
+                                            
+                                            
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            
+                                </table>
+                                <hr>
+                                <br>
+
+                                <h4>Perfomance by Learning Outcome Student</h4>
+                                <h5 style = "display: inline; margin:30px;">Target by outcome: </h5>
+                                <p  style = "display: inline;"> <i>>= 66.67% of the attempts</i>
+                                </p>
+                                <br>
+                                <h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by outcome: </h5>
+                                <p  style = "display: inline;"> <i>TODO 75.00 %</i>
+                                </p>
+                                <br>
+                                <table class='table table-striped table-condensed datatable'>
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                Outcome
+                                            </th>
+                                            <th>
+                                                Number of Students Assessed
+                                            </th>
+                                            <th>
+                                                Number of students that achieved the target
+                                            </th>
+                                            <th>
+                                                %
+                                            </th>
+                                            
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach($activity->getOutcomeReport() as $outcome)
+                                        <tr>
+                                            <td>
+                                                {{$outcome->name}}
+                                            </td>
+                                            <td>
+                                                {{$outcome->attempted}}
+                                            </td>
+                                            <td>
+                                                {{$outcome->achieved}}
+                                            </td>
+                                            @if($outcome->percentage>= 75)
+                                                <td class="col-md-1 success">{{ $outcome->percentage }}%</td>
+                                                                 
+                                                @else
+                                                <td class="col-md-1 danger">{{ $outcome->percentage }}%</td>
+                                                      
+                                                @endif
+
+
+
+                                           
+
+                                        </tr>
+
+                                        @endforeach
+                                    </tbody>
+                                </table>
+
+                                <br>
+                                <hr>
+
+
+
+
+
+                                
+                                @endforeach
+                                @endforeach
+                            @stop
+
+                            @else
+                                <h4>There is no assessment for this course.</h4>
+
+                            @endif
+
+                                        @endforeach
+                                        <ul>
+                                    <div id="allLists" class="tab-content">
+                                    @yield('lists')
+                                    </div>
+
+            
+
+
+                                        
+        </div>
+    </div>
+@stop
+
+@section('javascript')
+
+
+
+@stop