Cambiar uso de program coordinator pal 2.

app/controllers/CriteriaController.php

@@ -15,6 +15,8 @@ class CriteriaController extends \BaseController
     {
         $userProgram = Auth::user()['id'];
 
+
+
         $userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
         Log::info($userProgram);
         $title = "Criteria";
@@ -77,7 +79,7 @@ class CriteriaController extends \BaseController
 
         return json_encode($json_to_send);
     }
-    
+
     public function fetchCriterion()
     {
         $json_to_send = array();
@@ -620,16 +622,43 @@ class CriteriaController extends \BaseController
         $title = "Criteria";
         $outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
 
-        $schools = School::orderBy('name', 'ASC')->get();
-        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
-        $programs = Program::orderBy('name', 'ASC')->get();
-        $objectives = DB::table('objectives')->orderBy('text', 'ASC')->lists('text', 'id');
+        //$schools = School::orderBy('name', 'ASC')->get();
+        // $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+
+
+        // $objectives = DB::table('objectives')->orderBy('text', 'ASC')->lists('text', 'id');
+
+        $role = Auth::user()->role;
+
+        switch ($role) {
+            case 1:
+                $program_ids = DB::table('programs')->lists('id');
+                break;
+            case 2:
+                $program_ids = DB::table('programs')
+                    ->where('school_id', Auth::user()->school_id)
+                    ->lists('id');
+                break;
+            case 3:
+                $program_ids = DB::table('program_user')
+                    ->where('user_id', Auth::user()->id)
+                    ->lists('program_id');
+                break;
+        }
+        //Log::info($userProgram);
+        $title = "Criteria";
+        $outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
+
+        //$criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+        $programs = Program::whereIn("id", $program_ids)->get();
+        return View::make('local.managers.shared.criteria', compact('title', 'outcomes', 'programs', 'objectives'));
+
 
 
 
 
 
-        return View::make('local.managers.admins.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+        // return View::make('local.managers.shared.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
     private function cleanInputEdit()
@@ -1072,4 +1101,4 @@ class CriteriaController extends \BaseController
                 break;
         }
     }
-}
+}

app/controllers/Objective2Controller.php

@@ -313,10 +313,36 @@ class Objective2Controller extends \BaseController
 		$title = "Objective";
 		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 
-		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
-		$programs = Program::orderBy('name', 'ASC')->get();
+		$role = Auth::user()->role;
 
-		return View::make('local.managers.admins.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
+		switch ($role) {
+			case 1:
+				$program_ids = DB::table("programs")
+					->lists('id');
+				break;
+
+			case 2:
+				$program_ids = DB::table('programs')
+					->where('school_id', Auth::user()->school_id)
+					->lists('id');
+
+				break;
+			case 3:
+				$program_ids = DB::table('program_user')
+					->where('user_id', Auth::user()->id)
+					->lists('program_id');
+
+
+				break;
+		}
+		$objectives_from_program = DB::table('objective_program')
+			->where('program_id', $program_ids)
+			->where('objective_program.objective_id', "<>", 0)
+			->lists('objective_id');
+		$objectives = Objective::withTrashed()->whereIn('id', $objectives_from_program)->orderBy('text', 'ASC')->get();
+		$programs = Program::whereIn('id', $program_ids)->orderBy('name', 'ASC')->get();
+
+		return View::make('local.managers.shared.objectives', compact('title', 'outcomes', 'objectives', 'programs'));
 	}
 
 	public function editProgram()
@@ -330,6 +356,7 @@ class Objective2Controller extends \BaseController
 		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 		$objectives_from_program = DB::table('objective_program')
 			->where('program_id', $userProgram[0]->program_id)
+			->where('objective_program.objective_id', "<>", 0)
 			->lists('objective_id');
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->whereIn('id', $objectives_from_program)->get();
 
@@ -377,7 +404,7 @@ class Objective2Controller extends \BaseController
 		$clean_input = $this->cleanAssocInput();
 
 
-		Log::info(print_r($clean_input, true));
+		//Log::info(print_r($clean_input, true));
 
 		/** Validation rules */
 		$validator = $this->makeValidator($clean_input);

app/controllers/OutcomesController.php

