Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

varias cosas

app/controllers/AnnualPlansController.php

@@ -788,44 +788,86 @@ class AnnualPlansController extends \BaseController
     $objective_id = Input::get('objective_id');
     $course_code = Input::get('course_code');
     $course_number = Input::get('course_number');
-
-    $newTransId = DB::table('transformative_actions')
-      ->insertGetId(array(
-        'is_custom' => $is_custom,
-        'at_text' => $at_text,
-        'description' => $description,
-        'type_of_TA' => $type_of_ta,
-        'user_id' => Auth::user()->id,
-        'program_id' => $program_id,
-        'by_professor' => 0,
-        'created_at' => date('Y-m-d H:i:s'),
-        'updated_at' => date('Y-m-d H:i:s')
-      ));
-    DB::table('ta_course')->insert(array(
-      'ta_id' => $newTransId,
-      'course_number' => $course_number,
-      'course_code' => $course_code
-    ));
-    DB::table('transformative_objective')->insert(array(
-      'ta_id' => $newTransId,
-      'objective_id' => $objective_id
-    ));
-    foreach ($future_typ_course_id as $index => $typ_future_course_id) {
-      $annual_plan = DB::table('annual_cycle')
-        ->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
-        ->where('program_id', $program_id)
-        ->where(function ($query) use (&$future_semesters, &$index) {
-          $query->where('semester_start', $future_semesters[$index])
-            ->orWhere('semester_end', $future_semesters[$index]);
-        })->first();
+    $edit_ta_id = Input::get('edit_ta_id');
+
+    if ($edit_ta_id) {
+      DB::table('transformative_actions')
+        ->where('id', $edit_ta_id)->update(array(
+          'is_custom' => $is_custom,
+          'at_text' => $at_text,
+          'description' => $description,
+          'type_of_TA' => $type_of_ta,
+          'user_id' => Auth::user()->id,
+          'program_id' => $program_id,
+          //'by_professor' => 0,
+          //'created_at' => date('Y-m-d H:i:s'),
+          'updated_at' => date('Y-m-d H:i:s')
+        ));
       DB::table('annual_plan_transformative')
-        ->insert(array(
-          'annual_plan_id' => $annual_plan->id,
-          'trans_id' => $newTransId,
-          'typ_semester_course_id' => $typ_future_course_id,
-          'proposing_coordinator_id' => Auth::user()->id,
-          'proposed_date' => date('Y-m-d H:i:s')
+        ->where('trans_id', $edit_ta_id)
+        ->delete();
+      foreach ($future_typ_course_id as $index => $typ_future_course_id) {
+        $annual_plan = DB::table('annual_cycle')
+          ->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+          ->where('program_id', $program_id)
+          ->where(function ($query) use (&$future_semesters, &$index) {
+            $query->where('semester_start', $future_semesters[$index])
+              ->orWhere('semester_end', $future_semesters[$index]);
+          })->first();
+        DB::table('annual_plan_transformative')
+          ->insert(array(
+            'annual_plan_id' => $annual_plan->id,
+            'trans_id' => $edit_ta_id,
+            'typ_semester_course_id' => $typ_future_course_id,
+            'proposing_coordinator_id' => Auth::user()->id,
+            'proposed_date' => date('Y-m-d H:i:s')
+          ));
+      }
+      $transformative_action = TransformativeAction::getTypCoursesWithSemesters($edit_ta_id);
+      $transformative_action[0]->updated = 1;
+      return $transformative_action;
+    } else {
+      $newTransId = DB::table('transformative_actions')
+        ->insertGetId(array(
+          'is_custom' => $is_custom,
+          'at_text' => $at_text,
+          'description' => $description,
+          'type_of_TA' => $type_of_ta,
+          'user_id' => Auth::user()->id,
+          'program_id' => $program_id,
+          'by_professor' => 0,
+          'created_at' => date('Y-m-d H:i:s'),
+          'updated_at' => date('Y-m-d H:i:s')
         ));
+      DB::table('ta_course')->insert(array(
+        'ta_id' => $newTransId,
+        'course_number' => $course_number,
+        'course_code' => $course_code
+      ));
+      DB::table('transformative_objective')->insert(array(
+        'ta_id' => $newTransId,
+        'objective_id' => $objective_id
+      ));
+      foreach ($future_typ_course_id as $index => $typ_future_course_id) {
+        $annual_plan = DB::table('annual_cycle')
+          ->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
+          ->where('program_id', $program_id)
+          ->where(function ($query) use (&$future_semesters, &$index) {
+            $query->where('semester_start', $future_semesters[$index])
+              ->orWhere('semester_end', $future_semesters[$index]);
+          })->first();
+        DB::table('annual_plan_transformative')
+          ->insert(array(
+            'annual_plan_id' => $annual_plan->id,
+            'trans_id' => $newTransId,
+            'typ_semester_course_id' => $typ_future_course_id,
+            'proposing_coordinator_id' => Auth::user()->id,
+            'proposed_date' => date('Y-m-d H:i:s')
+          ));
+      }
+
+
+      return TransformativeAction::getTypCoursesWithSemesters($newTransId);
     }
   }
 

app/controllers/Objective2Controller.php

@@ -122,7 +122,7 @@ class Objective2Controller extends \BaseController
 
 		$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');
-// 		Log::info(json_encode($json));
+		// 		Log::info(json_encode($json));
 		return json_encode($json);
 	}
 	public function fetchAllobjectives()
@@ -137,7 +137,7 @@ class Objective2Controller extends \BaseController
 		Log::info($json);
 		return json_encode($json);
 	}
