Aqui va, objetivos y view annual plans

.gitignore

@@ -12,7 +12,7 @@ app/config/testing/*
 app/config/database.php
 app/config/*
 
-!app/config/app.php
+
 node_modules/
 vendor/*
 !vendor/barryvdh/

app/controllers/AnnualPlansController.php

@@ -985,12 +985,13 @@ class AnnualPlansController extends \BaseController
   {
 
     $annualPlan = AnnualPlan::findOrFail($annual_id);
+    $user_id = Auth::user()->id;
     $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
-    $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan', 'download'))
+    $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
       ->setOrientation("landscape")
 
       ->setPaper('legal', 'landscape');
-    $path = app_path() . '/storage/annual_pdfs/' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
+    $path = app_path() . '/storage/annual_pdfs/' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.pdf';
     $pdf->save($path);
     $name = date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
     $pdf->download($name);
@@ -1004,9 +1005,10 @@ class AnnualPlansController extends \BaseController
     if (isset($it_exists)) {
       return '200';
     }
-
+    //$user_id = Auth::user()->id;
     DB::table("paths_for_annual_plans")
       ->where('annual_plan_id', $annual_id)
+      ->where('user_id', $user_id)
       ->where('report', 1)
       ->update(array(
         'last' => 0
@@ -1017,12 +1019,84 @@ class AnnualPlansController extends \BaseController
       'annual_plan_id' => $annual_id,
       'last' => 1,
       'report' => 1,
+      'user_id' => $user_id,
+      'date_posted' => date('Y-m-d')
     ));
 
 
+
     return '200';
   }
 
+  public function annualPlansShow($annual_report_or_plan, $program_id)
+  {
+    $role = Auth::user()->role;
+    switch ($role) {
+      case 1:
+      case 2:
+      case 3:
+        $last = [1, 0];
+        break;
+
+      case 4:
+        $last = [1];
+
+        break;
+      default:
+        App::abort('404');
+    }
+
+    if ($annual_report_or_plan == "report") {
+      $report = 1;
+    } else if ($annual_report_or_plan == "plan") {
+      $report = 0;
+    } else {
+      App::abort('404');
+    }
+
+    $title = "Annual Plans for " . Program::findOrFail($program_id)->name;
+    $paths_with_users = DB::table('paths_for_annual_plans')
+      ->join('annual_plans', 'annual_plans.id', '=', 'paths_for_annual_plans.annual_plan_id')
+      ->join('annual_cycle', 'annual_cycle.id', '=', 'annual_plans.annual_cycle_id')
+      ->join('users', 'users.id', '=', 'paths_for_annual_plans.user_id')
+      ->where('report', $report)
+      ->whereIn('last', $last)
+      ->where('annual_plans.program_id', $program_id)
+      ->orderBy('date_posted', 'desc')
+      ->select('paths_for_annual_plans.path_to_pdf', 'users.*', 'date_posted', 'annual_cycle.*', 'paths_for_annual_plans.last', 'paths_for_annual_plans.id as path_id')
+      ->get();
+
+    return View::make('local.managers.shared.new_view_annual_plans', compact('paths_with_users', 'title', 'report', 'last', 'annual_report_or_plan', 'program_id'));
+  }
+
+  public function downloadPDF($download, $path_id)
+  {
+    $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
+
+    $queryToPath = DB::table('paths_for_annual_plans')
+      ->where('id', $path_id)
+      ->first();
+
+    Log::info("ERES TU? creo que no");
+
+    $annualPlan = AnnualPlan::findOrFail($queryToPath->annual_plan_id);
+
+    Log::info("ERES TU?");
+
+
+    $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
+      ->setOrientation("landscape")
+
+      ->setPaper('legal', 'landscape');
+    if ($download == "download")
+      return $pdf->download(basename($queryToPath->path_to_pdf));
+
+    else
+      return $pdf->stream(basename($queryToPath->path_to_pdf));
+  }
+
+
+
   public function checkIfPlanReady()
   {
     $annual_plan = AnnualPlan::findOrFail(Input::get("annual_id"));
@@ -1142,12 +1216,13 @@ class AnnualPlansController extends \BaseController
     $alphabet = range("A", "Z");
     $small_alphabet = range('a', 'z');
     $annualPlan = AnnualPlan::findOrFail($annual_id);
+    $user_id = Auth::user()->id;
     $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
     $pdf = $pdf->loadView('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet'))
       ->setOrientation("landscape")
 
       ->setPaper('legal', 'landscape');
-    $path = app_path() . '/storage/annual_pdfs/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
+    $path = app_path() . '/storage/annual_pdfs/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.pdf';
     $pdf->save($path);
     $name = "plan-on-" . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
     $pdf->download($name);
@@ -1165,6 +1240,8 @@ class AnnualPlansController extends \BaseController
     DB::table("paths_for_annual_plans")
       ->where('annual_plan_id', $annual_id)
       ->where('report', 0)
+      ->where('user_id', $user_id)
+
       ->update(array(
         'last' => 0
       ));
@@ -1174,6 +1251,8 @@ class AnnualPlansController extends \BaseController
       'annual_plan_id' => $annual_id,
       'last' => 1,
       'report' => 0,
+      'user_id' => $user_id,
+      'date_posted' => date('Y-m-d')
     ));
 
 

app/controllers/CriteriaController.php

@@ -259,8 +259,35 @@ class CriteriaController extends \BaseController
     }
 
     public function delete()
+
+
     {
-        DB::delete("delete from criteria where id = ?", array(Input::get('criterion_delete')));
+
+        Log::info(Input::all());
+        Log::info("LLEGAMOS??");
+        $number_of_rows = DB::delete("delete from criteria where id = ?", array(Input::get('criterion_delete')));
+
+        if ($number_of_rows <= 0) {
+            $message = '<p>Error deleting Criterion:</p><ul>';
+
+
+
+            $message .= '</ul>';
+
+            /** Send error message and old data */
+            Session::flash('status', 'danger');
+            Session::flash('message', $message);
+        } else {
+            $message = '<p>Criterion deleted!</p><ul>';
+
+
+
+            $message .= '</ul>';
+
+            /** Send error message and old data */
+            Session::flash('status', 'success');
+            Session::flash('message', $message);
+        }
         return Redirect::to('criteria')->withInput();
         $role = Auth::user()['role'];
         switch ($role) {

app/controllers/Objective2Controller.php

@@ -58,7 +58,7 @@ class Objective2Controller extends \BaseController
 
 			),
 			array(
-				'text' => 'required|string|unique:objectives',
+				'text' => 'required|string',
 
 				'outcome_id' => 'required|array',
 				'program_id' => 'required|array'
@@ -102,6 +102,7 @@ class Objective2Controller extends \BaseController
 
 
 		$clean_input['program_id'] = Input::get('program_id');
+		$clean_input['pair_criteria'] =  Input::get('pair_every_criteria_with_objective');
 
 
 		return $clean_input;
@@ -116,9 +117,37 @@ class Objective2Controller extends \BaseController
 		$json = array();
 
 		$json['program'] = DB::select("select program_id from objective_program where objective_id = ?", array(Input::get('id')));
-		$json['outcome'] = DB::select("select outcome_id from objective_outcome outc where outc.objective_id = ?", array(Input::get('id')));
+
+		//$json['outcome'] = DB::select("select outcome_id from objective_outcome outc where outc.objective_id = ?", array(Input::get('id')));
 		$json['objective'] = DB::select("select text, id from objectives where id =?", array(Input::get('id')));
 		$json['assessment'] = DB::select("select * from assessments where activity_criterion_id  in (select id from activity_criterion where criterion_id in (select criterion_id from criterion_objective_outcome where objective_id = ?))", array(Input::get('id')));
+		/*
+			select objective_outcome.*, typ_semester_outcome.id as typ_semester_outcome_id,count(criterion_id) from objectives join objective_outcome on objective_outcome.objective_id = objectives.id left join criterion_objective_outcome on criterion_objective_outcome.objective_id = objectives.id and objective_outcome.outcome_id = criterion_objective_outcome.outcome_id
+			 left join typ_semester_objectives on typ_semester_objectives.objective_id = objectives.id left join typ_semester_outcome on typ_semester_outcome.outcome_id = objective_outcome.outcome_id and typ_semester_outcome.id = typ_semester_objectives.typ_semester_outcome_id group by objectives.id, objective_outcome.outcome_id
+
+		*/
+		$json['outcome'] = DB::table('objective_outcome')
+
+			->leftJoin('criterion_objective_outcome', function ($j) {
+				$j->on('criterion_objective_outcome.objective_id', '=', 'objective_outcome.objective_id')
+					->on('criterion_objective_outcome.outcome_id', '=', 'objective_outcome.outcome_id');
+			})
+			->leftJoin('typ_semester_objectives', 'typ_semester_objectives.objective_id', '=', 'objective_outcome.objective_id')
+			->leftJoin('typ_semester_outcome', function ($j) {
+				$j->on('typ_semester_outcome.outcome_id', '=', 'objective_outcome.outcome_id')
+					->on('typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id');
+			})
+			->groupBy("objective_outcome.objective_id", 'objective_outcome.outcome_id')
+			->where('objective_outcome.objective_id', Input::get('id'))
+			->select(
+				'objective_outcome.*',
+				DB::raw("count(criterion_id) as count_criterion_id"),
+				'typ_semester_outcome.id as typ_semester_outcome_id'
+			)
+			->get();
+		$json['typ_semester_objectives'] = DB::table('typ_semester_objectives')
+			->where('objective_id', Input::get('id'))
+			->get();
 
 		$json['assoc_criteria'] = DB::select("select name from criteria where id in(select criterion_id from criterion_objective_outcome where objective_id =?)", array(Input::get('id')));
 		Log::info('is here');
@@ -464,16 +493,48 @@ class Objective2Controller extends \BaseController
 				//TODO
 
 				$objectiveId = $Objective->id;
-				DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
+				//DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
 				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
 
 				foreach ($clean_input['program_id'] as $program_id) {
 					DB::insert("insert into `objective_program`(objective_id, program_id) values ({$objectiveId},{$program_id})");
 				}
+				$criteria_assoc = DB::table('criterion_objective_outcome')
+					->join('program_criterion', 'program_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+					->whereIn('program_id', $clean_input['program_id'])
+					->where('objective_id', $objectiveId)
+					->groupBy('program_criterion.criterion_id')
+					->select('program_criterion.criterion_id')
+					->lists('program_criterion.criterion_id');
+
+				$criterion_array = [];
 				foreach ($clean_input['outcome_id'] as $outcome_id) {
-					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+					$check_if_already_inserted = DB::table('objective_outcome')
+						->where('objective_id', $objectiveId)
+						->where('outcome_id', $outcome_id)
+						->first();
+
+					if (!isset($check_if_already_inserted)) {
+						DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+						if ($clean_input['pair_criteria'] == '1') {
+							foreach ($criteria_assoc as $criterion_id) {
+
+								DB::table('criterion_objective_outcome')
+									->insert(array(
+										"criterion_id" => $criterion_id,
+										"objective_id" => $objectiveId,
+										"outcome_id" => $outcome_id
+									));
+							}
+						}
+					}
 				}
 
+				DB::table('objective_outcome')
+					->whereNotIn('outcome_id', $clean_input['outcome_id'])
+					->where('objective_id', $objectiveId)
+					->delete();
+
 				//Session::flash('status', 'success');
 				//Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');
 				$MessageArray = array('status' => 'success', 'message' => 'Updated Objective: "' . $Objective->text . '"');

app/controllers/TransformativeActionsController.php

@@ -1029,7 +1029,7 @@ class TransformativeActionsController extends \BaseController
       } else {
         $outcome_id = array($outcome_id);
       }
-
+      Log::info($course_id);
       // search TA with filters
       $filtered_at = DB::table('transformative_actions')
         ->join('ta_course', 'ta_course.ta_id', '=', 'transformative_actions.id')

app/database/migrations/2022_04_26_151616_add_date_to_paths_for_annual_plans.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class AddDateToPathsForAnnualPlans extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('paths_for_annual_plans', function (Blueprint $t) {
+			$t->date("date_posted");
+			$t->integer('user_id')->unsigned();
+			$t->foreign('user_id')
+				->references('id')
+				->on('users');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('paths_for_annual_plans', function (Blueprint $t) {
+			$t->dropColumn("date_posted");
+			$t->dropColumn("user_id");
+		});
+	}
+}

app/routes.php

@@ -181,6 +181,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         )
     );
 