@@ -406,8 +406,8 @@ class OutcomesController extends \BaseController
 
     public function fetchCriteria()
     {
-// 		var_dump((Input::get('filter')));
-// 		exit();
+        // 		var_dump((Input::get('filter')));
+        // 		exit();
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':
@@ -777,7 +777,7 @@ class OutcomesController extends \BaseController
     public function assessmentReport()
     {
         //$outcome = Outcome::find($outcome_id);
-
+        set_time_limit(0);
         //if (!$outcome)
         //    App::abort('404');
         $title = "Campus Assessment Report "; //. $outcome->name;
@@ -935,7 +935,7 @@ class OutcomesController extends \BaseController
         //    App::abort('404');
         $title = "School Assessment Reports";
 
-
+        set_time_limit(0);
         $school = School::where('id', Auth::user()->school_id)
             ->has('courses')
             ->with(array('programs' => function ($query) {
@@ -972,7 +972,7 @@ class OutcomesController extends \BaseController
         //    App::abort('404');
         $title = "Program Courses Report";
 
-
+        set_time_limit(0);
         $program = Program::where('id', $program_id)
             ->has('courses')
             ->with(array('courses' => function ($query) {
@@ -1020,6 +1020,7 @@ class OutcomesController extends \BaseController
         //$outcome = Outcome::find($outcome_id);
 
         //if (!$outcome)
+        set_time_limit(0);
         //    App::abort('404');
         $title = "My Courses' Assessment Report";
         //$activity_criterion = DB::table('assessments')->lists('activity_criterion_id');

app/controllers/TemplatesController.php

@@ -62,23 +62,23 @@ class TemplatesController extends \BaseController
 				break;
 			case 3:
 			case 4:
-				$program_id = DB::table("program_user")
+				$program_ids = DB::table("program_user")
 					->where('user_id', Auth::user()->id)
-					->lists('program_id')[0];
-				$school_id = DB::table('programs')
-					->where('id', $program_id)
-					->lists('school_id')[0];
+					->lists('program_id');
+				$school_ids = DB::table('programs')
+					->whereIn('id', $program_ids)
+					->lists('school_id');
 
 
 				$templates = Template::orderBy('name')
 					->whereNull("school_id")
-					->orWhere(function ($query) use (&$school_id) {
-						$query->where('school_id', $school_id)
+					->orWhere(function ($query) use (&$school_ids) {
+						$query->whereIn('school_id', $school_ids)
 							->whereNull('program_id');
 					})
-					->orWhere(function ($query) use (&$program_id, &$school_id) {
-						$query->where('school_id', $school_id)
-							->where('program_id', $program_id);
+					->orWhere(function ($query) use (&$program_ids, &$school_ids) {
+						$query->where('school_id', $school_ids)
+							->where('program_id', $program_ids);
 					})
 
 					->get();
@@ -200,49 +200,44 @@ class TemplatesController extends \BaseController
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
 			$criteria = Criterion::orderBy('name', 'ASC')->get();
-		} 
-		else
-		{
+		} else {
 			if ($role == 2) {
 				$programs = Auth::user()->school->programs;
-			} 
+			}
 			if ($role == 3) {
 				$programs = Auth::user()->programs()->get();
 			}
-			$program_ids=array();		
-			foreach($programs as $program)
-			{
-				$program_ids[]=$program->id;
-			}
-			$criteria = Criterion::whereHas('programs', function ($q) use ($program_ids)
-			{
-				$q->whereIn('program_id', $program_ids );
+			$program_ids = array();
+			foreach ($programs as $program) {
+				$program_ids[] = $program->id;
 			}
+			$criteria = Criterion::whereHas(
+				'programs',
+				function ($q) use ($program_ids) {
+					$q->whereIn('program_id', $program_ids);
+				}
 			)->orderBy('name', 'ASC')->get();
 			$templates = Template::where('school_id', '=', Auth::user()->programs[0]->school->id)->orWhere('school_id', '=', NULL)
-			->orderBy('name', 'ASC')->get();
-			$criteria_ids=array();		
-			foreach($criteria as $criterion)
-			{
-				$criteria_ids[]=$criterion->id;
+				->orderBy('name', 'ASC')->get();
+			$criteria_ids = array();
+			foreach ($criteria as $criterion) {
+				$criteria_ids[] = $criterion->id;
 			}
-			$templates_fuera = Template::whereHas('criteria', function ($q) use ($criteria_ids)
-			{
-				$q->whereNotIn('criterion_id', $criteria_ids );
+			$templates_fuera = Template::whereHas('criteria', function ($q) use ($criteria_ids) {
+				$q->whereNotIn('criterion_id', $criteria_ids);
 			})
-			->orderBy('name', 'ASC')->get();
-			$templates_fuera_ids=array();		
-			foreach($templates_fuera as $tf)
-			{
-				$templates_fuera_ids[]=$tf->id;
+				->orderBy('name', 'ASC')->get();
+			$templates_fuera_ids = array();
+			foreach ($templates_fuera as $tf) {
+				$templates_fuera_ids[] = $tf->id;
 			}
 			$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
-			->orderBy('name', 'ASC')->get();
-			
-	// 			var_dump(json_encode($templates_dentro));
-		}		
-	
-	
+				->orderBy('name', 'ASC')->get();
+
+			// 			var_dump(json_encode($templates_dentro));
+		}
+
+
 
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));
 	}
@@ -287,7 +282,7 @@ class TemplatesController extends \BaseController
 			case 2:
 				$template->school_id = Auth::user()->school->id;
 				break;
-
+				//TODO esto yo no lo hice
 			case 3:
 				$template->school_id = Auth::user()->programs[0]->school->id;
 				$template->program_id = Auth::user()->programs[0]->id;
@@ -378,8 +373,8 @@ class TemplatesController extends \BaseController
 			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
 			->where("template_criterion.template_id", '=', Input::get('id'))
 			->get();
-				Log::info(json_encode($template_info['criterion']));
-// 				Log::info(($temp_crit->program_ids));
+		Log::info(json_encode($template_info['criterion']));
+		// 				Log::info(($temp_crit->program_ids));
 		foreach ($template_info['criterion'] as $temp_crit) {
 			$temp_crit->scales = DB::table('scales')
 				->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
@@ -390,9 +385,9 @@ class TemplatesController extends \BaseController
 			$temp_crit->program_ids = json_encode(DB::table('program_criterion')
 				->where('criterion_id', $temp_crit->id)
 				->lists('program_id'));
-				
-						Log::info("ee".json_encode($temp_crit->program_ids));
-		
+
+			Log::info("ee" . json_encode($temp_crit->program_ids));
+
 			$temp_crit->objectives = DB::table('criterion_objective_outcome')
 				->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
 				->where('criterion_id', $temp_crit->id)
@@ -409,7 +404,7 @@ class TemplatesController extends \BaseController
 			$outcomeStr = rtrim($outcomeStr, ',');
 			$temp_crit->outcomes = $outcomeStr;
 		}
-		Log::info("ee2".json_encode($template_info));
+		Log::info("ee2" . json_encode($template_info));
 
 		$template_info['titles'] = DB::table('titles')
 			->join('template_title', 'template_title.title_id', '=', 'titles.id')
@@ -417,7 +412,7 @@ class TemplatesController extends \BaseController
 			->orderBy('position')
 			->get();
 
-// 		Log::info(json_encode($template_info));
+		// 		Log::info(json_encode($template_info));
 
 		return json_encode($template_info);
 	}
@@ -606,4 +601,4 @@ class TemplatesController extends \BaseController
 			return Redirect::back();
 		}
 	}
-}
+}

app/controllers/TransformativeActionsController.php

@@ -867,9 +867,8 @@ class TransformativeActionsController extends \BaseController
       case 3:
         $program_id = DB::table('program_user')
           ->where('user_id', $user_id)
-          ->select('program_id')
-          ->get();
-        $program_id = $program_id[0]->program_id;
+          ->lists('program_id');
+
         break;
     }
 

app/database/migrations/2022_03_16_150810_create_paths_for_annual_plan.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePathsForAnnualPlan extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('paths_for_annual_plans', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string("path_to_pdf");
+			$table->integer('annual_plan_id')->unsigned();
+			$table->boolean("last");
+			$table->foreign('annual_plan_id')
+				->references('id')
+				->on('annual_plans')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('paths_for_annual_plans');
+	}
+}

app/models/Course.php

@@ -274,13 +274,13 @@ class Course extends Eloquent
         ->addSelect(DB::raw('count(assessments.activity_criterion_id) as criteria_attempted'))
         ->groupBy('criteria.id');
 
-      /* Log::info($table_per_criterion->toSql());
+      /*Log::info($table_per_criterion->toSql());
       Log::info(array($course_code));
       Log::info($program_ids);
-      Log::info($criteria_id);*/
+      Log::info($criteria_id);
       Log::info('mera 1');
       Log::info(array($course_code));
-      Log::info($table_per_criterion->get());
+      Log::info($table_per_criterion->get()); */
       return $table_per_criterion->get();
     }
   }

app/routes.php

@@ -415,8 +415,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         // Gabriel added this, so the school coordinator can add criterias and objectives
         Route::post('createCriterion', array('before' => 'csrf', 'uses' => 'CriteriaController@create'));
-        Route::get('school-objective', 'Objective2Controller@editSchool');
-        Route::get('school-criteria', 'CriteriaController@editSchool');
+        Route::get('school-objective', 'Objective2Controller@edit');
+        Route::get('school-criteria', 'CriteriaController@edit');
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
 
         //Show users annual plan
@@ -473,9 +473,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
 
         //Criteria and objectives
-        Route::get('program-criteria', 'CriteriaController@editProgram');
+        Route::get('program-criteria', 'CriteriaController@edit');
         Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
-        Route::get('program-objective', 'Objective2Controller@editProgram');
+        Route::get('program-objective', 'Objective2Controller@edit');
 
         // Print program report
         Route::get('print_program/{id}', 'ProgramsController@print_program');

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

@@ -13,7 +13,7 @@
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives') }}</li>
                     <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
                     <li>{{ HTML::linkAction('OutcomesController@index', 'Learning Outcomes') }}</li>
-                    <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubric Builder') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Rubric Builder') }}</li>
                     <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
                     <li>{{ HTML::linkAction('SemestersController@edit', 'Semesters') }}</li>
                     <li>{{ HTML::linkAction('UsersController@index', 'Users') }}</li>

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

