Browse Source

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

A ver
parent
commit
43526d1654

+ 2
- 0
app/controllers/CoursesController.php View File

@@ -170,6 +170,7 @@ CoursesController extends \BaseController
170 170
         $program = $all_input['program'];
171 171
         $professor_id = $all_input['professor_id'];
172 172
         $semester_id = $all_input['semester_id'];
173
+        $modality = $all_input['modality'];
173 174
         //Input::file('students')//->move('course_student/', 'test.txt');
174 175
 
175 176
 
@@ -185,6 +186,7 @@ CoursesController extends \BaseController
185 186
         $course->program_id = $program;
186 187
         $course->user_id = $professor_id;
187 188
         $course->semester_id = $semester_id;
189
+        $course->modality = $modality;
188 190
 
189 191
 
190 192
 

+ 11
- 3
app/controllers/RubricsController.php View File

@@ -19,7 +19,8 @@ class RubricsController extends \BaseController
19 19
         $title = 'Rubric for <em>' . $activity->name . '</em>';
20 20
 
21 21
         // Select templates that belong to everyone or belong to the activity's course's school
22
-        $usable_templates = DB::table('templates')->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
22
+        $usable_templates = DB::table('templates')
23
+            ->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
23 24
             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'template_criterion.criterion_id')
24 25
             ->join('program_criterion_objective_outcome', 'criterion_objective_outcome.id', '=', 'program_criterion_objective_outcome.cri_obj_out_id')
25 26
             ->where('objective_id', '<>', 0)
@@ -31,10 +32,17 @@ class RubricsController extends \BaseController
31 32
                 if (Auth::user()->role != 1) {
32 33
                     $query
33 34
                         ->where('school_id', $activity->course->program->school->id)
34
-                        ->orWhere('school_id', '=', NULL);
35
+                        ->orWhere('school_id', '=', NULL)
36
+                        ->orWhere('program_id', '=', $activity->course->program->id);
35 37
                 }
36 38
             })
37
-            ->whereIn('templates.id', $usable_templates)
39
+            ->join('template_criterion', 'template_criterion.template_id', '=', 'templates.id')
40
+            ->join('criterion_objective_outcome', 'template_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
41
+            ->where('objective_id', '<>', 0)
42
+            ->groupBy("templates.id")
43
+            ->select('templates.*')
44
+            //->join('program_criterion_objective_outcome_id','')
45
+            //->whereIn('templates.id', $usable_templates)
38 46
 
39 47
             ->orderBy('name', 'ASC')->get();
40 48
 

+ 5
- 5
app/controllers/SchoolsController.php View File

@@ -332,7 +332,7 @@ class SchoolsController extends \BaseController
332 332
 
333 333
             $criteria_attempted_by_stu = $row->criteria_attempted;
334 334
             $criteria_achieved_by_stu = $row->criteria_achieved;
335
-            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
335
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
336 336
 
337 337
                 if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
338 338
                     $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
@@ -351,7 +351,7 @@ class SchoolsController extends \BaseController
351 351
 
352 352
             $criteria_attempted_by_stu = $row->criteria_attempted;
353 353
             $criteria_achieved_by_stu = $row->criteria_achieved;
354
-            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
354
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
355 355
                 if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
356 356
                     $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
357 357
                 $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
@@ -1555,7 +1555,7 @@ $resultados_todos=array();
1555 1555
 
1556 1556
             $criteria_attempted_by_stu = $row->criteria_attempted;
1557 1557
             $criteria_achieved_by_stu = $row->criteria_achieved;
1558
-            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
1558
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
1559 1559
 
1560 1560
                 if (!isset($achievedUndergradProgramsPerOutcome[$outcome_id][$program_id]))
1561 1561
                     $achievedUndergradProgramsPerOutcome[$outcome_id][$program_id] = 0;
@@ -1574,7 +1574,7 @@ $resultados_todos=array();
1574 1574
 
1575 1575
             $criteria_attempted_by_stu = $row->criteria_attempted;
1576 1576
             $criteria_achieved_by_stu = $row->criteria_achieved;
1577
-            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.67) {
1577
+            if ($criteria_attempted_by_stu != 0 && $criteria_achieved_by_stu / $criteria_attempted_by_stu * 100 >= 66.66) {
1578 1578
                 if (!isset($achievedGradProgramsPerOutcome[$outcome_id][$program_id]))
1579 1579
                     $achievedGradProgramsPerOutcome[$outcome_id][$program_id] = 0;
1580 1580
                 $achievedGradProgramsPerOutcome[$outcome_id][$program_id]++;
@@ -1761,4 +1761,4 @@ $resultados_todos=array();
1761 1761
 
1762 1762
         return View::make('local.managers.shared.print_school', compact('title', 'outcomes', 'outcomes_attempted', 'outcomes_achieved', 'school', 'assessed_sections_count', 'school_sections_count', 'achievedProgramsPerOutcome', 'attemptedProgramsPerOutcome', 'grouped_courses', 'participating_programs'));
1763 1763
     }
1764
-}
1764
+}

+ 86
- 0
app/controllers/ThreeYearPlanController.php View File

@@ -643,6 +643,92 @@ class ThreeYearPlanController extends \BaseController
643 643
     }
644 644
     return 'update succes?';
645 645
   }