+
     Route::post('postAnnualReport/{annual_id?}', 'AnnualPlansController@postAnnualReport');
     Route::get('printAnnualPlan/{annual_plan?}', 'AnnualPlansController@printAnnualPlan');
     Route::post('checkIfPlanReady', 'AnnualPlansController@checkIfPlanReady');
@@ -214,6 +215,11 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'AnnualPlansController@fetchAnnualReport'
     ));
 
+    //View annual plans and report
+
+    Route::get('{annual_report_or_plan}/show/{program_id}', "AnnualPlansController@annualPlansShow");
+    Route::get("downloadAnnualPDF/{download}/{path_id}", "AnnualPlansController@downloadPDF");
+
     //Route::post('submitAnnualPlan', array('uses' => 'AnnualPlansController@submitAnnualPlan'));
 
     Route::post('fetchTransformativeStatus', array('uses' => 'TransformativeActionsController@fetchStatus'));
@@ -222,6 +228,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     Route::post('futureTransformativeCourse', 'AnnualPlansController@futureTransformative');
     //other stuff
+    Route::post('deleteCriterion', 'CriteriaController@delete');
     Route::post('postActivityCriterionTrans/{activity_id}', array(
         'as' => 'postActivityCriterionTrans/{activity_id}',
         'uses' => 'TransformativeActionsController@postActivityCriterion'
@@ -270,10 +277,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'fetchAllCriterion',
         'uses' => 'CriteriaController@fetchAllCriterion'
     ));