-	
+
 	public function delete()
 	{
 		DB::delete("delete from objectives where id = ?", array(Input::get('deleteObj')));
@@ -223,11 +223,14 @@ class Objective2Controller extends \BaseController
 			/** If Objective is saved, send success message */
 			if ($objective->save()) {
 				$objectiveId = $objective->id;
+
+
 				foreach ($clean_input['program_id'] as $program_id) {
 					DB::insert("insert into objective_program (objective_id, program_id) values({$objectiveId},{$program_id})");
 				}
 				foreach ($clean_input['outcome_id'] as $outcome_id) {
 					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
+
 					/*if (!($objectiveOutcome->save())) {
 						Session::flash('status', 'danger');
 						Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
@@ -235,13 +238,13 @@ class Objective2Controller extends \BaseController
 					}*/
 				}
 				DB::table('criterion_objective_outcome')
-				->join('program_criterion' , 'criterion_objective_outcome.criterion_id',"=",'program_criterion.criterion_id')
-				->whereIn('program_id',$clean_input['program_id'])
-				->whereIn('outcome_id',$clean_input['outcome_id'])
-				->where('objective_id','=',0)
-				->update(array('objective_id'=>$objectiveId));
-// 				update("update criterion_objective_outcome coo join program_criterion pc on coo.criterion_id=pc.criterion_id set 
-// 				objective_id= {$objectiveId} where program_id in (".$clean_input['program_id'].") and objective_id=0 and outcome_id in (".$clean_input['outcome_id'].")");
+					->join('program_criterion', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion.criterion_id')
+					->whereIn('program_id', $clean_input['program_id'])
+					->whereIn('outcome_id', $clean_input['outcome_id'])
+					->where('objective_id', '=', 0)
+					->update(array('objective_id' => $objectiveId));
+				// 				update("update criterion_objective_outcome coo join program_criterion pc on coo.criterion_id=pc.criterion_id set 
+				// 				objective_id= {$objectiveId} where program_id in (".$clean_input['program_id'].") and objective_id=0 and outcome_id in (".$clean_input['outcome_id'].")");
 
 				Session::flash('status', 'success');
 				Session::flash('message', 'Objective created: "' . $objective->text . '".');
@@ -348,7 +351,7 @@ class Objective2Controller extends \BaseController
 		$objectives_from_school = DB::table('programs')
 			->join('objective_program', 'objective_program.program_id', '=', 'programs.id')
 			->where('programs.school_id', $userSchool)
-			->where('objective_program.objective_id', "<>" , 0)
+			->where('objective_program.objective_id', "<>", 0)
 			->lists('objective_id');
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->whereIn('id', $objectives_from_school)->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();

app/controllers/OutcomesController.php

@@ -922,9 +922,10 @@ class OutcomesController extends \BaseController
     /**
      * School Assessment Reports
      */
-private function cmp($a, $b) {
-    return strcmp($a->name, $b->name);
-}
+    private function cmp($a, $b)
+    {
+        return strcmp($a->name, $b->name);
+    }
     public function schoolAssessmentReport()
     {
 

app/controllers/RubricsController.php

@@ -19,6 +19,11 @@ class RubricsController extends \BaseController
         $title = 'Rubric for <em>' . $activity->name . '</em>';
 
         // Select templates that belong to everyone or belong to the activity's course's school
+        $usable_templates = DB::table('templates')->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
+            ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'template_criterion.criterion_id')
+            ->where('objective_id', '<>', 0)
+            ->groupBy('template_id')
+            ->lists('template_id');
         $templates = Template::where('is_visible', '=', 1)
             ->where(function ($query) use ($activity) {
                 if (Auth::user()->role != 1) {
@@ -27,6 +32,8 @@ class RubricsController extends \BaseController
                         ->orWhere('school_id', '=', NULL);
                 }
             })
+            ->whereIn('templates.id', $usable_templates)
+
             ->orderBy('name', 'ASC')->get();
 
         $rubrics = Auth::user()->rubrics;
@@ -494,4 +501,4 @@ class RubricsController extends \BaseController
         //        return json_encode($criterion);
         //    }
     }
-}
+}

