pal de bugs

app/controllers/ActivitiesController.php

             ->whereRaw("(deactivation_date IS NULL or deactivation_date >= '{$semesters->start}')")
             ->orderBy('name', 'ASC')->get();*/
 
-//         $outcomes = Outcome::orderBy('name', 'asc')->get();
-		 $level = DB::table('courses')
+        //         $outcomes = Outcome::orderBy('name', 'asc')->get();
+        $level = DB::table('courses')
             ->join('programs', 'programs.id', '=', 'courses.program_id')
             ->where('courses.id', $activity->course_id)
-//             ->where('courses.number', $number)
-//             ->where('courses.semester_id', $semester->id)
+            //             ->where('courses.number', $number)
+            //             ->where('courses.semester_id', $semester->id)
             ->select('programs.is_graduate')
             ->first();
-            $outcomes = Outcome::active_by_semesters(array($course->semester), $level->is_graduate);
+        $outcomes = Outcome::active_by_semesters(array($course->semester), $level->is_graduate);
 
         $assessment = DB::table('assessments')
             ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
 
 
 
+
+
         return View::make('local.professors.compare_activities', compact('activity_1', 'activity_2', 'activity_criterion_1', 'activity_criterion_2', 'title', 'outcomes', 'outcomes_achieved_1', 'outcomes_attempted_1', 'outcomes_achieved_2', 'outcomes_attempted_2', 'course', 'student_count', 'active_semesters'));
     }
-}
+}

app/controllers/ProfessorsController.php

                     //$section_outcomes_attempted = json_decode($section->outcomes_attempted, true);
                     foreach ($section_outcomes_attempted as $outcome_id => $score) {
 
-                        if (array_key_exists($outcome_id, $outcomes_achieved)) $outcomes_achieved[$outcome_id] += $section_outcomes_achieved[$outcome_id];
-                        else $outcomes_achieved[$outcome_id] = $section_outcomes_achieved[$outcome_id];
-                        if (array_key_exists($outcome_id, $outcomes_attempted)) $outcomes_attempted[$outcome_id] +=  $section_outcomes_attempted[$outcome_id];
-                        else $outcomes_attempted[$outcome_id] =  $section_outcomes_attempted[$outcome_id];
+                        if (array_key_exists($outcome_id, $outcomes_achieved) && array_key_exists($outcome_id, $section_outcomes_achieved)) {
+
+                            $outcomes_achieved[$outcome_id] += $section_outcomes_achieved[$outcome_id];
+                        } elseif (array_key_exists($outcome_id, $outcomes_achieved)) {
+
+                            $outcomes_achieved[$outcome_id] += 0;
+                        } elseif (array_key_exists($outcome_id, $section_outcomes_achieved)) {
+                            $outcomes_achieved[$outcome_id] = $section_outcomes_achieved[$outcome_id];
+                        } else {
+                            $outcomes_achieved[$outcome_id] = 0;
+                        }
+                        if (array_key_exists($outcome_id, $outcomes_attempted)) {
+                            $outcomes_attempted[$outcome_id] +=  $section_outcomes_attempted[$outcome_id];
+                        } else {
+                            $outcomes_attempted[$outcome_id] =  $section_outcomes_attempted[$outcome_id];
+                        }
                         //$outcomes_achieved[$outcome_id] += $section_outcomes_achieved[$outcome_id];
                         //$outcomes_attempted[$outcome_id] += $section_outcomes_attempted[$outcome_id];
                     }
 
         return View::make('local.managers.shared.general_studies_overview', compact('title', 'outcomes', 'schools', 'program_packs'));
     }
-}
+}

app/database/migrations/2022_01_19_100041_add_deleted_at_objectives.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDeletedAtObjectives extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('objectives', function (Blueprint $table) {
+			$table->date('deleted_at')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('objectives', function (Blueprint $table) {
+			$table->dropColumn('deleted_at');
+		});
+	}
+}