-    Route::post('deleteCriterion', array(
-        'as' => 'deleteCriterion',
-        'uses' => 'CriteriaController@delete'
-    ));
+
 
     Route::get('viewFormative', array(
         'as' => 'viewFormative',
@@ -376,8 +380,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@updateMore'));
         Route::post('learning-outcomes/update', array('before' => 'csrf', 'uses' => 'OutcomesController@update'));
-        Route::post('crtiteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
-        Route::delete('crtiteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
+        Route::post('criteria/update', array('before' => 'csrf', 'uses' => 'CriteriaController@update'));
+        Route::delete('critteria/delete', array('before' => 'csrf', 'uses' => 'CriteriaController@destroy'));
 
         Route::get('administrator/users/{query?}', 'UsersController@index');
 

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

@@ -22,7 +22,7 @@
             <!-- <h3>Table of Contents</h3> -->
             <!-- <ol id="table-of-contents" class="upper-roman">
 
-                </ol> -->
+                    </ol> -->
 
 
             <h3 id="{{ $outcome->id }}" class="outcome">{{ $outcome->name }}</h3>
@@ -31,7 +31,7 @@
                     <tr class="center-text">
                         <th>School or College</th>
                         <th>Academic Program</th>
-                        <th>Assesses Outcome</th>
+                        <th>Assesses Learning Outcome</th>
                         <th>Findings</th>
                     </tr>
                 </thead>
@@ -66,16 +66,16 @@
                                             <?php
                                             
                                             /* $sections_evaluating_outcome = 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%\'');} ))
-                                            //                                                 $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();*/
+                                                                                        //                                             ->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%\'');} ))
+                                                                                        //                                                 $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_outcome = Course::has('activities')
                                             
@@ -120,23 +120,24 @@
                                                             <h5>Measure {{ $activity_index + 1 }}</h5>
                                                             <?php
                                                             /*
-                                                                                                                    var_dump($section->code);
-                                                                                                                    var_dump($section->number);
-                                                                                                                    var_dump($section->name);
-                                                                                                                    var_dump($outcome->name);
-                                                                                                                    var_dump(date('M Y', strtotime($activity->date)));
-                                                                                                                    var_dump($activity->name);
-                                                                                                                    var_dump(count($section->students));
-                                                                                                                    print"<br>";
-                                                                                                                    print "A rubric was used in the $section->code-$section->number ($section->name) course (". date('M Y', strtotime($activity->date)).") to assess students’ <u>". strtolower($outcome->name) ."</u> in the activity: '<strong>$activity->name </strong>'. N= ". count($section->students);
-                                                                                                                    exit();
-                                                                                                                    */
+                                                                                                                                                                                var_dump($section->code);
+                                                                                                                                                                                var_dump($section->number);
+                                                                                                                                                                                var_dump($section->name);
+                                                                                                                                                                                var_dump($outcome->name);
+                                                                                                                                                                                var_dump(date('M Y', strtotime($activity->date)));
+                                                                                                                                                                                var_dump($activity->name);
+                                                                                                                                                                                var_dump(count($section->students));
+                                                                                                                                                                                print"<br>";
+                                                                                                                                                                                print "A rubric was used in the $section->code-$section->number ($section->name) course (". date('M Y', strtotime($activity->date)).") to assess students’ <u>". strtolower($outcome->name) ."</u> in the activity: '<strong>$activity->name </strong>'. N= ". count($section->students);
+                                                                                                                                                                                exit();
+                                                                                                                                                                                */
                                                             ?>
 
 
                                                             <p>A rubric was used in the
                                                                 {{ $section->code }}-{{ $section->number }}
-                                                                ({{ $section->name }}) course
+                                                                ({{ $section->name }})
+                                                                course
                                                                 ({{ date('M Y', strtotime($activity->date)) }}) to assess
                                                                 students’ <u>{{ strtolower($outcome->name) }}</u> in the
                                                                 activity: "<strong>{{ $activity->name }}</strong>". N=
@@ -225,7 +226,7 @@
                                                             <br><br>
                                                         @else
                                                             <h5>Measure {{ $activity_index + 1 }}</h5>
-                                                            <em>Outcome not measured.</em>
+                                                            <em>Learning Outcome not measured.</em>
                                                         @endif
                                                     @endforeach
                                                 @endforeach

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

@@ -19,7 +19,7 @@
                 <div class="panel-body">
                     {{ Form::open(['action' => 'Objective2Controller@create']) }}
                     <div id='outcomeGroup'>
-                        <label> Associated Outcome</label>
+                        <label> Associated Learning Outcome</label>
                         <div class="form-group col-md-11" id='outcomeForm'>
 
 
@@ -41,7 +41,7 @@
                         <span class='glyphicon glyphicon-plus'>
 
                         </span>
-                        Add another Outcome
+                        Add another Learning Outcome
                     </button>
 
                     <!-- Associated Program -->
@@ -53,7 +53,6 @@
                         <br>
 
                         @foreach ($programs as $program)
-
                             <input type="checkbox" id="{{ $program->name }}" name="program_id[]"
                                 value="{{ $program->id }}">
                             <label for="{{ $program->name }}"> {{ $program->name }}
@@ -99,7 +98,7 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label>Associated Outcome</label>
+                            <label>Associated Learning Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
                             <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
@@ -120,25 +119,23 @@
                         <select id="select-objective" name="id" class="form-control selectpicker">
                             @foreach ($objectives as $objective)
                                 <option value="{{ $objective->id }}" data-subtext="
-                                             @if ($objective->program)
-                                    &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}]
-                            @endif
-                            ">
-                            {{ $objective->text }}
+                                                 @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
+                                ">
+                                    {{ $objective->text }}
 
 
 
-                            </option>
+                                </option>
                             @endforeach
                         </select>
                     </div>
                     <hr>
 
-                    <!-- Associated Outcome -->
+                    <!-- Associated Learning Outcome -->
 
                     <div class="form-group">
                         <div id='assocOutcomeGroup'>
-                            <label>Associated Outcome</label>
+                            <label>Associated Learning Outcome</label>
 
                             <select id="assoc_outcome0" name="assoc_outcome[]" class="form-control selectpicker">
                                 @foreach ($outcomes as $outcome)
@@ -160,7 +157,7 @@
                         <span class='glyphicon glyphicon-plus'>
 
                         </span>
-                        Add another Outcome
+                        Add another Learning Outcome
                     </button>
 
 
@@ -170,7 +167,6 @@
 
                         {{ Form::label('program_id2', 'Associated Program') }}<br><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 }}