app/controllers/TransformativeActionsController.php

@@ -634,7 +634,7 @@ class TransformativeActionsController extends \BaseController
       Session::flash('status', 'danger');
       Session::flash('message', $message);
 
-      $role = Auth::user()['role'];
+      //$role = Auth::user()['role'];
       return Redirect::to('transformativeAction')->withInput();
     }
 
@@ -718,7 +718,7 @@ class TransformativeActionsController extends \BaseController
       ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
       ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
       ->where('transformative_actions.id', $ta_id)
-      ->where('objectives.id', '<>',0)
+      ->where('objectives.id', '<>', 0)
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->get();
@@ -726,7 +726,7 @@ class TransformativeActionsController extends \BaseController
       ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
       ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
       ->where('transformative_actions.id', $ta_id)
-      ->where('objectives.id', '<>',0)
+      ->where('objectives.id', '<>', 0)
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->lists('objectives.id');
@@ -745,7 +745,7 @@ class TransformativeActionsController extends \BaseController
       ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
       ->whereIn('objective_outcome.outcome_id', $outcome_ids)
       ->whereIn('objective_program.program_id', $program_ids)
-      ->where('objective_outcome.objective_id', '<>',0)
+      ->where('objective_outcome.objective_id', '<>', 0)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
       ->distinct()
@@ -833,7 +833,7 @@ class TransformativeActionsController extends \BaseController
       ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
       ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
       ->where('objective_outcome.outcome_id', $outcome_id)
-      ->where('objective_outcome.objective_id','<>',0 )
+      ->where('objective_outcome.objective_id', '<>', 0)
       ->whereIn('objective_program.program_id', $program_ids)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')

app/models/Course.php

@@ -59,7 +59,8 @@ class Course extends Eloquent
 
   public static function getFutureTypSemesterCourses($typ_semester_course_id, $program_id)
   {
-    $typ_info = DB::table('typ_semester_outcome')
+    $typ_info = new stdClass();
+    $typ_info->future_semesters = DB::table('typ_semester_outcome')
       ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
       ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
       ->join('typ_semester_outcome as typ_o_2', 'typ_o_2.outcome_id', '=', 'typ_semester_outcome.outcome_id')
@@ -74,6 +75,8 @@ class Course extends Eloquent
       })
       ->join('typ_program', 'typ_o_2.typ_program_id', '=', 'typ_program.id')
       ->join('semesters', 'semesters.id', '=', 'typ_o_2.semester_id')
+      ->leftJoin('annual_plan_transformative', 'annual_plan_transformative.typ_semester_course_id', '=', 'typ_course_2.id')
+      ->leftJoin('transformative_actions', 'transformative_actions.id', '=', 'annual_plan_transformative.trans_id')
 
       ->where('typ_semester_courses.id', $typ_semester_course_id)
       ->where('typ_program.program_id', $program_id)
@@ -88,13 +91,56 @@ class Course extends Eloquent
         'typ_ob_2.id as typ_future_objective_id',
         'typ_course_2.id as typ_future_course_id',
         'semesters.name as semester_name',
-        'semesters.code as semester_code'
-      );
+        'semesters.code as semester_code',
+        'transformative_actions.id as trans_id',
+        'transformative_actions.type_of_TA',
+        'transformative_actions.at_text',
+        'transformative_actions.description'
+
+      )->get();
     //Log::info('El sql');