646
+
647
+  public function verifyAndCreate($program_id)
648
+  {
649
+
650
+    $typ_id = Input::get("typ_id");
651
+
652
+    $typ_program_id = DB::table('typ_program')
653
+      ->where('three_year_plan_id', $typ_id)
654
+      ->where('program_id', $program_id)
655
+      ->first();
656
+
657
+    $information_thats_missing = [];
658
+
659
+    $objectives_missing = DB::table('typ_semester_outcome')
660
+      ->leftJoin("typ_semester_objectives", 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
661
+      ->join('semesters', 'semesters.id', '=', 'typ_semester_outcome.semester_id')
662
+      ->join('outcomes', 'outcomes.id', '=', 'typ_semester_outcome.outcome_id')
663
+      ->where('typ_program_id', $typ_program_id->id)
664
+      ->whereNull('typ_semester_objectives.id')
665
+      ->select('semesters.id as semester_id', 'semesters.name as semester_name', 'semesters.code', 'outcomes.name as outcome_name', 'outcomes.id as outcome_id')
666
+      ->get();
667
+
668
+    if (count($objectives_missing) != 0) {
669
+
670
+      $objective_array = [];
671
+
672
+      foreach ($objectives_missing as $ob) {
673
+        if (!isset($objective_array[$ob->semester_id])) {
674
+          $objective_array[$ob->semester_id] = array(
675
+            'semester_name' => $ob->semester_name . ' (' . $ob->code . ') ',
676
+            'outcome_text' => [],
677
+
678
+          );
679
+        }
680
+        $objective_array[$ob->semester_id]['outcome_text'][] = $ob->outcome_name;
681
+      }
682
+
683
+      $information_thats_missing['objectives_missing'] = $objective_array;
684
+    }
685
+
686
+    $courses_missing = DB::table('typ_semester_outcome')
687
+      ->join('typ_semester_objectives', 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
688
+      ->leftJoin('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
689
+      ->join('objectives', 'typ_semester_objectives.objective_id', '=', 'objectives.id')
690
+      ->join('outcomes', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
691
+      ->join('semesters', 'typ_semester_outcome.semester_id', '=', 'semesters.id')
692
+
693
+      ->where('typ_program_id', $typ_program_id->id)
694
+      ->whereNull('typ_semester_courses.id')
695
+      ->select('objectives.id as objective_id', 'objectives.text as objective_text')
696
+      ->addSelect('outcomes.id as outcome_id', 'outcomes.name as outcome_name')
697
+      ->addSelect('semesters.id as semester_id', 'semesters.name as semester_name', 'semesters.code as semester_code')
698
+      ->get();
699
+
700
+    if (count($courses_missing) != 0) {
701
+
702
+      $courses_array = [];
703
+
704
+      foreach ($courses_missing as $co) {
705
+        if (!isset($courses_array[$co->semester_id])) {
706
+          $courses_array[$co->semester_id] = array(
707
+            'semester_name' => $co->semester_name . ' (' . $co->semester_code . ') ',
708
+            'outcomes' => []
709
+
710
+
711
+
712
+          );
713
+        }
714
+        if (!isset($courses_array[$co->semester_id]['outcomes'][$co->outcome_id])) {
715
+          $courses_array[$co->semester_id]['outcomes'][$co->outcome_id] = array(
716
+            'outcome_name' => $co->outcome_name,
717
+            'objectives' => []
718
+          );
719
+        }
720
+
721
+        $courses_array[$co->semester_id]['outcomes'][$co->outcome_id]['objectives'][] = $co->objective_text;
722
+      }
723
+      $information_thats_missing['courses_missing'] = $courses_array;
724
+    }
725
+
726
+    if (count($information_thats_missing) != 0) {
727
+      return $information_thats_missing;
728
+    } else {
729
+      $this->createAnnualPlan($program_id);
730
+    }
731
+  }
646 732
   public function createAnnualPlan($program_id)
647 733
   {
648 734
     $input_id =  Input::get('typ_id');

+ 8
- 3
app/models/Activity.php View File

@@ -156,7 +156,8 @@ class Activity extends Eloquent
156 156
       ->get();
157 157
     Log::info(json_encode($this));
158 158
 
159
-    if(isset($this->rubric[0]))$rubric = $this->rubric[0]; else $rubric=new stdClass();
159
+    if (isset($this->rubric[0])) $rubric = $this->rubric[0];
160
+    else $rubric = new stdClass();
160 161
     $outcomes_dict = [];
161 162
     foreach ($outcomes as $outcome) {
162 163
       $outcomes_dict[$outcome->id] = $outcome;
@@ -217,6 +218,9 @@ class Activity extends Eloquent
217 218
 
218 219
 
219 220
     foreach ($outcomes_dict as $outcome) {
221
+
222
+      // dame los criterios que son de este dominio, y de esta actividad.
223
+
220 224
       $ac_criteria = DB::table('criterion_objective_outcome as cobo')
221 225
         ->join('activity_criterion as ac', 'ac.criterion_id', '=', 'cobo.criterion_id')
222 226
         ->where("outcome_id", $outcome->id)
@@ -240,6 +244,7 @@ class Activity extends Eloquent
240 244
         })
241 245
         ->select('a.student_id', DB::raw('count(`a`.`activity_criterion_id`) attempted'), DB::raw('count(`b`.`activity_criterion_id`) achieved'));
242 246
       Log::info($students_attempted->get());*/
247
+
243 248
       $students_attempted = DB::table('assessments as a')
244 249
         ->whereIn('a.activity_criterion_id', $ac_criteria)
245 250
         ->groupBy('a.student_id')
@@ -259,10 +264,10 @@ class Activity extends Eloquent
259 264
           $conteo_outcome_achieved++;
260 265
         }
261 266
       }
262
-    Log::info(json_encode($outcome));
267
+      Log::info(json_encode($outcome));
263 268
 
264 269
       $outcome->achieved = $conteo_outcome_achieved;
265
-      if(isset($outcome->attempted) and $outcome->attempted!=0)$outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
270
+      if (isset($outcome->attempted) && $outcome->attempted != 0) $outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
266 271
 
267 272
       /*foreach ($students_attempted as $student) {
268 273
         $student_criteria[$student];

+ 8
- 5
app/models/Course.php View File

@@ -577,13 +577,14 @@ class Course extends Eloquent
577 577
         ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
578 578
         ->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
579 579
         ->join('semesters', 'semesters.id', '=', 'courses.semester_id')
580
+        ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
580 581
         ->whereIn('students.program_id', $program_ids)
581 582
         ->where('semester_id', $course_code->semester_id)
582 583
         ->where('semesters.is_visible', '=', 1)
583 584
         ->where('activities.draft', 0)
584 585
         ->where('activities.diagnostic', 0)
585 586
 
586
-        ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
587
+        ->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
587 588
         ->distinct()
588 589
         ->get();
589 590
 
@@ -634,7 +635,8 @@ class Course extends Eloquent
634 635
       //si entra aqui, no especifica dominio, y hay que join todos los dominios
635 636
       if (!isset($course_code->typ_semester_course_id)) {
636 637
 
637
-        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id');
638
+        $table_per_student = $table_per_student->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
639
+          ->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id');
638 640
       }
639 641
 
640 642
       //si estan grouped
@@ -667,7 +669,7 @@ class Course extends Eloquent
667 669
         $table_per_student = $table_per_student->groupBy('students.id');
668 670
         $students = $table_per_student->get();
669 671
       } else {
670
-        $table_per_student = $table_per_student->addSelect('outcome_id')
672
+        $table_per_student = $table_per_student->addSelect('outcome_id', 'outcomes.expected_outcome')
671 673
           ->groupBy(array('students.id', 'outcome_id'));
672 674
 
673 675
         Log::info($table_per_student->toSql());
@@ -726,11 +728,12 @@ class Course extends Eloquent
726 728
 
727 729
           $criteria_attempted = $q->criteria_attempted;
728 730
           $criteria_achieved = $q->criteria_achieved;
731
+          $expected_outcome = $q->expected_outcome;
729 732
 
730
-          //PREGUNTA??? ES 66.67??????
733
+          //PREGUNTA??? ES 66.66??????
731 734
 
732 735
           $achieved = 0;
733
-          if ($criteria_attempted != 0 && $criteria_achieved / $criteria_attempted * 100 >= 66.67) {
736
+          if ($criteria_attempted != 0 && $criteria_achieved / $criteria_attempted * 100 >= $expected_outcome) {
734 737
             $achieved = 1;
735 738
           }
736 739
 

+ 17
- 8
app/models/Program.php View File

@@ -73,10 +73,11 @@ class Program extends Eloquent
73 73
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
74 74
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
75 75
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
76
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
76 77
 			->where('students.program_id', $this->id)
77 78
 			->whereIn('semester_id', Session::get('semesters_ids'))
78 79
 			->where('semesters.is_visible', '=', 1)
79
-			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
80
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
80 81
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
81 82
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
82 83
 
@@ -102,11 +103,12 @@ class Program extends Eloquent
102 103
 		foreach ($students as $result) {
103 104
 			$crit_att = $result->criteria_attempted;
104 105
 			$crit_ach = $result->criteria_achieved;
106
+			$expected_outcome = $result->expected_outcome;
105 107
 
106 108
 
107 109
 			$out_att[$result->outcome_id] += 1;
108 110
 
109
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
111
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
110 112
 				$out_ach[$result->outcome_id] += 1;
111 113
 			}
112 114
 		}
@@ -120,6 +122,7 @@ class Program extends Eloquent
120 122
 		foreach ($students as $result) {
121 123
 			$student_id = $result->student_id;
122 124
 			$outcome_id = $result->outcome_id;
125
+			$expected_outcome = $result->expected_outcome;
123 126
 			if (isset($combined_outcomes[$outcome_id]))
124 127
 				$outcome_id = $combined_outcomes[$outcome_id];
125 128
 
@@ -135,7 +138,8 @@ class Program extends Eloquent
135 138
 			if (!isset($the_processed_table[$student_id][$outcome_id])) {
136 139
 				$the_processed_table[$student_id][$outcome_id] = array(
137 140
 					"criteria_attempted" => $result->criteria_attempted,
138
-					"criteria_achieved" => $result->criteria_achieved
141
+					"criteria_achieved" => $result->criteria_achieved,
142
+					"expected_outcome" => $expected_outcome
139 143
 				);
140 144
 			}
141 145
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -163,11 +167,12 @@ class Program extends Eloquent
163 167
 				//Log::info($crit_information);
164 168
 				$crit_att = $crit_information['criteria_attempted'];
165 169
 				$crit_ach = $crit_information['criteria_achieved'];
170
+				$expected_outcome = $crit_information['expected_outcome'];
166 171
 
167 172
 
168 173
 				$out_att[$outcome_id] += 1;
169 174
 
170
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
175
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
171 176
 					$out_ach[$outcome_id] += 1;
172 177
 				}
173 178
 			}
@@ -239,10 +244,11 @@ class Program extends Eloquent
239 244
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
240 245
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
241 246
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
247
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
242 248
 			->where('courses.program_id', $this->id)
243 249
 			->whereIn('semester_id', Session::get('semesters_ids'))
244 250
 			->where('semesters.is_visible', '=', 1)
245
-			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
251
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
246 252
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
247 253
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
248 254
 
@@ -264,11 +270,12 @@ class Program extends Eloquent
264 270
 		foreach ($students as $result) {
265 271
 			$crit_att = $result->criteria_attempted;
266 272
 			$crit_ach = $result->criteria_achieved;
273
+			$expected_outcome = $result->expected_outcome;
267 274
 
268 275
 
269 276
 			$out_att[$result->outcome_id] += 1;
270 277
 
271
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
278
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
272 279
 				$out_ach[$result->outcome_id] += 1;
273 280
 			}
274 281
 		}
@@ -297,7 +304,8 @@ class Program extends Eloquent
297 304
 			if (!isset($the_processed_table[$student_id][$outcome_id])) {
298 305
 				$the_processed_table[$student_id][$outcome_id] = array(
299 306
 					"criteria_attempted" => $result->criteria_attempted,
300
-					"criteria_achieved" => $result->criteria_achieved
307
+					"criteria_achieved" => $result->criteria_achieved,
308
+					"expected_outcome" => $result->expected_outcome
301 309
 				);
302 310
 			}
303 311
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -325,11 +333,12 @@ class Program extends Eloquent
325 333
 				//Log::info($crit_information);
326 334
 				$crit_att = $crit_information['criteria_attempted'];
327 335
 				$crit_ach = $crit_information['criteria_achieved'];
336
+				$expected_outcome = $crit_information['expected_outcome'];
328 337
 
329 338
 
330 339
 				$out_att[$outcome_id] += 1;
331 340
 
332
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
341
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
333 342
 					$out_ach[$outcome_id] += 1;
334 343
 				}
335 344
 			}

+ 35
- 16
app/models/School.php View File

@@ -80,11 +80,12 @@ class School extends Eloquent
80 80
 			->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
81 81
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
82 82
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
83
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
83 84
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
84 85
 			->whereIn('courses.program_id', $this->undergraduate_programs->lists('id'))
85 86
 			->whereIn('semester_id', Session::get('semesters_ids'))
86 87
 			->where('semesters.is_visible', '=', 1)
87
-			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
88
+			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
88 89
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
89 90
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
90 91
 
@@ -107,10 +108,11 @@ class School extends Eloquent
107 108
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
108 109
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
109 110
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
111
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
110 112
 			->whereIn('courses.program_id', $this->graduate_programs->lists('id'))
111 113
 			->whereIn('semester_id', Session::get('semesters_ids'))
112 114
 			->where('semesters.is_visible', '=', 1)
113
-			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
115
+			->select('student_id', 'courses.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
114 116
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
115 117
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
116 118
 
@@ -162,6 +164,7 @@ class School extends Eloquent
162 164
 		foreach ($undergraduate_students as $result) {
163 165
 			$crit_att = $result->criteria_attempted;
164 166
 			$crit_ach = $result->criteria_achieved;
167
+			$expected_outcome = $result->expected_outcome;
165 168
 
166 169
 			$program_id = $result->program_id;
167 170
 
@@ -175,7 +178,7 @@ class School extends Eloquent
175 178
 
176 179
 
177 180
 
178
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
181
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
179 182
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
180 183
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
181 184
 				}
@@ -205,6 +208,7 @@ class School extends Eloquent
205 208
 		foreach ($graduate_students as $result) {
206 209
 			$crit_att = $result->criteria_attempted;
207 210
 			$crit_ach = $result->criteria_achieved;
211
+			$expected_outcome = $result->expected_outcome;
208 212
 
209 213
 			$program_id = $result->program_id;
210 214
 
@@ -216,7 +220,7 @@ class School extends Eloquent
216 220
 
217 221
 			$grad_out_att[$result->outcome_id] += 1;
218 222
 
219
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
223
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
220 224
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
221 225
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
222 226
 				}
@@ -254,6 +258,7 @@ class School extends Eloquent
254 258
 		foreach ($undergraduate_students as $result) {
255 259
 			$student_id = $result->student_id;
256 260
 			$outcome_id = $result->outcome_id;
261
+			$expected_outcome = $result->expected_outcome;
257 262
 			if (isset($combined_outcomes[$outcome_id]))
258 263
 				$outcome_id = $combined_outcomes[$outcome_id];
259 264
 
@@ -270,6 +275,7 @@ class School extends Eloquent
270 275
 				$the_processed_table[$student_id][$outcome_id] = array(
271 276
 					"criteria_attempted" => $result->criteria_attempted,
272 277
 					"criteria_achieved" => $result->criteria_achieved,
278
+					'expected_outcome' => $expected_outcome,
273 279
 					"program_id" => $result->program_id
274 280
 				);
275 281
 			}
@@ -287,6 +293,7 @@ class School extends Eloquent
287 293
 				$crit_att = $crit_information['criteria_attempted'];
288 294
 				$crit_ach = $crit_information['criteria_achieved'];
289 295
 				$program_id = $crit_information['program_id'];
296
+				$expected_outcome = $crit_information['expected_outcome'];
290 297
 
291 298
 
292 299
 				$under_out_att[$outcome_id] += 1;
@@ -298,7 +305,7 @@ class School extends Eloquent
298 305
 
299 306
 				$program_out_att[$outcome_id][$program_id] += 1;
300 307
 
301
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
308
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
302 309
 					if (!isset($program_out_ach[$outcome_id][$program_id])) {
303 310
 						$program_out_ach[$outcome_id][$program_id] = 0;
304 311
 					}
@@ -330,6 +337,7 @@ class School extends Eloquent
330 337
 		foreach ($graduate_students as $result) {
331 338
 			$student_id = $result->student_id;
332 339
 			$outcome_id = $result->outcome_id;
340
+			$expected_outcome = $result->expected_outcome;
333 341
 			if (isset($combined_outcomes[$outcome_id]))
334 342
 				$outcome_id = $combined_outcomes[$outcome_id];
335 343
 
@@ -346,6 +354,7 @@ class School extends Eloquent
346 354
 				$the_processed_table[$student_id][$outcome_id] = array(
347 355
 					"criteria_attempted" => $result->criteria_attempted,
348 356
 					"criteria_achieved" => $result->criteria_achieved,
357
+					'expected_outcome' => $expected_outcome,
349 358
 					'program_id' => $result->program_id
350 359
 				);
351 360
 			}
@@ -365,6 +374,7 @@ class School extends Eloquent
365 374
 				$crit_att = $crit_information['criteria_attempted'];
366 375
 				$crit_ach = $crit_information['criteria_achieved'];
367 376
 				$program_id = $crit_information['program_id'];
377
+				$expected_outcome = $crit_information['expected_outcome'];
368 378
 
369 379
 
370 380
 				$grad_out_att[$out_id] += 1;
@@ -375,7 +385,7 @@ class School extends Eloquent
375 385
 
376 386
 				$program_out_att[$out_id][$program_id] += 1;
377 387
 
378
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
388
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
379 389
 					if (!isset($program_out_ach[$out_id][$program_id])) {
380 390
 						$program_out_ach[$out_id][$program_id] = 0;
381 391
 					}
@@ -418,10 +428,11 @@ class School extends Eloquent
418 428
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
419 429
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
420 430
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
431
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
421 432
 			->whereIn('students.program_id', $this->undergraduate_programs->lists('id'))
422 433
 			->whereIn('semester_id', Session::get('semesters_ids'))
423 434
 			->where('semesters.is_visible', '=', 1)
424
-			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
435
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
425 436
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
426 437
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
427 438
 
@@ -444,10 +455,11 @@ class School extends Eloquent
444 455
 			->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
445 456
 			->join('rubrics', 'rubrics.id', '=', 'rubric_activity.rubric_id')
446 457
 			->join('semesters', 'semesters.id', '=', 'courses.semester_id')
458
+			->join('outcomes', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
447 459
 			->whereIn('students.program_id', $this->graduate_programs->lists('id'))
448 460
 			->whereIn('semester_id', Session::get('semesters_ids'))
449 461
 			->where('semesters.is_visible', '=', 1)
450
-			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
462
+			->select('student_id', 'students.program_id', 'semesters.code', 'outcome_id', 'outcomes.expected_outcome', 'criterion_objective_outcome.criterion_id', 'score', 'expected_points')
451 463
 			->addSelect(DB::raw("count(activity_criterion.criterion_id) as criteria_attempted"))
452 464
 			->addSelect(DB::raw("count(CASE WHEN score>= expected_points then 1 else null END) as criteria_achieved"))
453 465
 
@@ -499,6 +511,8 @@ class School extends Eloquent
499 511
 		foreach ($undergraduate_students as $result) {
500 512
 			$crit_att = $result->criteria_attempted;
501 513
 			$crit_ach = $result->criteria_achieved;
514
+			$expected_outcome = $result->expected_outcome;
515
+
502 516
 
503 517
 			$program_id = $result->program_id;
504 518
 
@@ -512,7 +526,7 @@ class School extends Eloquent
512 526
 
513 527
 
514 528
 
515
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
529
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
516 530
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
517 531
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
518 532
 				}
@@ -542,6 +556,7 @@ class School extends Eloquent
542 556
 		foreach ($graduate_students as $result) {
543 557
 			$crit_att = $result->criteria_attempted;
544 558
 			$crit_ach = $result->criteria_achieved;
559
+			$expected_outcome = $result->expected_outcome;
545 560
 
546 561
 			$program_id = $result->program_id;
547 562
 
@@ -553,7 +568,7 @@ class School extends Eloquent
553 568
 
554 569
 			$grad_out_att[$result->outcome_id] += 1;
555 570
 
556
-			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
571
+			if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
557 572
 				if (!isset($program_out_ach[$result->outcome_id][$program_id])) {
558 573
 					$program_out_ach[$result->outcome_id][$program_id] = 0;
559 574
 				}
@@ -591,6 +606,7 @@ class School extends Eloquent
591 606
 		foreach ($undergraduate_students as $result) {
592 607
 			$student_id = $result->student_id;
593 608
 			$outcome_id = $result->outcome_id;
609
+			$expected_outcome = $result->expected_outcome;
594 610
 			if (isset($combined_outcomes[$outcome_id]))
595 611
 				$outcome_id = $combined_outcomes[$outcome_id];
596 612
 
@@ -607,7 +623,8 @@ class School extends Eloquent
607 623
 				$the_processed_table[$student_id][$outcome_id] = array(
608 624
 					"criteria_attempted" => $result->criteria_attempted,
609 625
 					"criteria_achieved" => $result->criteria_achieved,
610
-					"program_id" => $result->program_id
626
+					"program_id" => $result->program_id,
627
+					'expected_outcome' => $expected_outcome
611 628
 				);
612 629
 			}
613 630
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -624,6 +641,7 @@ class School extends Eloquent
624 641
 				$crit_att = $crit_information['criteria_attempted'];
625 642
 				$crit_ach = $crit_information['criteria_achieved'];
626 643
 				$program_id = $crit_information['program_id'];
644
+				$expected_outcome = $crit_information['expected_outcome'];
627 645
 
628 646
 
629 647
 				$under_out_att[$outcome_id] += 1;
@@ -635,7 +653,7 @@ class School extends Eloquent
635 653
 
636 654
 				$program_out_att[$outcome_id][$program_id] += 1;
637 655
 
638
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
656
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
639 657
 					if (!isset($program_out_ach[$outcome_id][$program_id])) {
640 658
 						$program_out_ach[$outcome_id][$program_id] = 0;
641 659
 					}
@@ -667,6 +685,7 @@ class School extends Eloquent
667 685
 		foreach ($graduate_students as $result) {
668 686
 			$student_id = $result->student_id;
669 687
 			$outcome_id = $result->outcome_id;
688
+			$expected_outcome = $result->expected_outcome;
670 689
 			if (isset($combined_outcomes[$outcome_id]))
671 690
 				$outcome_id = $combined_outcomes[$outcome_id];
672 691
 
@@ -683,7 +702,8 @@ class School extends Eloquent
683 702
 				$the_processed_table[$student_id][$outcome_id] = array(
684 703
 					"criteria_attempted" => $result->criteria_attempted,
685 704
 					"criteria_achieved" => $result->criteria_achieved,
686
-					'program_id' => $result->program_id
705
+					'program_id' => $result->program_id,
706
+					'expected_outcome' => $expected_outcome
687 707
 				);
688 708
 			}
689 709
 			//si este estudiante está pareado a este dominio, significa que ahora estoy en los
@@ -702,8 +722,7 @@ class School extends Eloquent
702 722
 				$crit_att = $crit_information['criteria_attempted'];
703 723
 				$crit_ach = $crit_information['criteria_achieved'];
704 724
 				$program_id = $crit_information['program_id'];
705
-
706
-
725
+				$expected_outcome = $crit_information['expected_outcome'];
707 726
 				$grad_out_att[$out_id] += 1;
708 727
 
709 728
 				if (!isset($program_out_att[$out_id][$program_id])) {
@@ -712,7 +731,7 @@ class School extends Eloquent
712 731
 
713 732
 				$program_out_att[$out_id][$program_id] += 1;
714 733
 
715
-				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= 66.67) {
734
+				if ($crit_att != 0 && ($crit_ach / $crit_att) * 100 >= $expected_outcome) {
716 735
 					if (!isset($program_out_ach[$out_id][$program_id])) {
717 736
 						$program_out_ach[$out_id][$program_id] = 0;
718 737
 					}

+ 3
- 0
app/routes.php View File

@@ -541,7 +541,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
541 541
         Route::post('typ/getObjectives', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@getObjectivesForTYP'));
542 542
         Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
543 543
         Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
544
+
544 545
         Route::post('createAnnualPlan/{program_id}', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@createAnnualPlan'));
546
+        Route::post('verifyAndCreate/{program_id}', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@verifyAndCreate'));
545 547
     });
546 548
 
547 549
 
@@ -662,6 +664,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
662 664
         Route::post('typ/updateOutcomeSemsters', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@typ_update_outcomes_semesters'));
663 665
         Route::post('typ/update', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@update_typ_outcomes_semesters'));
664 666
         Route::post('createAnnualPlan/{program_id}', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@createAnnualPlan'));
667
+        Route::post('verifyAndCreate/{program_id}', array('before' => 'csrf', 'uses' => 'ThreeYearPlanController@verifyAndCreate'));
665 668
     });
666 669
 
667 670
 

+ 1
- 1
app/views/annual_htmls/report-on-10-10-2022-for-15-by-5478.blade.php View File

@@ -125,7 +125,7 @@
125 125
                 70.00%
126 126
             <p class="outcome-text">Results for Content Knowledge, Skills or Dispositions in the academic program learning outcomes
127 127
 
128
-                                    <em style="color: red">66.67% </em>
128
+                                    <em style="color: red">66.66% </em>
129 129
                 
130 130
             </p>
131 131
             <hr>

+ 78
- 7
app/views/global/view-three-year-plan.blade.php View File

@@ -309,6 +309,24 @@
309 309
             </div>
310 310
         </div>
311 311
 
312
+        <div id="VerifyModal" class="modal fade" tabindex="-1" data-criterion-id="0">
313
+            <div class="modal-dialog">
314
+                <div class="modal-content">
315
+                    <div class="modal-header" style="background-color: rgba(247, 83, 6, 0.817)">
316
+                        <h5 class="modal-title">There is some information missing</h5>
317
+                        <button type="button" class="close" data-dismiss="modal">&times;</button>
318
+                    </div>
319
+                    <div class="modal-body" id = "VerifyBody">
320
+
321
+                    </div>
322
+                    <div class="modal-footer">
323
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" >Ok</button>
324
+                        
325
+                    </div>
326
+                </div>
327
+            </div>
328
+        </div>
329
+
312 330
     </div>
313 331
     <script>
314 332
         $(document).ready(function() {
@@ -425,13 +443,63 @@
425 443
             $('.go-to-temp').on('click', function() {
426 444
                 typ_id =$('#table-cycles').data('typ-id');
427 445
                 $.post(
428
-                    "{{ URL::action('ThreeYearPlanController@createAnnualPlan', [$program_id]) }}", {
446
+                    "{{ URL::action('ThreeYearPlanController@verifyAndCreate', [$program_id]) }}", {
429 447
                         typ_id: typ_id
430 448
                     },
431
-                    function() {
449
+                    function(informationMissing) {
450
+
451
+                        if(informationMissing.length == 0){
432 452
                         
433 453
                         window.open("{{ URL::action('ThreeYearPlanController@printPlan', [$program_id]) }}"+"/"+typ_id+"/1", '_blank');
434 454
                         $('#SubmitModal').modal('show');
455
+                        }
456
+                        else{
457
+                            $("#VerifyBody").html('<h3>These are the fields that are missing</h3>');
458
+
459
+                            if(informationMissing.objectives_missing !== undefined){
460
+                                $("#VerifyBody").append("<h4>These Outcomes need Objectives paired.</h4>")
461
+                                
462
+                                $.each(informationMissing.objectives_missing, function(ob_id, semester_object){
463
+                                    name = "<h5>"+semester_object.semester_name+"</h5>";
464
+                          
465
+                                    ul = $('<ul>');
466
+
467
+                                    $.each(semester_object.outcome_text, function(ind, outcome){
468
+                                        li = $('<li>').html(outcome)
469
+                                        ul.append(li);
470
+                                    })
471
+                                    $('#VerifyBody').append(name);
472
+                                    $("#VerifyBody").append(ul);
473
+                                });
474
+                            }
475
+                            if(informationMissing.courses_missing !== undefined){
476
+                                $("#VerifyBody").append("<h4>These Objectives need Courses. </h4>")
477
+                                
478
+                                $.each(informationMissing.courses_missing, function(ob_id, semester_object){
479
+                                    name = "<h5>" + semester_object.semester_name +"</h5>";
480
+                                    ul = $('<ul>');
481
+
482
+                                    $.each(semester_object.outcomes, function(ind, outcome){
483
+                                        li = $('<li>').html(outcome.outcome_name);
484
+                                        
485
+                                        nested_ul = $('<ul>');
486
+                                        $.each(outcome.objectives, function(ind, ob){
487
+                                            nested_li = $("<li>").html(ob);
488
+                                            nested_ul.append(nested_li);
489
+                                        });
490
+                                        li.append(nested_ul);
491
+                                        
492
+
493
+                                        ul.append(li);
494
+                                    })
495
+                                    $('#VerifyBody').append(name);
496
+                                    $("#VerifyBody").append(ul);
497
+                                });
498
+                            }
499
+
500
+                            $("#VerifyModal").modal('show');
501
+
502
+                        }
435 503
                        // window.location.href = "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
436 504
                             
437 505
 
@@ -890,6 +958,8 @@
890 958
 
891 959
             var options_values = $(this).parent().find('select').val().split('-');
892 960
 
961
+            var ob_selector = $(this).parent();
962
+
893 963
             //if == 3 then we are in the objective selector
894 964
             if (options_values.length == 3) {
895 965
 
@@ -905,7 +975,7 @@
905 975
                 //variable that holds value of wether the objective-selector-0 is hidden or not
906 976
                 var objective_selector_0_hidden = $(this).parent().parent().find('.objective-selector-0').is(
907 977
                     ':hidden');
908
-
978
+                /*
909 979
                 if (count_objective_selectors_total == 1 || (count_objective_selectors_total == 2 &&
910 980
                         objective_selector_0_hidden)) {
911 981
                     //if there is only one objective-selector,throw an alert and do nothing
@@ -918,7 +988,7 @@
918 988
 
919 989
 
920 990
                     return true;
921
-                }
991
+                }*/
922 992
                 //subtract 1 from count_objective_selectors_total
923 993
 
924 994
                 var typ_id = $('#table-cycles').data('typ-id');
@@ -976,7 +1046,7 @@
976 1046
                 var objective_selector_0_hidden = $(this).parent().parent().find('.objective-selector-0').is(
977 1047
                     ':hidden');
978 1048
 
979
-                if (count_objective_selectors_total == 1 || (count_objective_selectors_total == 2 &&
1049
+                /*if (count_objective_selectors_total == 1 || (count_objective_selectors_total == 2 &&
980 1050
                         objective_selector_0_hidden)) {
981 1051
                     //if there is only one objective-selector,throw an alert and do nothing
982 1052
 
@@ -985,7 +1055,7 @@
985 1055
                         '<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>You must have at least one Course </div>'
986 1056
                     );
987 1057
                     return true;
988
-                }
1058
+                }*/
989 1059
                 //subtract 1 from count_objective_selectors_total
990 1060
 
991 1061
                 var typ_id = $('#table-cycles').data('typ-id');
@@ -1004,7 +1074,8 @@
1004 1074
                         outcome_id: (outcome_id),
1005 1075
                         semester_id: (semester_id),
1006 1076
                         objective_id: (objective_id),
1007
-                        new_course_id: (new_course_id)
1077
+                        new_course_id: (new_course_id),
1078
+                        program_id:{{$program_id}}
1008 1079
                     },
1009 1080
                     function(data) {
1010 1081
                         //

+ 2
- 2
app/views/local/managers/admins/new_assessment_report.blade.php View File

@@ -277,7 +277,7 @@
277 277
                                                 <br>
278 278
 
279 279
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
280
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
280
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
281 281
                                                 </p>
282 282
                                                 <br>
283 283
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students
@@ -516,7 +516,7 @@
516 516
                                                 <br>
517 517
 
518 518
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
519
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
519
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
520 520
                                                 </p>
521 521
                                                 <br>
522 522
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students

+ 2
- 2
app/views/local/managers/pCoords/new_assessment_report.blade.php View File

@@ -251,7 +251,7 @@
251 251
                                     <br>
252 252
                                     <br>
253 253
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
254
-                                    <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
254
+                                    <p style="display: inline; margin:-30px;"> <i>>= 66.66% of the attempts</i>
255 255
                                     </p>
256 256
                                     <br>
257 257
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
@@ -473,7 +473,7 @@
473 473
                                     <br>
474 474
                                     <br>
475 475
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
476
-                                    <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
476
+                                    <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
477 477
                                     </p>
478 478
                                     <br>
479 479
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

+ 2
- 2
app/views/local/managers/sCoords/new_assessment_report.blade.php View File

@@ -278,7 +278,7 @@
278 278
                                                 <br>
279 279
                                                 <br>
280 280
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
281
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
281
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
282 282
                                                 </p>
283 283
                                                 <br>
284 284
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students
@@ -515,7 +515,7 @@
515 515
                                                 <br>
516 516
                                                 <br>
517 517
                                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
518
-                                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
518
+                                                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
519 519
                                                 </p>
520 520
                                                 <br>
521 521
                                                 <h5 style="display: inline; margin:30px;">Expected percent of students

+ 2
- 2
app/views/local/managers/shared/print_school.blade.php View File

@@ -344,7 +344,7 @@ $(function () {
344 344
             
345 345
         @if(isset($default_grad))
346 346
             plotLines:[{
347
-        value:66.67,
347
+        value:70,
348 348
         color: '#000',
349 349
         width:3,
350 350
         zIndex:4,
@@ -494,7 +494,7 @@ $(function () {
494 494
             }, 
495 495
         @if(isset($default_undergrad))
496 496
             plotLines:[{
497
-        value:66.67,
497
+        value:70,
498 498
         color: '#000',
499 499
         width:3,
500 500
         zIndex:4,

+ 1
- 1
app/views/local/managers/shared/program.blade.php View File

@@ -264,7 +264,7 @@ text: 'Percentage'
264 264
 },
265 265
 @if($program->expected_outcome_target == null)
266 266
                 plotLines:[{
267
-            value:66.67,
267
+            value:70,
268 268
             color: '#000',
269 269
             width:3,
270 270
             zIndex:4,

+ 2
- 2
app/views/local/managers/shared/school.blade.php View File

@@ -530,7 +530,7 @@ $(function () {
530 530
                 }, 
531 531
             @if(isset($default_undergrad))
532 532
                 plotLines:[{
533
-            value:66.67,
533
+            value:70,
534 534
             color: '#000',
535 535
             width:3,
536 536
             zIndex:4,
@@ -832,7 +832,7 @@ $(function () {
832 832
                 }, 
833 833
                 @if(isset($default_undergrad))
834 834
                     plotLines:[{
835
-                value:66.67,
835
+                value:70,
836 836
                 color: '#000',
837 837
                 width:3,
838 838
                 zIndex:4,

+ 2
- 2
app/views/local/professors/compare_activities.blade.php View File

@@ -263,7 +263,7 @@
263 263
 
264 264
                 <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
265 265
                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
266
-                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
266
+                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
267 267
                 </p>
268 268
                 <br>
269 269
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
@@ -488,7 +488,7 @@
488 488
 
489 489
                 <h4>Performance of Students by Learning Outcome</h4>
490 490
                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
491
-                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
491
+                <p style="display: inline;"> <i>>= 66.66% of the attempts</i>
492 492
                 </p>
493 493
                 <br>
494 494
                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

+ 2
- 2
app/views/local/professors/new_assessment_report.blade.php View File

@@ -261,7 +261,7 @@
261 261
                                 <br>
262 262
                                 <br>
263 263
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
264
-                                <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
264
+                                <p style="display: inline; margin:-30px;"> <i>>= 66.66% of the attempts</i>
265 265
                                 </p>
266 266
                                 <br>
267 267
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
@@ -494,7 +494,7 @@
494 494
                                 <!--                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5> -->
495 495
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
496 496
                                 <!--                                 <p style="display: inline;">  -->
497
-                                <i>>= 66.67% of the attempts</i>
497
+                                <i>>= 66.66% of the attempts</i>
498 498
                                 <!--                                 </p> -->
499 499
                                 <br>
500 500
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the

+ 711
- 0
app/views/three_year_plan_htmls/15-11-2022-for-1045-by-5478.blade.php View File

@@ -0,0 +1,711 @@
1
+<html><head></head><body id="theDocument"><style type="text/css">
2
+    body
3
+    {
4
+        font-family: "Arial", sans-serif;
5
+        width:90%;
6
+        margin: 0 auto;
7
+    }
8
+    .header-text
9
+    {
10
+        text-align:center;
11
+        font-weight: bold;
12
+        margin:0;
13
+    }
14
+
15
+    h1.header-text
16
+    {
17
+      margin: 15px auto;
18
+      width:75%;
19
+      font-size: 25px;
20
+    }
21
+
22
+    table
23
+    {
24
+        border-collapse: collapse;
25
+        border: 1px solid black;
26
+        width: 100%;
27
+        margin: 30px auto;
28
+        font-size:1.5vw;
29
+    }
30
+    td, th
31
+    {
32
+        border: 1px solid black;
33
+        padding: 5px;
34
+    }
35
+
36
+    .activity-name-row
37
+    {
38
+      background:black;
39
+      color:white;
40
+    }
41
+
42
+    .activity-headers-row
43
+    {
44
+      background:lightgrey;
45
+      font-weight:bold;
46
+    }
47
+
48
+    .report-info
49
+    {
50
+      margin:5px 0;
51
+      font-size: 16px;
52
+    }
53
+
54
+    .criterion-field
55
+    {
56
+      text-align:left;
57
+    }
58
+
59
+    .score-field, .total, .percentage
60
+    {
61
+      text-align:center;
62
+    }
63
+
64
+    .header
65
+    {
66
+      margin: 30px 0;
67
+    }
68
+
69
+    .content
70
+    {
71
+      font-size: 12px;
72
+    }
73
+
74
+    .logo
75
+    {
76
+      position:absolute;
77
+      right:0;
78
+      top: 30px;
79
+      width: 100px;
80
+    }
81
+
82
+    ol{
83
+      list-style-type:none;
84
+    }
85
+
86
+    @media print{@page {size: landscape}}
87
+</style><style type="text/css" media="print">
88
+	  @page { size: landscape; }
89
+	</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
90
+
91
+<div class="header">
92
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
93
+    <p class="header-text">Online Learning Assessment System</p>
94
+
95
+    <h1 class="header-text">Three Year Plan for Programa general de Prueba from 2022 to
96
+        2025</h1>
97
+</div>
98
+
99
+
100
+
101
+    <br>
102
+    <br>
103
+    <h2 class='header-text'>First Semester 2022-2023</h2>
104
+    <br>
105
+                  <span>
106
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
107
+        </span>
108
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
109
+            <thead>
110
+                <tr>
111
+
112
+                    <th>Objectives</th>
113
+                    <th>Courses</th>
114
+
115
+                </tr>
116
+            </thead>
117
+            <tbody>
118
+
119
+                                    <tr>
120
+
121
+                        <td>
122
+                            1. MEra wo vamos a ver
123
+                        </td>
124
+                        <td>
125
+                            <ol>
126
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
127
+                                                            </ol>
128
+                        </td>
129
+
130
+                    </tr>
131
+                                    <tr>
132
+
133
+                        <td>
134
+                            2. Pero te la saco
135
+                        </td>
136
+                        <td>
137
+                            <ol>
138
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
139
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
140
+                                                            </ol>
141
+                        </td>
142
+
143
+                    </tr>
144
+                
145
+            </tbody>
146
+        </table>
147
+        <br>
148
+        <br>
149
+                    <br>
150
+    <br>
151
+    <h2 class='header-text'>Second Semester 2022-2023</h2>
152
+    <br>
153
+                  <span>
154
+            <h3>Critical Thinking</h3>
155
+        </span>
156
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
157
+            <thead>
158
+                <tr>
159
+
160
+                    <th>Objectives</th>
161
+                    <th>Courses</th>
162
+
163
+                </tr>
164
+            </thead>
165
+            <tbody>
166
+
167
+                                    <tr>
168
+
169
+                        <td>
170
+                            1. MEra wo vamos a ver
171
+                        </td>
172
+                        <td>
173
+                            <ol>
174
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
175
+                                                            </ol>
176
+                        </td>
177
+
178
+                    </tr>
179
+                
180
+            </tbody>
181
+        </table>
182
+        <br>
183
+        <br>
184
+                              <span>
185
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
186
+        </span>
187
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
188
+            <thead>
189
+                <tr>
190
+
191
+                    <th>Objectives</th>
192
+                    <th>Courses</th>
193
+
194
+                </tr>
195
+            </thead>
196
+            <tbody>
197
+
198
+                                    <tr>
199
+
200
+                        <td>
201
+                            1. MEra wo vamos a ver
202
+                        </td>
203
+                        <td>
204
+                            <ol>
205
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
206
+                                                            </ol>
207
+                        </td>
208
+
209
+                    </tr>
210
+                                    <tr>
211
+
212
+                        <td>
213
+                            2. Pero te la saco
214
+                        </td>
215
+                        <td>
216
+                            <ol>
217
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
218
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
219
+                                                            </ol>
220
+                        </td>
221
+
222
+                    </tr>
223
+                
224
+            </tbody>
225
+        </table>
226
+        <br>
227
+        <br>
228
+                    <br>
229
+    <br>
230
+    <h2 class='header-text'>First Semester 2023-2024</h2>
231
+    <br>
232
+                  <span>
233
+            <h3>Critical Thinking</h3>
234
+        </span>
235
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
236
+            <thead>
237
+                <tr>
238
+
239
+                    <th>Objectives</th>
240
+                    <th>Courses</th>
241
+
242
+                </tr>
243
+            </thead>
244
+            <tbody>
245
+
246
+                                    <tr>
247
+
248
+                        <td>
249
+                            1. MEra wo vamos a ver
250
+                        </td>
251
+                        <td>
252
+                            <ol>
253
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
254
+                                                            </ol>
255
+                        </td>
256
+
257
+                    </tr>
258
+                
259
+            </tbody>
260
+        </table>
261
+        <br>
262
+        <br>
263
+                              <span>
264
+            <h3>Effective Communication Skills</h3>
265
+        </span>
266
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
267
+            <thead>
268
+                <tr>
269
+
270
+                    <th>Objectives</th>
271
+                    <th>Courses</th>
272
+
273
+                </tr>
274
+            </thead>
275
+            <tbody>
276
+
277
+                                    <tr>
278
+
279
+                        <td>
280
+                            1. MEra wo vamos a ver
281
+                        </td>
282
+                        <td>
283
+                            <ol>
284
+                                                                    <li>[INGL3212] INGLES AVANZADO II</li>
285
+                                                            </ol>
286
+                        </td>
287
+
288
+                    </tr>
289
+                
290
+            </tbody>
291
+        </table>
292
+        <br>
293
+        <br>
294
+                              <span>
295
+            <h3>Information Literacy</h3>
296
+        </span>
297
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
298
+            <thead>
299
+                <tr>
300
+
301
+                    <th>Objectives</th>
302
+                    <th>Courses</th>
303
+
304
+                </tr>
305
+            </thead>
306
+            <tbody>
307
+
308
+                                    <tr>
309
+
310
+                        <td>
311
+                            1. MEra wo vamos a ver
312
+                        </td>
313
+                        <td>
314
+                            <ol>
315
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
316
+                                                            </ol>
317
+                        </td>
318
+
319
+                    </tr>
320
+                                    <tr>
321
+
322
+                        <td>
323
+                            2. Pero te la saco
324
+                        </td>
325
+                        <td>
326
+                            <ol>
327
+                                                                    <li>[INGL3012] INGLES DE HONOR II</li>
328
+                                                            </ol>
329
+                        </td>
330
+
331
+                    </tr>
332
+                
333
+            </tbody>
334
+        </table>
335
+        <br>
336
+        <br>
337
+                    <br>
338
+    <br>
339
+    <h2 class='header-text'>Second Semester 2023-2024</h2>
340
+    <br>
341
+                  <span>
342
+            <h3>Effective Communication Skills</h3>
343
+        </span>
344
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
345
+            <thead>
346
+                <tr>
347
+
348
+                    <th>Objectives</th>
349
+                    <th>Courses</th>
350
+
351
+                </tr>
352
+            </thead>
353
+            <tbody>
354
+
355
+                                    <tr>
356
+
357
+                        <td>
358
+                            1. MEra wo vamos a ver
359
+                        </td>
360
+                        <td>
361
+                            <ol>
362
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
363
+                                                            </ol>
364
+                        </td>
365
+
366
+                    </tr>
367
+                
368
+            </tbody>
369
+        </table>
370
+        <br>
371
+        <br>
372
+                              <span>
373
+            <h3>Information Literacy</h3>
374
+        </span>
375
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
376
+            <thead>
377
+                <tr>
378
+
379
+                    <th>Objectives</th>
380
+                    <th>Courses</th>
381
+
382
+                </tr>
383
+            </thead>
384
+            <tbody>
385
+
386
+                                    <tr>
387
+
388
+                        <td>
389
+                            1. MEra wo vamos a ver
390
+                        </td>
391
+                        <td>
392
+                            <ol>
393
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
394
+                                                            </ol>
395
+                        </td>
396
+
397
+                    </tr>
398
+                                    <tr>
399
+
400
+                        <td>
401
+                            2. Pero te la saco
402
+                        </td>
403
+                        <td>
404
+                            <ol>
405
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
406
+                                                            </ol>
407
+                        </td>
408
+
409
+                    </tr>
410
+                
411
+            </tbody>
412
+        </table>
413
+        <br>
414
+        <br>
415
+                              <span>
416
+            <h3>Logical-mathematical reasoning </h3>
417
+        </span>
418
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
419
+            <thead>
420
+                <tr>
421
+
422
+                    <th>Objectives</th>
423
+                    <th>Courses</th>
424
+
425
+                </tr>
426
+            </thead>
427
+            <tbody>
428
+
429
+                                    <tr>
430
+
431
+                        <td>
432
+                            1. MEra wo vamos a ver
433
+                        </td>
434
+                        <td>
435
+                            <ol>
436
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
437
+                                                            </ol>
438
+                        </td>
439
+
440
+                    </tr>
441
+                
442
+            </tbody>
443
+        </table>
444
+        <br>
445
+        <br>
446
+                              <span>
447
+            <h3>Research and Creation</h3>
448
+        </span>
449
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
450
+            <thead>
451
+                <tr>
452
+
453
+                    <th>Objectives</th>
454
+                    <th>Courses</th>
455
+
456
+                </tr>
457
+            </thead>
458
+            <tbody>
459
+
460
+                                    <tr>
461
+
462
+                        <td>
463
+                            1. MEra wo vamos a ver
464
+                        </td>
465
+                        <td>
466
+                            <ol>
467
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
468
+                                                            </ol>
469
+                        </td>
470
+
471
+                    </tr>
472
+                                    <tr>
473
+
474
+                        <td>
475
+                            2. Pero te la saco
476
+                        </td>
477
+                        <td>
478
+                            <ol>
479
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
480
+                                                            </ol>
481
+                        </td>
482
+
483
+                    </tr>
484
+                
485
+            </tbody>
486
+        </table>
487
+        <br>
488
+        <br>
489
+                    <br>
490
+    <br>
491
+    <h2 class='header-text'>First Semester 2024-2025</h2>
492
+    <br>
493
+                  <span>
494
+            <h3>Research and Creation</h3>
495
+        </span>
496
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
497
+            <thead>
498
+                <tr>
499
+
500
+                    <th>Objectives</th>
501
+                    <th>Courses</th>
502
+
503
+                </tr>
504
+            </thead>
505
+            <tbody>
506
+
507
+                                    <tr>
508
+
509
+                        <td>
510
+                            1. MEra wo vamos a ver
511
+                        </td>
512
+                        <td>
513
+                            <ol>
514
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
515
+                                                            </ol>
516
+                        </td>
517
+
518
+                    </tr>
519
+                                    <tr>
520
+
521
+                        <td>
522
+                            2. Pero te la saco
523
+                        </td>
524
+                        <td>
525
+                            <ol>
526
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
527
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
528
+                                                            </ol>
529
+                        </td>
530
+
531
+                    </tr>
532
+                
533
+            </tbody>
534
+        </table>
535
+        <br>
536
+        <br>
537
+                              <span>
538
+            <h3>Logical-mathematical reasoning </h3>
539
+        </span>
540
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
541
+            <thead>
542
+                <tr>
543
+
544
+                    <th>Objectives</th>
545
+                    <th>Courses</th>
546
+
547
+                </tr>
548
+            </thead>
549
+            <tbody>
550
+
551
+                                    <tr>
552
+
553
+                        <td>
554
+                            1. MEra wo vamos a ver
555
+                        </td>
556
+                        <td>
557
+                            <ol>
558
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
559
+                                                            </ol>
560
+                        </td>
561
+
562
+                    </tr>
563
+                
564
+            </tbody>
565
+        </table>
566
+        <br>
567
+        <br>
568
+                              <span>
569
+            <h3>Social Responsibility</h3>
570
+        </span>
571
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
572
+            <thead>
573
+                <tr>
574
+
575
+                    <th>Objectives</th>
576
+                    <th>Courses</th>
577
+
578
+                </tr>
579
+            </thead>
580
+            <tbody>
581
+
582
+                                    <tr>
583
+
584
+                        <td>
585
+                            1. MEra wo vamos a ver
586
+                        </td>
587
+                        <td>
588
+                            <ol>
589
+                                                                    <li>[INGL3212] INGLES AVANZADO II</li>
590
+                                                            </ol>
591
+                        </td>
592
+
593
+                    </tr>
594
+                
595
+            </tbody>
596
+        </table>
597
+        <br>
598
+        <br>
599
+                              <span>
600
+            <h3>Technology</h3>
601
+        </span>
602
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
603
+            <thead>
604
+                <tr>
605
+
606
+                    <th>Objectives</th>
607
+                    <th>Courses</th>
608
+
609
+                </tr>
610
+            </thead>
611
+            <tbody>
612
+
613
+                                    <tr>
614
+
615
+                        <td>
616
+                            1. MEra wo vamos a ver
617
+                        </td>
618
+                        <td>
619
+                            <ol>
620
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
621
+                                                            </ol>
622
+                        </td>
623
+
624
+                    </tr>
625
+                
626
+            </tbody>
627
+        </table>
628
+        <br>
629
+        <br>
630
+                    <br>
631
+    <br>
632
+    <h2 class='header-text'>Second Semester 2024-2025</h2>
633
+    <br>
634
+                  <span>
635
+            <h3>Social Responsibility</h3>
636
+        </span>
637
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
638
+            <thead>
639
+                <tr>
640
+
641
+                    <th>Objectives</th>
642
+                    <th>Courses</th>
643
+
644
+                </tr>
645
+            </thead>
646
+            <tbody>
647
+
648
+                                    <tr>
649
+
650
+                        <td>
651
+                            1. MEra wo vamos a ver
652
+                        </td>
653
+                        <td>
654
+                            <ol>
655
+                                                                    <li>[INGL3212] INGLES AVANZADO II</li>
656
+                                                            </ol>
657
+                        </td>
658
+
659
+                    </tr>
660
+                
661
+            </tbody>
662
+        </table>
663
+        <br>
664
+        <br>
665
+                              <span>
666
+            <h3>Technology</h3>
667
+        </span>
668
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
669
+            <thead>
670
+                <tr>
671
+
672
+                    <th>Objectives</th>
673
+                    <th>Courses</th>
674
+
675
+                </tr>
676
+            </thead>
677
+            <tbody>
678
+
679
+                                    <tr>
680
+
681
+                        <td>
682
+                            1. MEra wo vamos a ver
683
+                        </td>
684
+                        <td>
685
+                            <ol>
686
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
687
+                                                            </ol>
688
+                        </td>
689
+
690
+                    </tr>
691
+                
692
+            </tbody>
693
+        </table>
694
+        <br>
695
+        <br>
696
+                 
697
+
698
+
699
+</body></html>
700
+
701
+
702
+<script>
703
+
704
+  
705
+    
706
+  
707
+
708
+
709
+  </script>
710
+
711
+

+ 697
- 0
app/views/three_year_plan_htmls/16-11-2022-for-1045-by-5478.blade.php View File

@@ -0,0 +1,697 @@
1
+<html><head></head><body id="theDocument"><style type="text/css">
2
+    body
3
+    {
4
+        font-family: "Arial", sans-serif;
5
+        width:90%;
6
+        margin: 0 auto;
7
+    }
8
+    .header-text
9
+    {
10
+        text-align:center;
11
+        font-weight: bold;
12
+        margin:0;
13
+    }
14
+
15
+    h1.header-text
16
+    {
17
+      margin: 15px auto;
18
+      width:75%;
19
+      font-size: 25px;
20
+    }
21
+
22
+    table
23
+    {
24
+        border-collapse: collapse;
25
+        border: 1px solid black;
26
+        width: 100%;
27
+        margin: 30px auto;
28
+        font-size:1.5vw;
29
+    }
30
+    td, th
31
+    {
32
+        border: 1px solid black;
33
+        padding: 5px;
34
+    }
35
+
36
+    .activity-name-row
37
+    {
38
+      background:black;
39
+      color:white;
40
+    }
41
+
42
+    .activity-headers-row
43
+    {
44
+      background:lightgrey;
45
+      font-weight:bold;
46
+    }
47
+
48
+    .report-info
49
+    {
50
+      margin:5px 0;
51
+      font-size: 16px;
52
+    }
53
+
54
+    .criterion-field
55
+    {
56
+      text-align:left;
57
+    }
58
+
59
+    .score-field, .total, .percentage
60
+    {
61
+      text-align:center;
62
+    }
63
+
64
+    .header
65
+    {
66
+      margin: 30px 0;
67
+    }
68
+
69
+    .content
70
+    {
71
+      font-size: 12px;
72
+    }
73
+
74
+    .logo
75
+    {
76
+      position:absolute;
77
+      right:0;
78
+      top: 30px;
79
+      width: 100px;
80
+    }
81
+
82
+    ol{
83
+      list-style-type:none;
84
+    }
85
+
86
+    @media print{@page {size: landscape}}
87
+</style><style type="text/css" media="print">
88
+	  @page { size: landscape; }
89
+	</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
90
+
91
+<div class="header">
92
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
93
+    <p class="header-text">Online Learning Assessment System</p>
94
+
95
+    <h1 class="header-text">Three Year Plan for Programa general de Prueba from 2022 to
96
+        2025</h1>
97
+</div>
98
+
99
+
100
+
101
+    <br>
102
+    <br>
103
+    <h2 class='header-text'>First Semester 2022-2023</h2>
104
+    <br>
105
+                  <span>
106
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
107
+        </span>
108
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
109
+            <thead>
110
+                <tr>
111
+
112
+                    <th>Objectives</th>
113
+                    <th>Courses</th>
114
+
115
+                </tr>
116
+            </thead>
117
+            <tbody>
118
+
119
+                                    <tr>
120
+
121
+                        <td>
122
+                            1. Pero te la saco
123
+                        </td>
124
+                        <td>
125
+                            <ol>
126
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
127
+                                                            </ol>
128
+                        </td>
129
+
130
+                    </tr>
131
+                                    <tr>
132
+
133
+                        <td>
134
+                            2. MEra wo vamos a ver
135
+                        </td>
136
+                        <td>
137
+                            <ol>
138
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
139
+                                                            </ol>
140
+                        </td>
141
+
142
+                    </tr>
143
+                
144
+            </tbody>
145
+        </table>
146
+        <br>
147
+        <br>
148
+                    <br>
149
+    <br>
150
+    <h2 class='header-text'>Second Semester 2022-2023</h2>
151
+    <br>
152
+                  <span>
153
+            <h3>Critical Thinking</h3>
154
+        </span>
155
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
156
+            <thead>
157
+                <tr>
158
+
159
+                    <th>Objectives</th>
160
+                    <th>Courses</th>
161
+
162
+                </tr>
163
+            </thead>
164
+            <tbody>
165
+
166
+                                    <tr>
167
+
168
+                        <td>
169
+                            1. MEra wo vamos a ver
170
+                        </td>
171
+                        <td>
172
+                            <ol>
173
+                                                                    <li>[INGL3212] INGLES AVANZADO II</li>
174
+                                                            </ol>
175
+                        </td>
176
+
177
+                    </tr>
178
+                
179
+            </tbody>
180
+        </table>
181
+        <br>
182
+        <br>
183
+                              <span>
184
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
185
+        </span>
186
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
187
+            <thead>
188
+                <tr>
189
+
190
+                    <th>Objectives</th>
191
+                    <th>Courses</th>
192
+
193
+                </tr>
194
+            </thead>
195
+            <tbody>
196
+
197
+                                    <tr>
198
+
199
+                        <td>
200
+                            1. MEra wo vamos a ver
201
+                        </td>
202
+                        <td>
203
+                            <ol>
204
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
205
+                                                            </ol>
206
+                        </td>
207
+
208
+                    </tr>
209
+                
210
+            </tbody>
211
+        </table>
212
+        <br>
213
+        <br>
214
+                    <br>
215
+    <br>
216
+    <h2 class='header-text'>First Semester 2023-2024</h2>
217
+    <br>
218
+                  <span>
219
+            <h3>Critical Thinking</h3>
220
+        </span>
221
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
222
+            <thead>
223
+                <tr>
224
+
225
+                    <th>Objectives</th>
226
+                    <th>Courses</th>
227
+
228
+                </tr>
229
+            </thead>
230
+            <tbody>
231
+
232
+                                    <tr>
233
+
234
+                        <td>
235
+                            1. MEra wo vamos a ver
236
+                        </td>
237
+                        <td>
238
+                            <ol>
239
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
240
+                                                            </ol>
241
+                        </td>
242
+
243
+                    </tr>
244
+                
245
+            </tbody>
246
+        </table>
247
+        <br>
248
+        <br>
249
+                              <span>
250
+            <h3>Effective Communication Skills</h3>
251
+        </span>
252
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
253
+            <thead>
254
+                <tr>
255
+
256
+                    <th>Objectives</th>
257
+                    <th>Courses</th>
258
+
259
+                </tr>
260
+            </thead>
261
+            <tbody>
262
+
263
+                                    <tr>
264
+
265
+                        <td>
266
+                            1. MEra wo vamos a ver
267
+                        </td>
268
+                        <td>
269
+                            <ol>
270
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
271
+                                                            </ol>
272
+                        </td>
273
+
274
+                    </tr>
275
+                
276
+            </tbody>
277
+        </table>
278
+        <br>
279
+        <br>
280
+                              <span>
281
+            <h3>Information Literacy</h3>
282
+        </span>
283
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
284
+            <thead>
285
+                <tr>
286
+
287
+                    <th>Objectives</th>
288
+                    <th>Courses</th>
289
+
290
+                </tr>
291
+            </thead>
292
+            <tbody>
293
+
294
+                                    <tr>
295
+
296
+                        <td>
297
+                            1. MEra wo vamos a ver
298
+                        </td>
299
+                        <td>
300
+                            <ol>
301
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
302
+                                                            </ol>
303
+                        </td>
304
+
305
+                    </tr>
306
+                                    <tr>
307
+
308
+                        <td>
309
+                            2. Pero te la saco
310
+                        </td>
311
+                        <td>
312
+                            <ol>
313
+                                                                    <li>[INGL3012] INGLES DE HONOR II</li>
314
+                                                            </ol>
315
+                        </td>
316
+
317
+                    </tr>
318
+                
319
+            </tbody>
320
+        </table>
321
+        <br>
322
+        <br>
323
+                    <br>
324
+    <br>
325
+    <h2 class='header-text'>Second Semester 2023-2024</h2>
326
+    <br>
327
+                  <span>
328
+            <h3>Effective Communication Skills</h3>
329
+        </span>
330
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
331
+            <thead>
332
+                <tr>
333
+
334
+                    <th>Objectives</th>
335
+                    <th>Courses</th>
336
+
337
+                </tr>
338
+            </thead>
339
+            <tbody>
340
+
341
+                                    <tr>
342
+
343
+                        <td>
344
+                            1. MEra wo vamos a ver
345
+                        </td>
346
+                        <td>
347
+                            <ol>
348
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
349
+                                                            </ol>
350
+                        </td>
351
+
352
+                    </tr>
353
+                
354
+            </tbody>
355
+        </table>
356
+        <br>
357
+        <br>
358
+                              <span>
359
+            <h3>Information Literacy</h3>
360
+        </span>
361
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
362
+            <thead>
363
+                <tr>
364
+
365
+                    <th>Objectives</th>
366
+                    <th>Courses</th>
367
+
368
+                </tr>
369
+            </thead>
370
+            <tbody>
371
+
372
+                                    <tr>
373
+
374
+                        <td>
375
+                            1. MEra wo vamos a ver
376
+                        </td>
377
+                        <td>
378
+                            <ol>
379
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
380
+                                                            </ol>
381
+                        </td>
382
+
383
+                    </tr>
384
+                                    <tr>
385
+
386
+                        <td>
387
+                            2. Pero te la saco
388
+                        </td>
389
+                        <td>
390
+                            <ol>
391
+                                                                    <li>[INGL3211] INGLES AVANZADO I         </li>
392
+                                                            </ol>
393
+                        </td>
394
+
395
+                    </tr>
396
+                
397
+            </tbody>
398
+        </table>
399
+        <br>
400
+        <br>
401
+                              <span>
402
+            <h3>Logical-mathematical reasoning </h3>
403
+        </span>
404
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
405
+            <thead>
406
+                <tr>
407
+
408
+                    <th>Objectives</th>
409
+                    <th>Courses</th>
410
+
411
+                </tr>
412
+            </thead>
413
+            <tbody>
414
+
415
+                                    <tr>
416
+
417
+                        <td>
418
+                            1. MEra wo vamos a ver
419
+                        </td>
420
+                        <td>
421
+                            <ol>
422
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
423
+                                                            </ol>
424
+                        </td>
425
+
426
+                    </tr>
427
+                
428
+            </tbody>
429
+        </table>
430
+        <br>
431
+        <br>
432
+                              <span>
433
+            <h3>Research and Creation</h3>
434
+        </span>
435
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
436
+            <thead>
437
+                <tr>
438
+
439
+                    <th>Objectives</th>
440
+                    <th>Courses</th>
441
+
442
+                </tr>
443
+            </thead>
444
+            <tbody>
445
+
446
+                                    <tr>
447
+
448
+                        <td>
449
+                            1. MEra wo vamos a ver
450
+                        </td>
451
+                        <td>
452
+                            <ol>
453
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
454
+                                                            </ol>
455
+                        </td>
456
+
457
+                    </tr>
458
+                                    <tr>
459
+
460
+                        <td>
461
+                            2. Pero te la saco
462
+                        </td>
463
+                        <td>
464
+                            <ol>
465
+                                                                    <li>[INGL3297] LIT DE MUJE MINO ETNI E.U.</li>
466
+                                                            </ol>
467
+                        </td>
468
+
469
+                    </tr>
470
+                
471
+            </tbody>
472
+        </table>
473
+        <br>
474
+        <br>
475
+                    <br>
476
+    <br>
477
+    <h2 class='header-text'>First Semester 2024-2025</h2>
478
+    <br>
479
+                  <span>
480
+            <h3>Research and Creation</h3>
481
+        </span>
482
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
483
+            <thead>
484
+                <tr>
485
+
486
+                    <th>Objectives</th>
487
+                    <th>Courses</th>
488
+
489
+                </tr>
490
+            </thead>
491
+            <tbody>
492
+
493
+                                    <tr>
494
+
495
+                        <td>
496
+                            1. MEra wo vamos a ver
497
+                        </td>
498
+                        <td>
499
+                            <ol>
500
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
501
+                                                            </ol>
502
+                        </td>
503
+
504
+                    </tr>
505
+                                    <tr>
506
+
507
+                        <td>
508
+                            2. Pero te la saco
509
+                        </td>
510
+                        <td>
511
+                            <ol>
512
+                                                                    <li>[INGL3151] CONDIC HUMANA EN LITE I   </li>
513
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
514
+                                                            </ol>
515
+                        </td>
516
+
517
+                    </tr>
518
+                
519
+            </tbody>
520
+        </table>
521
+        <br>
522
+        <br>
523
+                              <span>
524
+            <h3>Logical-mathematical reasoning </h3>
525
+        </span>
526
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
527
+            <thead>
528
+                <tr>
529
+
530
+                    <th>Objectives</th>
531
+                    <th>Courses</th>
532
+
533
+                </tr>
534
+            </thead>
535
+            <tbody>
536
+
537
+                                    <tr>
538
+
539
+                        <td>
540
+                            1. MEra wo vamos a ver
541
+                        </td>
542
+                        <td>
543
+                            <ol>
544
+                                                                    <li>[TEST5998] Curso de Pruba pa general</li>
545
+                                                            </ol>
546
+                        </td>
547
+
548
+                    </tr>
549
+                
550
+            </tbody>
551
+        </table>
552
+        <br>
553
+        <br>
554
+                              <span>
555
+            <h3>Social Responsibility</h3>
556
+        </span>
557
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
558
+            <thead>
559
+                <tr>
560
+
561
+                    <th>Objectives</th>
562
+                    <th>Courses</th>
563
+
564
+                </tr>
565
+            </thead>
566
+            <tbody>
567
+
568
+                                    <tr>
569
+
570
+                        <td>
571
+                            1. MEra wo vamos a ver
572
+                        </td>
573
+                        <td>
574
+                            <ol>
575
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
576
+                                                            </ol>
577
+                        </td>
578
+
579
+                    </tr>
580
+                
581
+            </tbody>
582
+        </table>
583
+        <br>
584
+        <br>
585
+                              <span>
586
+            <h3>Technology</h3>
587
+        </span>
588
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
589
+            <thead>
590
+                <tr>
591
+
592
+                    <th>Objectives</th>
593
+                    <th>Courses</th>
594
+
595
+                </tr>
596
+            </thead>
597
+            <tbody>
598
+
599
+                                    <tr>
600
+
601
+                        <td>
602
+                            1. MEra wo vamos a ver
603
+                        </td>
604
+                        <td>
605
+                            <ol>
606
+                                                                    <li>[INGL3152] CONDIC HUMANA EN LITE II</li>
607
+                                                            </ol>
608
+                        </td>
609
+
610
+                    </tr>
611
+                
612
+            </tbody>
613
+        </table>
614
+        <br>
615
+        <br>
616
+                    <br>
617
+    <br>
618
+    <h2 class='header-text'>Second Semester 2024-2025</h2>
619
+    <br>
620
+                  <span>
621
+            <h3>Social Responsibility</h3>
622
+        </span>
623
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
624
+            <thead>
625
+                <tr>
626
+
627
+                    <th>Objectives</th>
628
+                    <th>Courses</th>
629
+
630
+                </tr>
631
+            </thead>
632
+            <tbody>
633
+
634
+                                    <tr>
635
+
636
+                        <td>
637
+                            1. Pero te la saco
638
+                        </td>
639
+                        <td>
640
+                            <ol>
641
+                                                                    <li>[INGL3212] INGLES AVANZADO II</li>
642
+                                                            </ol>
643
+                        </td>
644
+
645
+                    </tr>
646
+                
647
+            </tbody>
648
+        </table>
649
+        <br>
650
+        <br>
651
+                              <span>
652
+            <h3>Technology</h3>
653
+        </span>
654
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
655
+            <thead>
656
+                <tr>
657
+
658
+                    <th>Objectives</th>
659
+                    <th>Courses</th>
660
+
661
+                </tr>
662
+            </thead>
663
+            <tbody>
664
+
665
+                                    <tr>
666
+
667
+                        <td>
668
+                            1. MEra wo vamos a ver
669
+                        </td>
670
+                        <td>
671
+                            <ol>
672
+                                                                    <li>[INGL3135] VIAJE EN LA LITERATURA    </li>
673
+                                                            </ol>
674
+                        </td>
675
+
676
+                    </tr>
677
+                
678
+            </tbody>
679
+        </table>
680
+        <br>
681
+        <br>
682
+                 
683
+
684
+
685
+</body></html>
686
+
687
+
688
+<script>
689
+
690
+  
691
+    
692
+  
693
+
694
+
695
+  </script>
696
+
697
+