@@ -254,7 +250,7 @@
 
         var counter = 1;
         var counterAssoc = 1;
-        //Add Another Outcome
+        //Add Another Learning Outcome
 
         function changeOutcomeHtml() {
             var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
@@ -405,7 +401,7 @@
                     if (json.assessment.length) {
                         $('#deleteObj').html(
                             "<p>This objective is currently participating in an assessment, therefore it cannot be deleted</p>"
-                            );
+                        );
                     } else if (json.assoc_criteria.length) {
                         modal =
                             '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +

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

@@ -69,7 +69,7 @@
                     <h6 class="dropdown-header">View Annual Plan from:</h6>
                     @foreach (Auth::user()->programs as $program)
                         <li><a
-                                href="{{ URL::action('AnnualPlansController@viewAllPlans', [$program->id]) }}">{{ $program->name }}</a>
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['plan', $program->id]) }}">{{ $program->name }}</a>
                         </li>
                     @endforeach
                 </ul>

app/views/local/managers/shared/annual-plans.blade.php

@@ -1349,7 +1349,7 @@
                     // Create button to print report
 
                     div_btn_group = $('<div>', {
-                        'class': 'btn-group',
+                        'class': 'btn-group-vertical',
                         'role': 'group'
                     });
                     button_save = $('<button>', {
@@ -1500,12 +1500,13 @@
                             'onclick': "postAnnualPlan(" + annual_id + ")"
 
 
-                        }).html("Submit Annual Report");
+                        }).html("Submit Annual Plan");
 
                         $("#submit-modal-title").html("Are you sure you want to submit this report?");
                         $("#submit-modal-body")
                             .html(
-                                "You can submit again later, but may need to give explination to administration on why was it resubmitted"
+                                "You can submit again later, but may need to give explination to administration on why was it resubmitted." +
+                                "When submitting, please be patient. It may take a while. "
                             );
 
                         $('#submit-modal-footer').html(button);
@@ -1540,7 +1541,7 @@
                         }).html('<span aria-hidden="true">×</span>');
                         alert.append(button);
                         alert.append(
-                            '<strong>The plan was submitted. You can check it out in View Annual Plans or Print Plan </strong>'
+                            '<strong>The Annual Plan was submitted. You can check it out in View Annual Plans or Print Plan </strong>'
                         )
                         alert.appendTo($("#alert-for-save"));
                     }

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

@@ -35,7 +35,7 @@
 
             </div>
             <hr>
-            <div id="printButton"></div>
+            <div id="printButton" class="text-center"></div>
         </div>
 
 
@@ -68,14 +68,14 @@
 
 
                     <!-- <div class="table-responsive">
-                                                                                                                                                                                                                                                                                    <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
-                                                                                                                                                                                                                                                                                      <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
-                                                                                                                                                                                                                                                                                      <tbody>
-                                                                                                                                                                                                                                                                                      </tbody>
+                                                                                                                                                                                                                                                                                                                <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
+                                                                                                                                                                                                                                                                                                                  <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
+                                                                                                                                                                                                                                                                                                                  <tbody>
+                                                                                                                                                                                                                                                                                                                  </tbody>
 
-                                                                                                                                                                                                                                                                                    </table>
-                                                                                                                                                                                                                                                                                    
-                                                                                                                                                                                                                                                                                </div>-->
+                                                                                                                                                                                                                                                                                                                </table>
+                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                            </div>-->
 
                 </div>
             </div>
@@ -1576,16 +1576,16 @@
 
                     //create button for print
                     div_btn_group = $('<div>', {
-                        'class': 'btn-group',
+                        'class': 'btn-group-vertical',
                         'role': 'group'
                     });
                     button_save = $('<button>', {
-                        'class': 'btn btn-lg btn-primary',
+                        'class': ' btn btn-lg btn-primary ',
                         'type': 'button',
                         'onclick': 'check_if_ready(' + annual_id + ')'
                     }).html('Submit Annual Report');
                     button_print = $("<button>", {
-                        "class": 'btn btn-lg btn-primary',
+                        "class": 'btn btn-lg btn-primary ',
                         "type": "button",
                         "onclick": "window.location.href = " +
                             "'{{ URL::action('AnnualPlansController@printAnnualReport') }}" +
@@ -1766,7 +1766,8 @@
                         $("#submit-modal-title").html("Are you sure you want to submit this report?");
                         $("#submit-modal-body")
                             .html(
-                                "You can submit again later, but may need to give explination to administration on why was it resubmitted"
+                                "You can submit again later, but may need to give explination to administration on why was it resubmitted." +
+                                "When submitting, please be patient. It may take a while."
                             );
 
                         $('#submit-modal-footer').html(button);
@@ -1802,7 +1803,7 @@
                         alert.append(button);
                         alert.append(
                             '<strong>Report is complete, You can check it out in View Annual Reports or Print Report </strong>'
-                            )
+                        )
                         alert.appendTo($("#alert-for-save"));
                     }
 

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

@@ -1,20 +1,18 @@
 @extends('layouts.master')
 
 @section('navigation')
-@if(Auth::user()->role == 1)
-@include('local.managers.admins._navigation')
-
-@elseif(Auth::user()->role == 2)
-@include('local.managers.sCoords._new_navigation')
-
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role == 2)
+        @include('local.managers.sCoords._new_navigation')
     @elseif(Auth::user()->role == 3)
-    @include('local.managers.pCoords._new_navigation')
+        @include('local.managers.pCoords._new_navigation')
     @endif
 @stop
 @section('main')
 
     <div class="row">
-        
+
         <div class="col-md-6">
             <!-- Form to add a new criterion -->
             <div class="panel panel-default panel-button">
@@ -28,14 +26,14 @@
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Outcome 1</label>
 
-                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker', 'id' => 'outcome0', 'onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, reset($outcomes), ['class' => 'form-control selectpicker','id' => 'outcome0','onchange' => 'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
                             </div>
 
                             <div id='objectiveGroupFor0' class='createObjective' data-value='1'>
                                 <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"
-                                    onchange="visiblePrograms('allOutcomes')">
+                                        onchange="visiblePrograms('allOutcomes')">
                                     </select>
 
                                 </div>
@@ -52,11 +50,11 @@
                             </button>
 
                             <br>
-                        
-                        <hr>
-                    </div>
 
-</div>
+                            <hr>
+                        </div>
+
+                    </div>
 
                     <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
 
@@ -71,23 +69,22 @@
                     <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 }}">