@@ -20,6 +20,7 @@
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
+            <?php set_time_limit(0);?>
             @foreach ($schools as $school)
                 <h3>{{ $school->name }}</h3>
                 <hr>
@@ -262,6 +263,7 @@
                                                 <strong>({{ $activity->date }})</strong>
                                             </p>
                                             <br>
+                                            <br>
 
                                             <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
@@ -498,6 +500,7 @@
                                                 <strong>({{ $activity->date }})</strong>
                                             </p>
                                             <br>
+                                            <br>
 
                                             <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>

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

@@ -9,22 +9,22 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
                     aria-expanded="false">Management<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Rubrics') }}</li>
                     <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
 
-                    <li>{{ HTML::linkAction('Objective2Controller@editProgram', 'Objectives') }}</li>
+                    <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives') }}</li>
 
-                    <li>{{ HTML::linkAction('CriteriaController@editProgram', 'Criteria') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
                     <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}
                     </li>
 
 
-                    <li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id) }}">Annual
+                    <!--<li><a href="{{ URL::action('AnnualPlansController@showPlan', Auth::user()->programs[0]->id) }}">Annual
                             Plan</a>
                     <li>
                     <li><a
                             href="{{ URL::action('ThreeYearPlanController@threeYearsReport', Auth::user()->programs[0]->id) }}">Three