app/models/Course.php

         else $outcomes_attempted[$outcome_id] = 1;
       }
     }
+    Log::info("outcomes_attempted");
+    Log::info($outcomes_attempted);
 
     return $outcomes_attempted;
   }
     return $all_sections;
   }
 
-    public function isAssessed()
-    {
-         $assessed = DB::table('assessments')
-            ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
-            ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
-             ->where('activities.course_id', $this->id)
-            ->count();
-//             Log::info("aqui".$assessed);
-
-   		if($assessed)return true;
-   		else return false;
-    }
+  public function isAssessed()
+  {
+    $assessed = DB::table('assessments')
+      ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+      ->join('activities', 'activity_criterion.activity_id', '=', 'activities.id')
+      ->where('activities.course_id', $this->id)
+      ->count();
+    //             Log::info("aqui".$assessed);
+
+    if ($assessed) return true;
+    else return false;
+  }
 
 
   public function outcomes_achieved()
       $query->where('outcomes_attempted', 'not like', '\'%"' . $outcome_id . '":0%\'');
     }))->where('code', $this->code)->where('number', $this->number)->get();
   }
-}
+}

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

                                                     $expected = DB::table('target_outcomes_program')
                                                         ->where('program_id', $course->program_id)
                                                         ->where('semester_id', $course->semester_id)
-                                                        ->first()->expected_target;
-                                                    
+                                                        ->first();//->expected_target;
+                                                    if(!$expected){
+                                                        $expected = "It has not been defined in the annual plan";
+                                                    }
                                                     ?>
                                                     {{ $expected }}
                                                 </i>

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

                                             $expected = DB::table('target_outcomes_program')
                                                 ->where('program_id', $course->program_id)
                                                 ->where('semester_id', $course->semester_id)
-                                                ->first()->expected_target;
+                                                ->first();
+                                                if(!$expected){
+                                                        $expected = "It has not been defined in the annual plan";
+                                                    }
                                             
                                             ?>
                                             {{ $expected }}

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

                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-                                                                                                                                                                                                                                                                                                                                                                                  
-                                                                                                                                                                                                                                                                                                                                   
-                                                                                                                                                                                                                                                                                   
-                                                                                                                                                                                                                                   
-                                                                                                                                                                                   
-                                                                                                                                   
-                                                                                 @if ($criterion->program)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
+                                                                                                                                                                                                                                                                                                                                                                                                                       
+                                                                                                                                                                                                                                                                                                                                                                       
+                                                                                                                                                                                                                                                                                                                       
+                                                                                                                                                                                                                                                                       
+                                                                                                                                                                                                                       
+                                                                                                                                                                       
+                                                                                                                       
+                                                                  @if ($criterion->program)
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
                             @endif
                             ">
                 what = $(submitter).data('form-id');
                 form_id = $(submitter).data('form-id');
                 form = $("#" + form_id)