-    
+                        @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 }}">
                         @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>
+                            @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
+                        @endif
                     </div>
 
                     <div class="form-group form_validation name_form">
@@ -98,11 +95,11 @@
                     <div class="form-group">
                         {{ Form::label('subcriteria', 'Subcriteria') }}
                         <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
-                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control', 'rows' => 3, 'aria-labelledby' => 'subcriteria']) }}
+                        {{ Form::textarea('subcriteria', '', ['class' => 'form-control','rows' => 3,'aria-labelledby' => 'subcriteria']) }}
                     </div>
                     <div class="form-group form_validation maximum_form">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '8', ['class' => 'form-control', 'id' => 'maximum_score', 'oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
+                        {{ Form::text('maximum_score', '8', ['class' => 'form-control','id' => 'maximum_score','oninput' => 'addOptions("Num_scale", "maximum_score", "Scales")']) }}
                     </div>
                     <div class="form-group form_validation number_of_scales">
                         {{ Form::label('scales', 'Number of Scales') }}
@@ -118,15 +115,15 @@
 
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright') }}
-                        {{ Form::textarea('copyright', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'copyright']) }}
+                        {{ Form::textarea('copyright', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'copyright']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Notes') }}
-                        {{ Form::textarea('notes', '', ['class' => 'form-control', 'rows' => 2, 'placeholder' => '(optional)', 'aria-labelledby' => 'notes']) }}
+                        {{ Form::textarea('notes', '', ['class' => 'form-control','rows' => 2,'placeholder' => '(optional)','aria-labelledby' => 'notes']) }}
                     </div>
 
-                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block', 'id' => 'create_the_criterion_button', 'data-form-id' => 'create_criterion']) }}
+                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block','id' => 'create_the_criterion_button','data-form-id' => 'create_criterion']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -138,7 +135,7 @@
                     Edit
                 </div>
                 <div class="panel-body">
-                    {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
+                    {{ Form::open(['action' => 'CriteriaController@update','id' => 'update_criterion','data-form-id' => 'update_criterion']) }}
 
                     <button class="btn btn-md btn-secondary filterButton">
                         <span class="glyphicon glyphicon-minus">
@@ -160,7 +157,7 @@
                         </div>
                         <div class="form-group">
                             <label>Associated Outcome</label>
-                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcomes_fetch', 'onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
+                            {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcomes_fetch','onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
 
                         </div>
                     </div>
@@ -170,7 +167,7 @@
                         {{ Form::label('criterion_id', 'Criterion') }}
                         <select id="select-criterion" name="id" class="form-control selectpicker"
                             onchange='fetchCriterionForEditing()'>
-                          
+
                         </select>
                     </div>
                     <div id='allAssocOutcomes' class='form_validation outcome_form'>
@@ -178,7 +175,7 @@
                         <div id='assocOutcomeGroup0' class='createOutcome' data-value="1">
                             <div class="form-group col-md-12 selectOutcome">
                                 <label>Outcome 1</label>
-                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcome_0', 'onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
+                                {{ Form::select('outcome[]', $outcomes, null, ['class' => 'form-control selectpicker','id' => 'assoc_outcome_0','onchange' => 'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
 
                             </div>
                             <div id='assoc_objectiveGroupFor0' class='createObjective' data-value="1">
@@ -201,10 +198,10 @@
                                 </span>
                                 Add another Objective
                             </button>
-                        
-                        <hr>
+
+                            <hr>
+                        </div>
                     </div>
-                </div>
                     <button class='btn btn-md btn-secondary button-add-outcome-assoc' onclick='addAssocOutcome()'>
                         <span class='glyphicon glyphicon-plus'>
 
@@ -216,32 +213,30 @@
 
 
                     <!-- Associated Program -->
-                    <div class="form-group form_validation program_form" id = 'assoc-program-checkboxes'>
+                    <div class="form-group form_validation program_form" id='assoc-program-checkboxes'>
+
+                        {{ Form::label('program_id2', 'Associated Program') }}<br><br>
 
-                            {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                        @if (count($programs) == 1)
 
-                            @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>
+                                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>
-                       
+                            @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
 
-                    @endif
+                        @endif
+
 
-                            
                     </div>
 
 
@@ -272,7 +267,7 @@
                     </div>
                     <div class="form-group form_validation maximum_form">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '', ['class' => 'form-control', 'id' => 'assoc_maximum_score', 'oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
+                        {{ Form::text('maximum_score', '', ['class' => 'form-control','id' => 'assoc_maximum_score','oninput' => 'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")']) }}
                     </div>
 
 
@@ -292,21 +287,23 @@
 
                     <div class="form-group">
                         {{ Form::label('copyright', 'Copyright Information') }}
-                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_copyright', 'placeholder' => '(optional)']) }}
+                        {{ Form::textarea('copyright', Input::old('copyright'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_copyright','placeholder' => '(optional)']) }}
                     </div>
 
                     <div class="form-group">
                         {{ Form::label('notes', 'Additional Notes') }}
-                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control', 'rows' => 2, 'id' => 'criterion_notes', 'placeholder' => '(optional)']) }}
+                        {{ Form::textarea('notes', Input::old('notes'), ['class' => 'form-control','rows' => 2,'id' => 'criterion_notes','placeholder' => '(optional)']) }}
                     </div>
 
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_the_criterion_button', 'data-form-id' => 'update_criterion']) }}
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block','id' => 'update_the_criterion_button','data-form-id' => 'update_criterion']) }}
                     {{ Form::close() }}
-                    {{ Form::open(['action' => 'CriteriaController@delete']) }}
+                    {{ Form::open(['action' => 'CriteriaController@delete', 'id' => 'deleteCriterionForm']) }}
 
-                    <input type='hidden' name='criterion_delete' id='deleteCriteria'>
+                    {{ Form::hidden('criterion_delete', '0', ['id' => 'deleteCriteria']) }}
+                    <!--<input type='hidden' name='criterion_delete' id='deleteCriteria'>-->
 
                     {{ Form::submit('Delete', ['class' => 'btn btn-primary btn-block', 'id' => 'DeleteButton']) }}
+                    {{ Form::close() }}
 
                 </div>
             </div>
@@ -323,28 +320,25 @@
             addOptions('Num_scale', 'maximum_score', 'Scales');
             $('#Num_scale').val('4');
             numberOfScales('Num_scale', 'Scales');
-            
+
             $('.selectpicker').selectpicker('refresh');
-            
+
         });
 
-        function checkIfNewCriterion(scaleBox){
-            if ( $(scaleBox).val() == $(scaleBox).data('old-scale') ){
+        function checkIfNewCriterion(scaleBox) {
+            if ($(scaleBox).val() == $(scaleBox).data('old-scale')) {
+
 
-                
 
-                $('#DeleteButton').prop('disabled', false);
+                //$('#DeleteButton').prop('disabled', false);
                 $("#update_the_criterion_button").val('Update');
                 $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update') }}")
-                
-                $(scaleBox).parent().children('.alert-placeholder').remove();
-            }
 
-
-             else {
-                if( $(scaleBox).parent().children('.alert-placeholder').length===0){
-                    div_placeholder = $('<div>',{
-                        'class':'alert-placeholder'
+                $(scaleBox).parent().children('.alert-placeholder').remove();
+            } else {
+                if ($(scaleBox).parent().children('.alert-placeholder').length === 0) {
+                    div_placeholder = $('<div>', {
+                        'class': 'alert-placeholder'
                     });
                     $(div_placeholder).html(
                         '<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> If a criterion is already used in assessments, editting it will actually create a new one </div>'
@@ -353,14 +347,15 @@
 
                 }
 
-                $('#DeleteButton').prop('disabled', true);
+                //$('#DeleteButton').prop('disabled', true);
                 $("#update_the_criterion_button").val("Create New")
                 $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create') }}")
-                
+
 
 
             }
         }
+
         function fetchCriterionForEditing() {
             var id = $('#select-criterion').find(':selected').val();
 
@@ -383,7 +378,7 @@
 
                     } else {
                         criterion = criterion[0];
-                        
+
                         var name = criterion.name;
                         if (criterion.subcriteria) {
                             subcriteria = JSON.parse(criterion.subcriteria).join('\n');
@@ -417,16 +412,19 @@
                             $('#assoc_scale_' + i).val(criterion.scales[i].description);
                         }
                         if ((criterion.activity_criterion.length)) {
-                            for(i = 0; i<criterion.num_scales; i++){
-                                $("#assoc_scale_"+i).attr('oninput','checkIfNewCriterion(this)')
-                                $("#assoc_scale_"+i).data('old-scale', $('#assoc_scale_'+i).val())
+                            for (i = 0; i < criterion.num_scales; i++) {
+                                $("#assoc_scale_" + i).attr('oninput', 'checkIfNewCriterion(this)')
+                                $("#assoc_scale_" + i).data('old-scale', $('#assoc_scale_' + i).val())
                             }
 
+                            $('#DeleteButton').prop('disabled', true);
+
 
 
-                            
-                            
 
+
+                        } else {
+                            $('#DeleteButton').prop('disabled', false);
                         }
 
 
@@ -629,16 +627,19 @@
 
 
                     */
-                            visiblePrograms('allAssocOutcomes');
+                    visiblePrograms('allAssocOutcomes');
 
                     var program_length = criterion.program.length;
-                    
-                        $('input[type=checkbox]').prop('checked', false);
-                        for (var i = 0; i < program_length; i++) {
+
+                    $('input[type=checkbox]').prop('checked', false);
+                    for (var i = 0; i < program_length; i++) {
                         $('#assoc_program-' + criterion.program[i].program_id).prop("checked", true);
                     }
-                    
-                  
+
+
+                    $("#deleteCriteria").val(criterion.id);
+
+
 
 
 
@@ -896,6 +897,8 @@
                     e.preventDefault();
 
 
+            } else if (e.originalEvent.submitter.id == "DeleteButton") {
+
             } else e.preventDefault();
         })
 
@@ -1653,9 +1656,6 @@
                 }
             )
         }
-
-
-        
     </script>
 @stop
 

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

@@ -0,0 +1,89 @@
+@extends('layouts.master-2')
+
+@section('navigation')
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role == 2)
+        @include('local.managers.sCoords._new_navigation')
+    @elseif(Auth::user()->role == 3)
+        @include('local.managers.pCoords._new_navigation')
+    @elseif(Auth::user()->role == 4)
+        @include('local.professors._navigation')
+    @endif
+@stop
+@section('main')
+
+    {{-- TODO: look where to place this script.
+          if placed inside .ready() or before it,
+            an error that the function is not defined occurs. --}}
+    {{-- TODO: no reconoce acentos --}}
+
+
+    <div class="row">
+
+
+
+        <div class="col-md-12">
+            <div class="table-responsive table-responsive-0">
+                <table class="table table-striped table-condensed datatable">
+                    <thead id="theHead">
+                        <tr>
+                            <th>Annual Cycle</th>
+                            <th>PDF Name</th>
+                            <th>User who submitted</th>
+                            <th>Date Submitted </th>
+                            <th>New Version</th>
+                            <th>Download</th>
+
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($paths_with_users as $info)
+                            <tr>
+                                <td> {{ $info->academic_year }}</td>
+                                <td> <a
+                                        href="{{ URL::action('AnnualPlansController@downloadPDF', ['print', $info->path_id]) }}">
+                                        {{ basename($info->path_to_pdf) }}
+                                        <span class="glyphicon glyphicon-eye-open"></span>
+
+                                </td>
+                                <td> {{ $info->surnames . ', ' . $info->first_name }}</td>
+                                <td>
+                                    {{ $info->date_posted }}
+                                </td>
+                                <td>
+                                    @if ($info->last == 1)
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                    @endif
+                                </td>
+                                <td>
+                                    <a type="button" class="btn btn-primary"
+                                        href="{{ URL::action('AnnualPlansController@downloadPDF', ['download', $info->path_id]) }}">
+                                        Download
+                                        <span class="glyphicon glyphicon-download-alt"></span>
+                                    </a>
+                                </td>
+
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+
+
+    </div>
+
+
+
+
+
+
+
+
+@stop
+
+@section('included-js')
+    @include('global._datatables_js')
+@stop

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

@@ -1,13 +1,13 @@
 @extends('layouts.master')
 
 @section('navigation')
-@if(Auth::user()->role==1)
-@include('local.managers.admins._navigation')
-@elseif(Auth::user()->role==2)
-@include('local.managers.sCoords._new_navigation')
-@elseif(Auth::user()->role==3)
-@include('local.managers.pCoords._new_navigation')
-@endif
+    @if (Auth::user()->role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif(Auth::user()->role == 2)
+        @include('local.managers.sCoords._new_navigation')
+    @elseif(Auth::user()->role == 3)
+        @include('local.managers.pCoords._new_navigation')
+    @endif
 @stop
 @section('main')
     <div class="row">
@@ -25,14 +25,13 @@
                 <div class="panel-body">
                     {{ Form::open(['action' => 'Objective2Controller@create']) }}
                     <div id='outcomeGroup'>
-                        <label> Associated Outcome</label>
+                        <label> Associated Learning Outcome</label>
                         <div class="form-group col-md-11" id='outcomeForm'>
 
 
                             <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
 
                                 @foreach ($outcomes as $outcome)
-
                                     <option value="{{ $outcome->id }}">
 
                                         {{ $outcome->name }}
@@ -44,7 +43,6 @@
 
 
                                     </option>
-
                                 @endforeach
 
                             </select>
@@ -58,7 +56,7 @@
                         <span class='glyphicon glyphicon-plus'>
 
                         </span>
-                        Add another Outcome
+                        Add another Learning Outcome
                     </button>
 
                     <!-- Associated Program -->
@@ -69,8 +67,7 @@
                         <br>
 
 
-                            @foreach ($programs as $program)
-
+                        @foreach ($programs as $program)
                             <input type="checkbox" id="{{ $program->name }}" name="program_id[]"
                                 value="{{ $program->id }}">
                             <label for="{{ $program->name }}"> {{ $program->name }}
@@ -120,7 +117,7 @@
                             </select>
                         </div>
                         <div class="form-group">
-                            <label>Associated Outcome</label>
+                            <label>Associated Learning Outcome</label>
                             {{-- Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) --}}
                             <select id="assoc_outcomes_fetch" name="assoc_outcome_fetch" class="form-control selectpicker"
                                 onchange="fetchAllObjectives('select-program', 'assoc_outcomes_fetch')">
@@ -142,16 +139,15 @@
                         {{ Form::label('objective_id', 'Objectives') }}
                         <select id="select-objective" name='id' class="form-control selectpicker">
                             @foreach ($objectives as $objective)
-                                <option value="{{ $objective->id }}" data-subtext="
-                                             @if ($objective->program)
-                                    &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}]
-                            @endif
-                            ">
-                            {{ $objective->text }}
+                                <option value="{{ $objective->id }}"
+                                    data-subtext="
+                                                                                                                                                                                                                             @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
+                                                                                                                                                                                                            ">
+                                    {{ $objective->text }}
 
 
 
-                            </option>
+                                </option>
                             @endforeach
                         </select>
 
@@ -162,12 +158,13 @@
 
                     <div class="form-group">
                         <div id='assocOutcomeGroup'>
-                            <label>Associated Outcome</label>
+                            <label>Associated Learning Outcome</label>
+
+                            <div id="message_to_disconnect"></div>
 
                             <select id="assoc_outcome0" name="assoc_outcome[]" class="form-control selectpicker">
 
                                 @foreach ($outcomes as $outcome)
-
                                     <option value="{{ $outcome->id }}">
 
                                         {{ $outcome->name }}
@@ -179,7 +176,6 @@
 
 
                                     </option>
-
                                 @endforeach
 
                             </select>
@@ -193,7 +189,7 @@
                         <span class='glyphicon glyphicon-plus'>
 
                         </span>
-                        Add another Outcome
+                        Add another Learning Outcome
                     </button>
 
 
@@ -204,12 +200,11 @@
 
 
                         @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
+                            <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 -->
@@ -233,7 +228,7 @@
 
                     </div>
 
-                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_button']) }}
+                    {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_button_to_modal']) }}
                     {{ Form::close() }}
 
                     <form action="/deleteObjective" method="POST" id='deleteObj'>
@@ -249,6 +244,29 @@
             </div>
         </div>
     </div>
+    <div id="ObjectiveAssocModal" class="modal fade" tabindex="-1" data-criterion-id="0">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h5 class="modal-title">Would you like to pair these new Outcomes to all the Criteria associated to
+                        this Objective?</h5>
+
+                </div>
+                <div class="modal-body" id="ObjectiveModalBody">
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary"
+                        onclick="pair_every_criteria_with_objective =0; $('#update_button').click()"
+                        data-dismiss="modal">No</button>
+                    <button type="button" onclick="pair_every_criteria_with_objective =1; $('#update_button').click()"
+                        class="btn btn-primary" data-dismiss="modal">Yes</button>
+                    <button type="hidden" style="display:none" id="update_button" class="btn btn-primary"></button>
+                </div>
+            </div>
+        </div>
+    </div>
     <script>
         $('.filterSection').show();
 
@@ -294,7 +312,7 @@
         }
 
         var counter = 1;
-        var counterAssoc = 1;
+        var counterAssoc = 0;
         //Add Another Outcome
 
         function changeOutcomeHtml() {
@@ -347,7 +365,7 @@
                 'type': 'button',
                 'class': 'btn btn-primary',
                 //send the counter to the function so it can tell which container to remove
-                'onclick': 'deleteLast()',
+                'onclick': 'deleteLast(' + counter + ')',
 
             });
             $button.append('X');
@@ -365,7 +383,7 @@
         }
 
         //Recieves the counter variable so it can find the specific div and delete it
-        function deleteLast() {
+        function deleteLast(counter) {
             div = document.getElementById('outcomeContainer' + (counter).toString());
             div.remove();
         }
@@ -387,51 +405,86 @@
 
 
                     // Select associated outcome
-                    for (var i = counterAssoc; i != 1; i--) {
-                        deleteLastAssoc();
-
-                    }
+                    $(".removable-outcome").remove();
+                    $('.alert-dismissible').remove();
                     $('#assoc_outcome0').val(json.outcome[0].outcome_id);
+
+                    disabled = 0;
+                    if (json.outcome[0].typ_semester_outcome_id != null || json.outcome[0].count_criterion_id != 0) {
+                        $('#assoc_outcome0').attr('disabled', true);
+                        disabled = 1;
+                    } else $('#assoc_outcome0').attr('disabled', false);
+                    counterAssoc = 0;
                     $('#assoc_outcome0').selectpicker('refresh');
-                    counterAssoc = 1;
                     for (var i = 1; i < json.outcome.length; i++) {
-                        counterAssoc = i + 1;
+                        counterAssoc = i;
                         var $select = $('<select />', {
-                            'class': "selectpicker form-control",
+                            'class': "selectpicker form-control ",
                             'name': "assoc_outcome[]",
                             'data-live-search': 'true',
-                            'id': 'assoc_outcome' + i.toString()
+                            'id': 'assoc_outcome' + i.toString(),
+
 
                         });
                         var $div = $('<div />', {
                             'id': 'assocOutcomeForm' + i.toString(),
-                            'class': 'form-group col-md-11'
+                            'class': 'form-group col-md-11 removable-outcome'
                         });
                         var $divForButton = $('<div />', {
-                            'class': 'col-md-1',
+                            'class': 'col-md-1 removable-outcome',
                             'id': 'closeAssoc' + i.toString()
 
                         });
                         var $button = $('<button />', {
                             'type': 'button',
-                            'class': 'btn btn-primary',
-                            'onclick': 'deleteLastAssoc()'
+                            'class': 'btn btn-primary removable-outcome',
+                            'onclick': 'deleteLastAssoc(' + i + ')'
                         });
                         $button.append('X');
                         $divForButton.append($button);
 
                         $div.appendTo('#assocOutcomeGroup')
                         $select.append(selectOptions);
-
+                        if (json.outcome[i].typ_semester_outcome_id != null || json.outcome[i].count_criterion_id !=
+                            0) {
+                            $select.attr('disabled', true);
+                            $button.attr('disabled', true);
+                            disabled = 1;
+                        }
                         $select.appendTo('#assocOutcomeForm' + i.toString()).selectpicker('refresh');
                         $divForButton.appendTo('#assocOutcomeGroup');
 
+
                         $('#assoc_outcome' + i.toString()).val(json.outcome[i].outcome_id);
                         $('#assoc_outcome' + i.toString()).selectpicker('refresh');
 
 
+
+
                     }
 
+
+                    if (disabled == 1) {
+                        alert = $('<div/>', {
+                            'class': 'alert alert-danger alert-dismissible',
+                            'role': 'alert'
+                        })
+                        button = $('<button/>', {
+                            'type': 'button',
+                            'class': 'close',
+                            'data-dismiss': 'alert',
+                            'alert-label': 'close'
+                        }).html('<span aria-hidden="true">×</span>');
+                        alert.append(button);
+                        alert.append(
+                            '<strong>If you wish to edit the disabled Outcomes you need to detach the Objective from every Criteria paired to it and this Objectvie cannot be in any annual plan with that Outcome</strong>'
+                        )
+
+                        alert.appendTo($('#message_to_disconnect'))
+                    }
+
+
+
                     var program_length = json.program.length;
                     $('input[type=checkbox]').prop('checked', false);
 
@@ -446,12 +499,25 @@
                         $('#status').val(0);
                     else
                         $('#status').val(1);
+                    typ_status = "";
+
+                    warning = "";
 
-                    if (json.assessment.length) {
+                    if (json.typ_semester_objectives.length > 0 && json.assessment.length > 0) {
+                        warning =
+                            "<p>This objective is currently participating in an Assessment and it is paired to a Three Year Plan, therefore it cannot be deleted </p>";
+                        $("#deleteObj").html(warning);
+                    } else if (json.assessment.length > 0) {
                         $('#deleteObj').html(
-                            "<p>This objective is currently participating in an assessment, therefore it cannot be deleted</p>"
-                            );
-                    } else if (json.assoc_criteria.length) {
+                            "<p>This objective is currently participating in an Assessment, therefore it cannot be deleted</p>"
+                        );
+                    } else if (json.typ_semester_objectives.length > 0) {
+                        warning =
+                            "<p>This objective is currently paired to a Three Year Plan, therefore it cannot be deleted </p>";
+                        $("#deleteObj").html(
+                            warning
+                        );
+                    } else if (json.assoc_criteria.length > 0) {
                         modal =
                             '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +
                             'Delete' +
@@ -523,40 +589,41 @@
         }
 
 
-        function deleteLastAssoc() {
+        function deleteLastAssoc(i) {
 
-            div = document.getElementById('assocOutcomeForm' + (counterAssoc - 1).toString());
+            div = document.getElementById('assocOutcomeForm' + (i).toString());
             div.remove();
-            button = document.getElementById('closeAssoc' + (counterAssoc - 1).toString());
+            button = document.getElementById('closeAssoc' + (i).toString());
             button.remove();
-            counterAssoc -= 1;
-            $('#counterAssoc').val(counterAssoc);
+            //counterAssoc -= 1;
+            //$('#counterAssoc').val(counterAssoc);
 
         }
 
         function addAssoc() {
 
-
+            counterAssoc += 1;
             var $select = $('<select />', {
-                'class': "selectpicker form-control",
+                'class': "selectpicker form-control ",
                 'name': "assoc_outcome[]",
                 'data-live-search': 'true',
                 'id': 'assoc_outcome' + counterAssoc.toString(),
+                'data-new-outcome': 'true'
 
             });
             var $div = $('<div />', {
                 'id': 'assocOutcomeForm' + counterAssoc.toString(),
-                'class': 'form-group col-md-11'
+                'class': 'form-group col-md-11 removable-outcome'
             });
             var $divForButton = $('<div />', {
-                'class': 'col-md-1',
+                'class': 'col-md-1 removable-outcome',
                 'id': 'closeAssoc' + counterAssoc.toString()
 
             });
             var $button = $('<button />', {
                 'type': 'button',
                 'class': 'btn btn-primary',
-                'onclick': 'deleteLastAssoc()'
+                'onclick': 'deleteLastAssoc(' + counterAssoc + ')'
             });
             $button.append('X');
             $divForButton.append($button);
@@ -569,18 +636,50 @@
 
 
             ran = true;
-            counterAssoc += 1;
+            //counterAssoc += 1;
             $('#counterAssoc').val(counterAssoc);
 
 
 
         }
+
+        $("#update_button_to_modal").on('click', function(e) {
+            e.preventDefault();
+            newOutcomes = [];
+            $('#assocOutcomeGroup').find('select').each(function() {
+                if ($(this).data('new-outcome') == true) {
+                    option = $(this).find(':selected');
+                    newOutcomes.push(option[0].text);
+                }
+            })
+
+            if (newOutcomes.length > 0) {
+                ul = $("<ul>");
+
+                $.each(newOutcomes, function(id, text) {
+                    li = $("<li>").html(text)
+                    ul.append(li);
+                });
+
+                $("#ObjectiveModalBody").html(ul);
+                $('#ObjectiveAssocModal').modal("toggle");
+            } else {
+                pair_every_criteria_with_objective = 0;
+                $("#update_button").click();
+
+            }
+
+
+        })
+        //Terrible notation but
+
+        pair_every_criteria_with_objective = 0;
         $('#update_button').on('click', function(e) {
             e.preventDefault();
 
             outcome_id = []
             program_id = [];
-            
+
             status = $('#status').val();
             text = $('#objective-text').val();
             id = $('#select-objective').val();
@@ -588,7 +687,7 @@
             $('#assocOutcomeGroup').find('select').each(function() {
                 outcome_id.push($(this).val())
             })
-$('input[name="assoc_program_id[]"]').each(function() {
+            $('input[name="assoc_program_id[]"]').each(function() {
                 if (this.checked)
                     program_id.push($(this).val())
             });
@@ -598,7 +697,8 @@ $('input[name="assoc_program_id[]"]').each(function() {
                     program_id: program_id,
                     status: status,
                     text: text,
-                    id: id
+                    id: id,
+                    pair_every_criteria_with_objective: pair_every_criteria_with_objective
                 },
                 function($array) {
                     div = $('<div/>', {
@@ -642,7 +742,7 @@ $('input[name="assoc_program_id[]"]').each(function() {
 
     $('#outcome-display').parent().hide();
 
-    fetchObjectiveForEditing();
+    // fetchObjectiveForEditing();
     // setCriterionStatus();