-                            Years Plan</a></li>
+                            Years Plan</a></li>-->
                 </ul>
             </li>
 
@@ -68,6 +68,7 @@
 
 
             </li>
+
             <li><a href="{{ URL::action('OutcomesController@annualReport', Auth::user()->programs[0]->id) }}">Annual
                     Report</a></li>
 
@@ -75,6 +76,28 @@
 
         </ul>
         </li>
+        <li class='dropdown'>
+            <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual
+                Plans<span class="caret"></span></a>
+            <ul class='dropdown-menu' role='menu'>
+                @foreach (Auth::user()->programs as $program)
+                    <li><a
+                            href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
+                    </li>
+                @endforeach
+            </ul>
+        </li>
+        <li class='dropdown'>
+            <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
+                year Plans<span class="caret"></span></a>
+            <ul class='dropdown-menu' role='menu'>
+                @foreach (Auth::user()->programs as $program)
+                    <li><a
+                            href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
+                    </li>
+                @endforeach
+            </ul>
+        </li>
 
         <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span

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

@@ -23,7 +23,7 @@
 
             @if ($program)
 
-
+            <?php set_time_limit(0);?>
 
                 <ul id='levelTabs' class="nav nav-tabs" role="tablist">
                     <!-- For each grouped course -->
@@ -257,6 +257,7 @@
                                         <strong>({{ $activity->date }})</strong>
                                     </p>
                                     <br>
+                                    <br>
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>
@@ -503,6 +504,7 @@
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
                                 <br>
+                                <br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>

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

@@ -17,8 +17,8 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
                     aria-expanded="false">Management<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives') }}</li>
-                    <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
+                    <li>{{ HTML::linkAction('Objective2Controller@edit', 'Objectives') }}</li>
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Criteria') }}</li>
                     <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Rubrics') }}</li>
                     <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
 

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

@@ -6,9 +6,7 @@
 @section('main')
 
     <div class="row">
-        <div id="alert_placeholder">
-
-        </div>
+        
         <div class="col-md-6">
             <!-- Form to add a new criterion -->
             <div class="panel panel-default panel-button">
@@ -299,6 +297,8 @@
             
             $('.selectpicker').selectpicker('refresh');
         });