-                form = $("#" + form_id).children('div')
+                form = $("#" + form_id).children('div');
+
 
                 $("#" + form_id).children('.form_validation').each(function(index) {
                     //alert($(this).attr('id') + '   ' + index);
                     } else if ($(this).hasClass('program_form')) {
                         checkedboxes = $(this).children('input[type="checkbox"]:checked').length;
                         if (!checkedboxes) {
-                            var timer;
+
 
                             alert = $('<div/>', {
                                 'class': 'alert alert-danger alert-dismissible',
                             $(this).prepend(alert);
                             $('html, body').animate({
                                 scrollTop: $(alert).offset().top
-                            }, 1000);
+                            }, 300);
                             //$(divGroup).focus();
                             isEverythingOkay = false;
                         }
 
                     } else if ($(this).hasClass('name_form')) {
+
                         input = $(this).children('input')[0];
                         if ($(input).val() == '') {
                             var timer;
                             $(this).prepend(alert);
                             $('html, body').animate({
                                 scrollTop: $(alert).offset().top
-                            }, 1000);
+                            }, 300);
                             //$(divGroup).focus();
                             isEverythingOkay = false;
                         }
 
                     } else if ($(this).hasClass('maximum_form')) {
+                        input = $(this).children('input')[0];
+                        if (isNaN($(input).val())) {
+                            alert = $('<div/>', {
+                                'class': 'alert alert-danger alert-dismissible',
+                                'role': 'alert'
+                            })
+                            button = $('<button/>', {
+                                'type': 'button',
+                                'class': 'close',
+                                'data-dismiss': 'alert',
+                                'alert-label': 'close'
+                            }).html('<span aria-hidden="true">×</span>');
+                            alert.append(button);
+                            alert.append('<strong>Write a valid number for maximum score</strong>')
 
+                            $(this).prepend(alert);
+                            $('html, body').animate({
+                                scrollTop: $(alert).offset().top
+                            }, 300);
+                            //$(divGroup).focus();
+                            isEverythingOkay = false;
+                        }
 
-                    } else if ($(this).hasClass('scales_form')) {
 
                     } else if ($(this).hasClass('number_of_scales')) {
+                        btn_group = $(this).children('div.btn-group')[0];
+                        select = $(btn_group).children('select')[0];
+                        if (isNaN($(select).val())) {
+
+                            alert = $('<div/>', {
+                                'class': 'alert alert-danger alert-dismissible',
+                                'role': 'alert'
+                            })
+                            button = $('<button/>', {
+                                'type': 'button',
+                                'class': 'close',
+                                'data-dismiss': 'alert',
+                                'alert-label': 'close'
+                            }).html('<span aria-hidden="true">×</span>');
+                            alert.append(button);
+                            alert.append('<strong>Select a valid number</strong>')
+
+                            $(this).prepend(alert);
+                            $('html, body').animate({
+                                scrollTop: $(alert).offset().top
+                            }, 300);
+                            //$(divGroup).focus();
+                            isEverythingOkay = false;
+                        }
+
+                    } else if ($(this).hasClass('scales_form')) {
+
+                        //amount_of_scales = parseInt($(this).data('value'));
+
+                        $.each($(this).children('div'), function() {
+                            form_group = $(this).children('div.form-group')[0];
+                            textarea = $(form_group).children('textarea')[0];
+                            if ($(textarea).val() == '') {
+                                alert = $('<div/>', {
+                                    'class': 'alert alert-danger alert-dismissible',
+                                    'role': 'alert'
+                                })
+                                button = $('<button/>', {
+                                    'type': 'button',
+                                    'class': 'close',
+                                    'data-dismiss': 'alert',
+                                    'alert-label': 'close'
+                                }).html('<span aria-hidden="true">×</span>');
+                                alert.append(button);
+                                alert.append('<strong>Make sure to fill this scale</strong>')
+
+                                $(form_group).prepend(alert);
+                                $('html, body').animate({
+                                    scrollTop: $(alert).offset().top
+                                }, 300);
+                                //$(divGroup).focus();
+                                isEverythingOkay = false;
+                            }
+                        })
+
 
                     } else return;
 
                 })
 
 
-                //BORRAR
-                //if (!isEverythingOkay)
-                e.preventDefault();
+
+                if (!isEverythingOkay)
+                    e.preventDefault();
 
 
             } else e.preventDefault();
         visibleProgram["allAssocOutcomes"] = {}
         visibleProgram["allOutcomes"] = {}
 
