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

Para ajustar ultimos cambios

app/controllers/CriteriaController.php

@@ -738,16 +738,21 @@ class CriteriaController extends \BaseController
     {
         if (Auth::user()->role == 1) {
             //buscar todos los objetivos
-            $objectives = DB::table('program_user')
+            /*$objectives = DB::table('program_user')
                 ->join('objective_program', 'objective_program.program_id', '=', 'program_user.program_id')
                 ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
                 ->join('programs', 'programs.id', '=', 'program_user.program_id')
                 ->select('objectives.id', 'objectives.text', 'programs.name')
                 ->orderBy('objectives.text', 'asc')
+                ->get();*/
+
+            $objectives = DB::table('objectives')
+                ->where('objectives.active', 1)
+                ->orderBy('objectives.text', 'asc')
                 ->get();
         } elseif (Auth::user()->role == 2) {
             //buscar los objetivos de la departamento (school)
-            $objectives = DB::table('program_user')
+            /*$objectives = DB::table('program_user')
                 ->join('objective_program', 'objective_program.program_id', '=', 'program_user.program_id')
                 ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
                 ->join('programs', 'programs.id', '=', 'program_user.program_id')
@@ -755,6 +760,16 @@ class CriteriaController extends \BaseController
                 ->select('objectives.id', 'objectives.text', 'programs.name')
                 ->orderBy('objectives.text', 'asc')
                 ->get();
+                */
+            $objectives = DB::table('objectives')
+                ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+                ->join('programs', 'programs.id', '=', 'objective_program.program_id')
+                ->where('program.school_id', Auth::user()->school_id)
+                ->where('objectives.active', 1)
+                ->orderBy('objectives.text', 'asc')
+                ->select('objectives.id', 'objectives.text')
+                ->distinct()
+                ->get();
         } elseif ((Auth::user()->role == 3) || (Auth::user()->role == 4)) {
             //buscar los objetivos de los programas cuales el profesor esta
             $objectives = DB::table('program_user')
@@ -762,7 +777,10 @@ class CriteriaController extends \BaseController
                 ->join('objectives', 'objectives.id', '=', 'objective_program.objective_id')
                 ->join('programs', 'programs.id', '=', 'program_user.program_id')
                 ->where('program_user.user_id', Auth::user()->id)
-                ->select('objectives.id', 'objectives.text', 'programs.name')
+                ->where('objectives.active', 1)
+                ->select('objectives.id', 'objectives.text')
+                ->distinct()
+
                 ->orderBy('objectives.text', 'asc')
                 ->get();
         }

app/controllers/ObjectivesController.php

@@ -214,8 +214,72 @@ class ObjectivesController extends \BaseController
   {
     $id = Input::get('id');
 
-    $objective = Objective::find($id);
+    //$objective = Objective::find($id);
+    $objective = DB::table('objectives')
+      ->where('id', $id)
+      ->first();
 
+    $role = Auth::user()->role;
+
+    switch ($role) {
+      case 1:
+        $program_ids = DB::table('programs')->lists('id');
+        # code...
+        break;
+      case 2:
+        $program_ids = DB::table('programs')
+          ->where('school_id', Auth::user()->school_id)
+          ->lists('id');
+        break;
+      case 3:
+      case 4:
+        $program_ids = DB::table('program_user')
+          ->where('user_id', Auth::user()->id)
+          ->lists('program_id');
+
+
+        break;
+    }
+
+    $criteria_scales = DB::table('criteria')
+      ->join('criterion_objective_outcome as cobo', 'criterion_id', '=', 'criteria.id')
+      ->where('objective_id', $objective->id)
+      ->select('num_scales')
+      ->orderBy('num_scales', 'DESC')
+      ->distinct()
+      ->lists('num_scales');
+    $objective->criteria = [];
+    foreach ($criteria_scales as $i => $num_scales) {
+
+      $objective->criteria[$num_scales] = DB::table('criteria')
+        ->join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
+        ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
+        ->whereIn('program_id', $program_ids)
+        ->where('objective_id', $objective->id)
+        ->where('num_scales', $num_scales)
+        ->select('criteria.*', 'cobo.criterion_id')
+        ->distinct()
+        ->get();
+
+      foreach ($objective->criteria[$num_scales] as $criteria) {
+        $criteria->programs = DB::table('programs')
+          ->join('program_criterion', 'programs.id', '=', 'program_criterion.program_id')
+          ->where('criterion_id', $criteria->criterion_id)
+          ->get();
+
+        $criteria->outcomes = DB::table('outcomes')
+          ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+          ->where('objective_id', $objective->id)
+          ->where('criterion_id', $criteria->criterion_id)
+          ->select('outcomes.*')
+          ->get();
+        $criteria->scales = DB::table('criterion_scale')
+          ->join('scales', 'criterion_scale.scale_id', '=', 'scales.id')
+          ->where('criterion_id', $criteria->criterion_id)
+          ->orderBy('position', 'asc')
+          ->get();
+      }
+    }
     //$objective->program;
     //$objective->criteria;
 

app/controllers/OutcomesController.php

@@ -582,6 +582,7 @@ class OutcomesController extends \BaseController
         // switch para el query, dependiendo del usuario
 
         $role = Auth::user()['role'];
+        $semesters = Session::get('sesemster_ids');
 
         switch ($role) {
             case 1:
@@ -594,6 +595,9 @@ class OutcomesController extends \BaseController
             case 3:
                 $program_ids = DB::table('program_user')->where('user_id', Auth::user()['id'])->lists('program_id');
                 break;
+            case 4:
+                $program_ids = DB::table('program_user')->where('user_id', Auth::user()['id'])->lists('program_id');
+                break;
         }
 
         $outcome->criteria = array();
@@ -709,7 +713,7 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) use ($outcome_id) {
                         $query2
                             ->has('activities')
-//                             ->whereNotNull('outcomes_attempted')
+                            //                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));
@@ -810,7 +814,7 @@ class OutcomesController extends \BaseController
                     ->with(array('courses' => function ($query2) use ($outcome_id) {
                         $query2
                             ->has('activities')
-//                             ->whereNotNull('outcomes_attempted')
+                            //                             ->whereNotNull('outcomes_attempted')
                             // ->where('outcomes_attempted', 'NOT LIKE', '%"'.$outcome_id.'":0%')
                             ->whereIn('semester_id', Session::get('semesters_ids'))
                             ->groupBy(array('code', 'number'));

app/controllers/ProfessorsController.php

@@ -80,23 +80,41 @@ class ProfessorsController extends \BaseController
         $program =  Auth::user()->programs[0];
         $title = 'Your Program: ' . $program->name;
         $program_courses = Course::where('program_id', '=', $program->id)->whereIn('semester_id', Session::get('semesters_ids'))->get();
-        $outcomes = Outcome::orderBy('name', 'asc')->get();
-        $outcomeCount = Outcome::all()->count();
+        $semesters = Session::get('semesters_ids');
+        $semesters = DB::table('semesters')->whereIn('id', $semesters)->orderBy('start', 'ASC')->first();
+
+        $outcomes = Outcome::select(array('id', 'name', 'expected_outcome'))
+            ->whereNull('deleted_at')
+            ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
+            ->orderBy('name', 'ASC')->get();
+        $outcomeCount = count($outcomes);
+        $outcomes_achieved = [];
+        $outcomes_attempted = [];
+
+        Log::info($program_courses);
 
-        $outcomes_achieved = array_fill(1, $outcomeCount, 0);
-        $outcomes_attempted = array_fill(1, $outcomeCount, 0);
 
         foreach ($program_courses as $course) {
-            if ($course->outcomes_achieved != NULL) {
-                $course_outcomes_achieved = json_decode($course->outcomes_achieved, true);
-                $course_outcomes_attempted = json_decode($course->outcomes_attempted, true);
-                for ($i = 1; $i <= count($outcomes_attempted); $i++) {
-                    $outcomes_achieved[$i] += $course_outcomes_achieved[$i];
-                    $outcomes_attempted[$i] += $course_outcomes_attempted[$i];
+
+
+            if ($course->outcomes_ach()) {
+
+                $course_outcomes_achieved = $course->outcomes_ach();
+                $course_outcomes_attempted = $course->outcomes_att();
+                foreach ($course_outcomes_achieved as $outcome => $score) {
+                    if (array_key_exists($outcome, $outcomes_achieved))
+                        $outcomes_achieved[$outcome] += $score;
+                    else $outcomes_achieved[$outcome] = $score;
+                }
+                foreach ($course_outcomes_attempted as $outcome => $score) {
+                    if (array_key_exists($outcome, $outcomes_attempted))
+                        $outcomes_attempted[$outcome] += $score;
+                    else $outcomes_attempted[$outcome] = $score;
                 }
             }
         }
 
+
         // Program contact information
         $scoords = User::where('school_id', $program->school_id)
             ->where('role', 2)

app/database/migrations/2021_09_24_211312_create_semester_program_student.php

@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class CreateSemesterProgramStudent extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('program_student_semester', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('student_id')->unsigned();
+			$table->integer('program_id')->unsigned();
+			$table->integer('semester_id')->unsigned();
+			$table->foreign('semester_id')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table
+				->foreign('student_id')
+				->references('id')
+				->on('students')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+
+			$table->foreign('program_id')
+				->references('id')
+				->on('programs')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('program_student_semester');
+	}
+}

app/routes.php

@@ -180,7 +180,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
     ));
     Route::get('printThreeYear/{program_id}/{typ}', array(
         'as' => 'printThreeYear/{program_id}/{typ}',
-        'uses' => 'ThreeYearPlanController@print'
+        'uses' => 'ThreeYearPlanController@printPlan'
     ));
     // Fetch all criteria associated to an outcome
     Route::post('fetchInfo', array(

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

@@ -278,13 +278,41 @@ $(document).ready(function()
                   //var cell_text = description;
                   row.push(description);
               });
+              howManyPrograms = 0;
               $.each(criterion_programs, function(index, program){
 
               program_html += (index+1) +'. '+program+'<br>\n';
+              howManyPrograms++;
               });
               row.push(program_html);
+              role = {{{Auth::user()->role}}};
+              
+              switch (role) {
+                case 1:
+                if(!criterion.deleted_at) row.push('<a onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" href="#" class = "status">Active</a>');
+              else row.push('<a href="#" onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" class = "status">Deactivated</a>');
+                  break;
+                case 2:
+                if(!criterion.deleted_at) row.push('<a onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" href="#" class = "status">Active</a>');
+              else row.push('<a href="#" onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" class = "status">Deactivated</a>');
+              break;
+              case 3:
+                if(howManyPrograms<=1){
               if(!criterion.deleted_at) row.push('<a onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" href="#" class = "status">Active</a>');
               else row.push('<a href="#" onclick = "statusClick(this)" data-criterion-id="'+criterion.id+'" class = "status">Deactivated</a>');
+                }
+
+                else{
+                  if(!criterion.deleted_at) row.push('<p>Active</p>');
+              else row.push('<p>Deactivated</p>');
+                }
+                break;
+                case 4:
+                if(!criterion.deleted_at) row.push('<p>Active</p>');
+              else row.push('<p>Deactivated</p>');
+                  break;
+              }
+  
               if(criterion_scales.length < criterions_levels){
                 var i = criterion_scales.length;
                 while (i < criterions_levels){

app/views/global/view-three-year-plan.blade.php

@@ -400,7 +400,7 @@ $('.go-to-temp').on('click', function(){
       var id = $(this).data('cycle-id');
       $('#table-cycles').data('typ-id',id);
       $('#print_button').show();
-      $('#print_button').attr("href", "{{URL::action('ThreeYearPlanController@print', [$program_id])}}"+
+      $('#print_button').attr("href", "{{URL::action('ThreeYearPlanController@printPlan', [$program_id])}}"+
       '/'+ $(this).data('cycle-id'));
       $('#section1').show();
       $('#section2').hide();