+    $typ_info->future_transformative_actions  = DB::table('typ_semester_outcome')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('typ_semester_outcome as typ_o_2', 'typ_o_2.outcome_id', '=', 'typ_semester_outcome.outcome_id')
+      ->join('semesters as sem1', 'sem1.id', '=', 'typ_semester_outcome.semester_id')
+      ->join('typ_semester_objectives as typ_ob_2', function ($query) {
+        $query->on('typ_ob_2.typ_semester_outcome_id', '=', 'typ_o_2.id')
+          ->on('typ_semester_objectives.objective_id', '=', 'typ_ob_2.objective_id');
+      })
+      ->join('typ_semester_courses as typ_course_2', function ($join) {
+        $join->on('typ_course_2.typ_semester_objective_id', '=', 'typ_ob_2.id')
+          ->on('typ_semester_courses.course_id', '=', 'typ_course_2.course_id');
+      })
+      ->join('typ_program', 'typ_o_2.typ_program_id', '=', 'typ_program.id')
+      ->join('semesters', 'semesters.id', '=', 'typ_o_2.semester_id')
+      ->leftJoin('annual_plan_transformative', 'annual_plan_transformative.typ_semester_course_id', '=', 'typ_course_2.id')
+      ->leftJoin('transformative_actions', 'transformative_actions.id', '=', 'annual_plan_transformative.trans_id')
+
+      ->where('typ_semester_courses.id', $typ_semester_course_id)
+      ->where('typ_program.program_id', $program_id)
+      ->whereRaw('sem1.code < semesters.code')
+      //->groupBy('typ_o_2.semester_id')
+      ->select(
+        'typ_o_2.semester_id',
+        'typ_o_2.outcome_id',
+        'typ_o_2.id',
+        'typ_semester_courses.course_id',
+        'typ_semester_objectives.objective_id',
+        'typ_ob_2.id as typ_future_objective_id',
+        'typ_course_2.id as typ_future_course_id',
+        'semesters.name as semester_name',
+        'semesters.code as semester_code',
+        'transformative_actions.id as trans_id',
+        'transformative_actions.type_of_TA',
+        'transformative_actions.at_text',
+        'transformative_actions.description'
+
+      )->get();
     //Log::info($typ_info->toSql());
-    //Log::info($typ_semester_course_id);
-    //Log::info($program_id);
-    return $typ_info->get();
+    Log::info($typ_semester_course_id);
+    Log::info($program_id);
+    return $typ_info;
   }
   public function publishedActivities()
   {

app/models/TransformativeAction.php

@@ -12,6 +12,25 @@ class TransformativeAction extends Eloquent
             ->first();
     }
 
+    public static function getTypCoursesWithSemesters($trans_id)
+    {
+        return DB::table('transformative_actions')
+            ->join('annual_plan_transformative', 'annual_plan_transformative.trans_id', '=', 'transformative_actions.id')
+            ->join('typ_semester_courses', 'typ_semester_courses.id', '=', 'annual_plan_transformative.typ_semester_course_id')
+            ->join('typ_semester_objectives', 'typ_semester_objectives.id', '=', 'typ_semester_courses.typ_semester_objective_id')
+            ->join('typ_semester_outcome', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+            ->join('semesters', 'semesters.id', '=', 'typ_semester_outcome.semester_id')
+            ->where('transformative_actions.id', $trans_id)
+            ->select(
+                'transformative_actions.*',
+                'transformative_actions.id as trans_id',
+                'semesters.id',
+                'semesters.code',
+                'typ_semester_course_id as typ_future_course_id'
+            )
+            ->get();
+    }
+
     public static function getCategoriesHtml($program_id)
     {
         $categories = "<option value='0'>Nothing Selected</option>";
@@ -27,7 +46,7 @@ class TransformativeAction extends Eloquent
             ->groupBy('type_of_TA')
             ->get();
         $optGroupGeneral = "<optgroup label='General Transformative Actions'>";
-        $optGroupCustom = "<optgroup label ='Program Custom Actions'>";
+        $optGroupCustom = "<optgroup label ='Program Custom Actions' id = 'program_custom_action'>";
         foreach ($types as $type) {
 
             if ($type->is_custom) {

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

@@ -92,7 +92,7 @@
                     </div>
                     <div class="form-group form_validation maximum_form ">
                         {{ Form::label('maximum_score', 'Maximum Score') }}
-                        {{ Form::text('maximum_score', '1', ['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') }}
@@ -296,7 +296,10 @@
 
         $(document).ready(function() {
             addOptions('Num_scale', 'maximum_score', 'Scales');
+            $('#Num_scale').val('4');
             numberOfScales('Num_scale', 'Scales');
+            
+            $('.selectpicker').selectpicker('refresh');
         });
 
         //Input Validation function to client side

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

@@ -1250,8 +1250,9 @@
                         'id': 'list'
                     });
                     var onclick = "";
-                    if (json.annual_plans.is_submitted==1)
-                        onclick = "fetchEverythingSubmitted(this)";
+                    //TODO CHange this
+                    if (json.annual_plans.is_submitted!=2 )
+                        onclick = "fetchEverything(this)";
                     else onclick = "fetchEverything(this)";
                     if (json.outcomes.first) {
                         header5 = $('<h5/>', {

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

@@ -485,7 +485,7 @@ function fetchObjective(outcome){
 
 }
 // Fetch criteria associated to a specific learning outcome 
-
+//here
 function fetchCriteria(outcome, objective)
 {
     amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());