+
         function visiblePrograms(allOutcomesDiv) {
+            checkedPrograms = {}
             $('#' + allOutcomesDiv).parent().find('input:checkbox').each(function(index) {
 
                 id = $(this).attr('id');
-                $(this).prop("checked", false);
+                if ($(this).is(':checked')) {
+                    checkedPrograms[$(this).attr('id')] = 1;
+                    $(this).prop("checked", false);
+                }
+
                 program_id = $(this).val();
                 if (!(program_id in visibleProgram[allOutcomesDiv])) {
                     visibleProgram[allOutcomesDiv][program_id] = {};
             })
             if (allOutcomesDiv == "allOutcomes") {
                 $('#' + allOutcomesDiv).parent().find("select[name='objective[]']").each(function(index) {
+
+                    //program_ids in objective
                     var the_programs = $(this).find(':selected').data('program-ids');
                     if (!the_programs) return;
 
                     for (index in the_programs) {
                         program_id = the_programs[index];
 
+                        //if the program_id is inside the visibleProgram scope
+                        //and the checkbox isnt alread present
+
                         if (program_id in visibleProgram[allOutcomesDiv] &&
                             !($('#program-checkboxes').find('#' + visibleProgram[allOutcomesDiv][program_id][
                                 'checkbox'
                             ].attr('id')).val())) {
+                            //if it was checked, check it again
+                            id = visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id');
+                            if (checkedPrograms[id]) {
+                                visibleProgram[allOutcomesDiv][program_id]['checkbox'].prop('checked', true);
+                            }
                             visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo('#program-checkboxes');
+
+
                             visibleProgram[allOutcomesDiv][program_id]['label'].appendTo("#program-checkboxes");
                             $('#program-checkboxes').append('<br>');
 
                             !($('#assoc-program-checkboxes').find('#' + visibleProgram[allOutcomesDiv][program_id][
                                 'checkbox'
                             ].attr('id')).val())) {
+
+                            id = visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id');
+                            if (checkedPrograms[id]) {
+                                visibleProgram[allOutcomesDiv][program_id]['checkbox'].prop('checked', true);
+
+                            }
                             visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo(
                                 '#assoc-program-checkboxes');
+
                             visibleProgram[allOutcomesDiv][program_id]['label'].appendTo(
                                 "#assoc-program-checkboxes");
                             $('#assoc-program-checkboxes').append('<br>');

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

                         $expected = DB::table('target_outcomes_program')
                             ->where('program_id', $course->program_id)
                             ->where('semester_id', $course->semester_id)
-                            ->first()->expected_target;
+                            ->first();
+                            if(!$expected){
+                                                        $expected = "It has not been defined in the annual plan";
+                                                    }
                         
                         ?>
                         {{ $expected }}
+                        
                     </i>
                 </p>
                 <br>
                         $expected = DB::table('target_outcomes_program')
                             ->where('program_id', $course->program_id)
                             ->where('semester_id', $course->semester_id)
-                            ->first()->expected_target;
-                        
+                            ->first();//->expected_target;
+                            if(!$expected){
+                                                        $expected = "It has not been defined in the annual plan";
+                                                    }
                         ?>
                         {{ $expected }}
                     </i>

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

                               
                               <select id='select-activity-1' data-count = "1" class="form-control selectpicker" >
                                   @foreach ($activities as $activity)
-                                 
+                                 @if($activity->is_assessed())
                                   <option value='{{$activity->id}}' >{{$activity->name}}</option>
-          
+                                @endif
                                   @endforeach
                               </select>
                               <hr>
 
                               <select id='select-activity-2' data-count = "1" class="form-control selectpicker" >
                                 @foreach ($activities as $activity)
-                               
+                                @if($activity->is_assessed())
                                 <option value='{{$activity->id}}' >{{$activity->name}}</option>
-        
+                                @endif
                                 @endforeach
                             </select>
                             <hr>

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

                                      $expected = DB::table('target_outcomes_program')
         ->where('program_id', $course->program_id)
         ->where('semester_id', $course->semester_id)
-        ->first()->expected_target;
+        ->first();//->expected_target;
+        if(!$expected){
+                                                        $expected = "It has not been defined in the annual plan";
+                                                    }
 
         
                                     ?>