+
+        
         function fetchCriterionForEditing() {
             var id = $('#select-criterion').find(':selected').val();
 

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

@@ -20,7 +20,7 @@
                     <li>{{ $semester_info }}</li>
                 @endforeach
             </ul>
-
+            <?php set_time_limit(0);?>
             @if (!$school->programs->isEmpty())
                 <h3>Table of Contents</h3>
                 <ol id="table-of-contents" class="upper-roman">
@@ -275,6 +275,7 @@
                                             <strong>({{ $activity->date }})</strong>
                                         </p>
                                         <br>
+                                        <br>
                                         <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>
@@ -525,6 +526,7 @@
                                         <strong>({{ $activity->date }})</strong>
                                     </p>
                                     <br>
+                                    <br>
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>

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

@@ -54,7 +54,7 @@
                     <ul id="levelTabs" class="nav nav-tabs" role="tablist">
                         <li role="presentation" id='transformative_for_outcome'>
                             <a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab"
-                                aria-expanded="true">Transformative Actions</a>
+                                aria-expanded="true">Program Transformative Actions</a>
                         </li>
                     </ul>
                     <div id="allLists" class="tab-content">
@@ -212,7 +212,7 @@
 
         function draw_comment_section(typ_semester_outcome_id, outcome_comments) {
             $('#levelTabs').append('<li role = "presentation" id = "comments_for_outcome">' +
-                '<a data-toggle="tab" id="a_for_ta_outcome" href="#comments_outcome" role="tab" >Comments for Outcome</a>' +
+                '<a data-toggle="tab" id="a_for_ta_outcome" href="#comments_outcome" role="tab" >Comments</a>' +
                 '</li>');
             $('#allLists').append('<div role="tabpanel" class="tab-pane" data-typ-semester-outcome-id = "' +
                 typ_semester_outcome_id + '" id="comments_outcome"></div>');
@@ -372,12 +372,12 @@
             if (!transforming_actions.length) {
                 $("#transformative_for_outcome").hide();
             } else {
-                $('#levelTabs').prepend('<li role = "presentation" id = "transformative_for_outcome">' +
-                    '<a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab" >Transformative Actions to Outcome</a>' +
+                $('#levelTabs').append('<li role = "presentation" id = "transformative_for_outcome">' +
+                    '<a data-toggle="tab" id="a_for_ta_outcome" href="#transformative_actions" role="tab" >Program Transformative Actions</a>' +
                     '</li>');
-                $('#allLists').prepend('<div role="tabpanel" class="tab-pane" id="transformative_actions"></div>');
+                $('#allLists').append('<div role="tabpanel" class="tab-pane" id="transformative_actions"></div>');
 
-                $('#transformative_actions').html('<h3>Tranformative actions for Learning Outcome')
+                $('#transformative_actions').html('<h3>Program Transformative Actions </h3>')
                 $.each(transforming_actions, function(index, trans_action) {
                     div = $("<div>", {
                         'id': 'div_trans_id_' + trans_action.trans_id
@@ -946,11 +946,11 @@
                         }
                         GlobalTransCategories = outcome.transformative_actions_categories_html;
                         var outcomeHTML = "<h4>Performance of Students by Learning Outcome</h4>" +
-                            '<h5 style = "display: inline; margin:30px;">Target learning by learning outcome: </h5>' +
-                            '<p  style = "display: inline;"> <i>>= ' + outcome.expected_outcome +
-                            ' of the attempts</i>' + '</p>' +
+                            '<h5 style = "display: inline; margin:30px;">Target to achieve the learning outcome: </h5>' +
+                            '<p  style = "display: inline;"> <i> ' + outcome.expected_outcome +
+                            '% or more of the attempts </i>' + '</p>' +
                             '<br><h5 style = "display: inline; margin:30px;">Expected percent of students achieving the target by learning outcome: </h5>' +
-                            '<p  style = "display: inline;"> <i>' + outcome.outcome_program_goal + '</i></p>';
+                            '<p  style = "display: inline;"> <i>' + outcome.outcome_program_goal + '%</i></p>';
                         $('#outcomeInfo').html('<p class="outcome-definition">' + outcome.definition + '</p>' +
                             outcomeHTML);
                         //theStudentOutcomeTable = $("<table/>");
@@ -1179,11 +1179,11 @@
                         if (students_attempted) {
                             studentPercentage = ((students_achieved / students_attempted) * 100).toFixed(2);
                             if (parseFloat(studentPercentage) >= parseFloat(outcome.outcome_program_goal)) {
-                                FinalReport = "<br><p><strong>The students achieved the Learning Outcome with " +
-                                    studentPercentage + "% of students achieving.</strong></p>";
+                                FinalReport = "<p style = 'margin: 30px; '><strong>Results for " + outcome.name+": </strong><em style = 'color: green'>" +
+                                    studentPercentage + "% </em></p>";
                             } else {
-                                FinalReport = "<br><p><strong>The students did not achieve the Learning Outcome with " +
-                                    studentPercentage + "% of students achieving.</strong></p>";
+                                FinalReport = "<p style = 'margin: 30px'><strong>Results for " +outcome.name+": </strong><em style = 'color: red'>"+
+                                    studentPercentage + "% </em></p>";
 
                             }
                         }

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

@@ -1,7 +1,15 @@
 @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')
 
@@ -24,9 +32,10 @@
                             </div>
 
                             <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
-                                <div class="form-group col-md-11  selectObjective">
+                                <div class="form-group col-md-11 selectObjective">
                                     <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>
@@ -43,10 +52,12 @@
                             </button>
 
                             <br>
-                        </div>
+                        
                         <hr>
                     </div>
 
+</div>
+
                     <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
 
                     <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
@@ -60,16 +71,23 @@
                     <div class="form-group form_validation program_form" id='program-checkboxes'>
                         {{ Form::label('program_id', 'Associated Program') }}<br>
                         <br>
-
-
+                        @if(count($programs) ==1)
+                        <input type="checkbox" id="program-{{ $programs[0]->name }}" name="program_id[]"
+                        value="{{ $programs[0]->id }}"  checked>
+                    <label for="program-{{ $programs[0]->name }}"> {{ $programs[0]->name }}
+                        [{{ $programs[0]->school->name }}]</label><br>
                         <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]"
                             value="{{ $programs[0]->id }}">
-                        <input type="checkbox" id="{{ $programs[0]->name }}" name="program_id[]"
-                            value="{{ $programs[0]->id }}" disabled checked>
-                        <label for="{{ $programs[0]->name }}"> {{ $programs[0]->name }}
-                            [{{ $programs[0]->school->name }}]</label><br>
-
+    
+                        @else
+                  @foreach ($programs as $program)
+                         <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
 
+                    @endif
                     </div>
 
                     <div class="form-group form_validation name_form">
@@ -133,8 +151,10 @@
                             <select id='select-program' class="form-control selectpicker"
                                 onchange='fetchAllCriterion("select-program", "assoc_outcomes_fetch")'>
 
-                                <option value='{{ $programs[0]->id }}' data-subtext="{{ $programs[0]->code }}">
-                                    {{ $programs[0]->name }}</option>
+                                @foreach ($programs as $program)
+                                    <option value='{{ $program->id }}' data-subtext="{{ $program->code }}">
+                                        {{ $program->name }}</option>
+                                @endforeach
 
                             </select>
                         </div>
@@ -150,18 +170,7 @@
                         {{ Form::label('criterion_id', 'Criterion') }}
                         <select id="select-criterion" name="id" class="form-control selectpicker"
                             onchange='fetchCriterionForEditing()'>
-                            @foreach ($criteria as $criterion)
-                                <option value="{{ $criterion->id }}" data-subtext="
-                                                  @if ($criterion->program)
-                                    &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
-                            @endif
-                            ">
-                            {{ $criterion->name }}
-
-
-
-                            </option>
-                            @endforeach
+                          
                         </select>
                     </div>
                     <div id='allAssocOutcomes' class='form_validation outcome_form'>
@@ -176,7 +185,7 @@
                                 <div class="form-group col-md-11 selectObjective">
                                     <label>Associated Objectives for Outcome 1</label>
                                     <select id="assoc_objective_0_counter_1" name="objective[]"
-                                        class="form-control selectpicker">
+                                        class="form-control selectpicker" onchange="visiblePrograms('allAssocOutcomes')">
                                         <option value="0">No associated objectives</option>
                                     </select>
 
@@ -192,9 +201,10 @@
                                 </span>
                                 Add another Objective
                             </button>
-                        </div>
+                        
                         <hr>
                     </div>
+                </div>
                     <button class='btn btn-md btn-secondary button-add-outcome-assoc' onclick='addAssocOutcome()'>
                         <span class='glyphicon glyphicon-plus'>
 
@@ -206,18 +216,32 @@
 
 
                     <!-- Associated Program -->
-                    <div class="form-group form_validation program_form"">
+                    <div class="form-group form_validation program_form" id = 'assoc-program-checkboxes'>
 
                             {{ Form::label('program_id2', 'Associated Program') }}<br><br>
 
+                            @if(count($programs) ==1)
+                           
                             <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]"
-                        value="{{ $programs[0]->id }}">
+                            value="{{ $programs[0]->id }}">
+    
+                            <input type="checkbox" id="assoc_program-{{ $programs[0]->id }}" name="program_id[]"
+                                value="{{ $programs[0]->id }}"  checked>
+                            <label for="assoc_program-{{ $programs[0]->id }}"> {{ $programs[0]->name }}
+                                <sub>[{{ $programs[0]->school->name }}]</sub></label><br>
+    
+                        @else
+                  @foreach ($programs as $program)
+                         <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
 
-                        <input type="checkbox" id="assoc_program_id_{{ $programs[0]->id }}" name="program_id[]"
-                            value="{{ $programs[0]->id }}" disabled checked>
-                        <label for="assoc_program_id_{{ $programs[0]->id }}"> {{ $programs[0]->name }}
-                            <sub>[{{ $programs[0]->school->name }}]</sub></label><br>
+                    @endif
 
+                            
                     </div>
 
 
@@ -605,13 +629,16 @@
 
 
                     */
+                            visiblePrograms('allAssocOutcomes');
 
-
-
-                    // Select status
-
-
-
+                    var program_length = criterion.program.length;
+                    
+                        $('input[type=checkbox]').prop('checked', false);
+                        for (var i = 0; i < program_length; i++) {
+                        $('#assoc_program-' + criterion.program[i].program_id).prop("checked", true);
+                    }
+                    
+                  
 
 
 
@@ -879,6 +906,98 @@
 
         })*/
 
+        visibleProgram = {};
+        visibleProgram["allAssocOutcomes"] = {}
+        visibleProgram["allOutcomes"] = {}
+
+        function visiblePrograms(allOutcomesDiv) {
+            checkedPrograms = {}
+            $('#' + allOutcomesDiv).parent().find('input:checkbox').each(function(index) {
+
+                id = $(this).attr('id');
+                if ($(this).is(':checked')) {
+                    checkedPrograms[$(this).attr('id')] = 1;
+                    $(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) {
+
+                    //program_ids in objective
+                    var the_programs = $(this).find(':selected').data('program-ids');
+                    if (!the_programs) return;
+
+
+                    for (index in the_programs) {
+                        program_id = the_programs[index];
+
+                        //if the program_id is inside the visibleProgram scope
+                        //and the checkbox isnt alread present
+
+                        if (program_id in visibleProgram[allOutcomesDiv] &&
+                            !($('#program-checkboxes').find('#' + visibleProgram[allOutcomesDiv][program_id][
+                                'checkbox'
+                            ].attr('id')).val())) {
+                            //if it was checked, check it again
+                            id = visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id');
+                            if (checkedPrograms[id]) {
+                                visibleProgram[allOutcomesDiv][program_id]['checkbox'].prop('checked', true);
+                            }
+                            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())) {
+
+                            id = visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id');
+                            if (checkedPrograms[id]) {
+                                visibleProgram[allOutcomesDiv][program_id]['checkbox'].prop('checked', true);
+
+                            }
+                            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) {
 
@@ -1138,14 +1257,14 @@
 
         }
         //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);
 
 
         }
@@ -1162,6 +1281,7 @@
                 'name': "objective[]",
                 'data-live-search': 'true',
                 'id': originalObjective + '_counter_' + (assocObjectiveCounter + 1).toString(),
+                'onchange': "visiblePrograms('allAssocOutcomes')"
 
 
             });
@@ -1208,7 +1328,8 @@
                 '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(),
@@ -1271,7 +1392,7 @@
                 '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/>', {
@@ -1291,7 +1412,8 @@
                 '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/>', {
@@ -1554,7 +1676,7 @@
 
 
     fetchAllCriterion("select-program", "assoc_outcomes_fetch");
-
+    visiblePrograms('allOutcomes');
     // --------------------------------------------------------------------------
     // Functions
     // --------------------------------------------------------------------------

app/views/local/managers/pCoords/objectives.blade.php → app/views/local/managers/shared/objectives.blade.php

@@ -1,7 +1,13 @@
 @extends('layouts.master')
 
 @section('navigation')
-    @include('local.managers.pCoords._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">
@@ -63,12 +69,13 @@
                         <br>
 
 
-                        <input type="hidden" id='assoc_program' name="program_id[]" value="{{ $programs[0]->id }}">
-                        <input type="checkbox" id="{{ $programs[0]->name }}" name="program_id[]"
-                            value="{{ $programs[0]->id }}" disabled checked>
-                        <label for="{{ $programs[0]->name }}"> {{ $programs[0]->name }}
-                            [{{ $programs[0]->school->name }}]</label><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
 
                     </div>
 
@@ -196,16 +203,13 @@
                         <br>
 
 
-                        <input type="hidden" id='assoc_program_id_{{ $programs[0]->id }}' name="assoc_program_id[]"
-                            value="{{ $programs[0]->id }}">
-
-                        <input type="checkbox" id="{{ $programs[0]->name }}"
-                            id="assoc_program_id_{{ $programs[0]->id }}" name="program_id[]"
-                            value="{{ $programs[0]->id }}" disabled checked>
-                        <label for="{{ $programs[0]->name }}"> {{ $programs[0]->name }}
-                            [{{ $programs[0]->school->name }}]</label><br>
-
+                        @foreach ($programs as $program)
 
+                        <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="assoc_program_id[]"
+                            value="{{ $program->id }}">
+                        <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }}
+                            <sub>[{{ $program->school->name }}]</sub></label><br>
+                    @endforeach
                     </div>
 
                     <!-- Status -->
@@ -318,7 +322,7 @@
         function addOutcomeTest() {
             var $select = $('<select/>', {
                 'class': "selectpicker form-control",
-                'name': "outcome[' + counter.toString() + ']",
+                'name': "outcome[" + counter.toString() + "]",
                 'data-live-search': 'true'
 
             });
@@ -342,9 +346,8 @@
             var $button = $('<button/>', {
                 'type': 'button',
                 'class': 'btn btn-primary',
-
                 //send the counter to the function so it can tell which container to remove
-                'onclick': 'deleteLast(' + counter.toString() + ')',
+                'onclick': 'deleteLast()',
 
             });
             $button.append('X');
@@ -362,7 +365,7 @@
         }
 
         //Recieves the counter variable so it can find the specific div and delete it
-        function deleteLast(counter) {
+        function deleteLast() {
             div = document.getElementById('outcomeContainer' + (counter).toString());
             div.remove();
         }
@@ -385,7 +388,7 @@
 
                     // Select associated outcome
                     for (var i = counterAssoc; i != 1; i--) {
-                        deleteLastAssoc(i);
+                        deleteLastAssoc();
 
                     }
                     $('#assoc_outcome0').val(json.outcome[0].outcome_id);
@@ -429,7 +432,13 @@
 
                     }
 
+                    var program_length = json.program.length;
+                    $('input[type=checkbox]').prop('checked', false);
 
+                    for (var i = 0; i < program_length; i++) {
+                        prog = json.program[i].program_id.toString();
+                        $('#assoc_program_id_' + prog).prop("checked", true);
+                    }
 
 
                     // Select status
@@ -571,7 +580,7 @@
 
             outcome_id = []
             program_id = [];
-            program_id.push($('#assoc_program').val());
+            
             status = $('#status').val();
             text = $('#objective-text').val();
             id = $('#select-objective').val();
@@ -579,7 +588,10 @@
             $('#assocOutcomeGroup').find('select').each(function() {
                 outcome_id.push($(this).val())
             })
-
+$('input[name="assoc_program_id[]"]').each(function() {
+                if (this.checked)
+                    program_id.push($(this).val())
+            });
             $.post(
                 "{{ URL::action('Objective2Controller@update') }}", {
                     assoc_outcome: outcome_id,

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

@@ -111,7 +111,7 @@
                     @endif
 
                     <!-- If user is admin or school coordinator, s/he can pick which programs -->
-                    @if(Auth::user()->role==1 || Auth::user()->role==2)
+                    @if(Auth::user()->role==1 || Auth::user()->role==2 || Auth::user()->role ==3)
                     <div class="form-group">
                         <label>Select the Program this rubric belongs to</label>
                         <select id="select-program" class="form-control selectpicker">

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

@@ -135,11 +135,13 @@
                     @endif
 
                     <!-- If user is admin or school coordinator, s/he can pick which programs -->
-                    @if(Auth::user()->role==1 || Auth::user()->role==2)
+                    @if(Auth::user()->role==1 || Auth::user()->role==2 || Auth::user()->role==3)
                     <div class="form-group">
                         <label>Select the Program this rubric belongs to</label>
                         <select id="select-program" class="form-control selectpicker">
+                            @if(Auth::user()->role != 3)
                             <option data-program-id="0">All</option>
+                            @endif
                             @foreach ($programs as $program)
                                 <option
                                     data-program-id="{{ $program->id }}"

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

@@ -28,7 +28,7 @@
             <!-- For each grouped course -->
             <ul id="levelTabs" class="nav nav-tabs" role="tablist">
 
-
+                <?php set_time_limit(0);?>
                 @foreach ($courses as $index2 => $course)
 
 
@@ -268,6 +268,8 @@
                                 <p style="display: inline;">{{ $activity->name }}
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
+                                <br>
+                                <br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>
@@ -524,6 +526,7 @@
                                 <p style="display: inline;">{{ $activity->name }}
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
+                                <br><br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>