resuelve bugs en Annual plans, actividades y criteria

app/controllers/ActivitiesController.php

@@ -172,7 +172,7 @@ class ActivitiesController extends \BaseController
         //}
 
         //Log::info($outcomes_achieved);
-        //Log::info($outcomes_achieved);
+//         Log::info(json_encode($activity));
 
         $outcomes_activity = $activity->getOutcomeReport();
 

app/controllers/AnnualPlansController.php

@@ -222,7 +222,7 @@ class AnnualPlansController extends \BaseController
     // Log::info($annual_plans);
     $outcomes = array();
     $allSemesterOrder = array();
-    Log::info($annual_plans);
+//     Log::info($annual_plans);
     /*foreach ($annual_plans as $an_plan) {
       Log::info($an_plan->id);
       $outcomes[$an_plan->id]["first"] = DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id in (select id from typ_program where program_id ={$an_plan->program_id} and three_year_plan_id ={$current_typ->id} ))");
@@ -238,7 +238,7 @@ class AnnualPlansController extends \BaseController
 
   public function fetchInfo()
   {
-    Log::info(Input::get('id'));
+//     Log::info(Input::get('id'));
     $an_plan = DB::table("annual_plans")
       ->join('annual_cycle', 'annual_cycle.id', '=', 'annual_plans.annual_cycle_id')
       ->where('annual_plans.id', '=', Input::get('id'))
@@ -257,8 +257,8 @@ class AnnualPlansController extends \BaseController
       })
       ->select('typ_program.*')
       ->first();
-    Log::info(array($an_plan));
-    Log::info(array($current_typ_program));
+//     Log::info(array($an_plan));
+//     Log::info(array($current_typ_program));
 
     //DB::select("select * from typ_program where program_id = {$an_plan->program_id} and three_year_plan_id in (select id from three_year_plan where year_start <= {$years[0]} and year_end>= {$years[1]})")[0];
 
@@ -354,13 +354,13 @@ class AnnualPlansController extends \BaseController
       $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.name, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in(select id from typ_program where program_id ={$program_id})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
 
       $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where deleted_at IS NULL and id in (select criterion_id from criterion_objective_outcome join program_criterion_objective_outcome on program_criterion_objective_outcome.cri_obj_out_id = criterion_objective_outcome.id where outcome_id = ? and program_id  = {$program_id} and objective_id = {$objective->id})", array(Input::get('id')));
-      Log::info($typ_info['criteria'][$objective->id]);
+//       Log::info($typ_info['criteria'][$objective->id]);
       $typ_info['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))", array(Input::get('id')));
-      Log::info($typ_info['typ_objective_id'][$objective->id]);
+//       Log::info($typ_info['typ_objective_id'][$objective->id]);
       $typ_info['typ_objective_id'][$objective->id] = $typ_info['typ_objective_id'][$objective->id][0];
 
-      Log::info($typ_info['typ_objective_id'][$objective->id]->id);
-      Log::info($annual_plan->id);
+//       Log::info($typ_info['typ_objective_id'][$objective->id]->id);
+//       Log::info($annual_plan->id);
       //  $typ_info['annual_plans_transformative'][$objective->id] = DB::select(
       //    "select trans_id from annual_plan_transformative
       //     where annual_plan_id={$annual_plan->id} 
@@ -386,7 +386,7 @@ class AnnualPlansController extends \BaseController
       }
     }
     $typ_info['annual_plan'] = $annual_plan;
-    Log::info($typ_info);
+//     Log::info($typ_info);
 
     $typ_info['transformative_actions_for_outcome'] = DB::table('transformative_actions')
       ->join('transformative_typ_outcome', 'transformative_typ_outcome.trans_id', '=', 'transformative_actions.id')
@@ -533,8 +533,8 @@ class AnnualPlansController extends \BaseController
     foreach ($annual_plan['first']['outcomes'] as $outcomes) {
 
       $annual_plan['first']['objectives'][$outcomes->id] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = {$outcomes->id} and semester_id = {$an_semesters->semester_start} and typ_program_id in (select id from typ_program where program_id ={$an_semesters->program_id})))");
-      Log::info($outcomes->id);
-      Log::info($annual_plan['first']['objectives'][$outcomes->id]);
+      //Log::info($outcomes->id);
+//       Log::info($annual_plan['first']['objectives'][$outcomes->id]);
       foreach ($annual_plan['first']['objectives'][$outcomes->id] as $objective) {
         $annual_plan['first']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
         $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number, c.name from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
@@ -543,7 +543,7 @@ class AnnualPlansController extends \BaseController
           $annual_plan['first']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");
         }
 
-        Log::info($objective->id);
+//         Log::info($objective->id);
         /*$annual_plan['first']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['first']['typ_objective_id'][$objective->id]->id})");
         foreach ($annual_plan['first']['trans_actions'][$objective->id] as $trans) {
           Log::info($annual_plan['first']['typ_objective_id'][$objective->id]->id);
@@ -658,7 +658,7 @@ class AnnualPlansController extends \BaseController
       ->select('courses.code', 'courses.number')
       ->distinct()
       ->get();
-    Log::info($course_codes);
+//     Log::info($course_codes);
     $all_courses_info = [];
 
     foreach ($course_codes as $index => $course_code) {
@@ -671,8 +671,8 @@ class AnnualPlansController extends \BaseController
         ->where('number', $course_code->number)
         ->where('program_id', $program_id)
         ->get();
-      Log::info("run number " . $index);
-      Log::info($courses);
+      //Log::info("run number " . $index);
+//       Log::info($courses);
       foreach ($courses as $course) {
         $all_courses_info[$course_code->code . '_' . $course_code->number][] = $course->getReportObject();
       }
@@ -751,7 +751,7 @@ class AnnualPlansController extends \BaseController
     $outcome->semester_info = DB::table('semesters')
       ->where('id', $semester_id)
       ->first();
-    Log::info($typ_semester_outcome_id);
+//     Log::info($typ_semester_outcome_id);
     $outcome->comments = $outcome->getCommentsAttribute();
     // $outcome->comments = "COMMENT";
     //Log::info("Comments");
@@ -765,8 +765,8 @@ class AnnualPlansController extends \BaseController
 
 
     foreach ($outcome->objectives as $index => $objective) {
-      Log::info("Ella son besties");
-      Log::info(array($objective));
+//       Log::info("Ella son besties");
+//       Log::info(array($objective));
       $objective->courses = Objective::getPlanReport($objective);
     }
 
@@ -976,7 +976,7 @@ class AnnualPlansController extends \BaseController
     $typ_semester_outcome_id = Input::get('typ_outcome_semester_id');
     $comments = Input::get('comments');
 
-    Log::info(Input::all());
+//     Log::info(Input::all());
 
     if ($edit_id) {
       DB::table('typ_outcome_report_comments')
@@ -1021,8 +1021,8 @@ class AnnualPlansController extends \BaseController
     $pdf->save(app_path() . '/storage/annual_pdfs/' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf');
     return $pdf->download(date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf');
     */ //pdf = $pdf->setOrientation("landscape");
-    Log::info("submit");
-    Log::info($submit);
+//     Log::info("submit");
+//     Log::info($submit);
     return View::make('local.managers.shared.print_annual_report', compact('annualPlan', 'submit'));
   }
 
@@ -1037,7 +1037,7 @@ class AnnualPlansController extends \BaseController
     //  ->setOrientation("landscape")
 
     //  ->setPaper('legal', 'landscape');
-    $path = app_path() . '/views/annual_htmls/report-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
+    $path = app_path() . '/views/annual_htmls/report-on-' . date('d-m-Y') .'ac'.$annualPlan->annual_cycle_id . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
     //$pdf->save($path);
     //$name = date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
     //$pdf->download($name);
@@ -1120,8 +1120,8 @@ class AnnualPlansController extends \BaseController
     $path = DB::table('paths_for_annual_plans')->where('id', $path_id)->first();
 
     if (isset($path)) {
-      Log::info($path->path_to_pdf);
-      Log::info(app_path()); //. "/views/annual_htmls/");
+//       Log::info($path->path_to_pdf);
+//       Log::info(app_path()); //. "/views/annual_htmls/");
 
 
       //FALTA COMO HACER PAl REPORT.
@@ -1141,9 +1141,6 @@ class AnnualPlansController extends \BaseController
       $path = str_replace(app_path() . '/views/annual_htmls/', '', $path->path_to_pdf);
 
 
-
-
-
       $path = trim($path, ".blade.php");
       $dir =  '';
 
@@ -1218,7 +1215,7 @@ class AnnualPlansController extends \BaseController
   public function checkIfPlanReady()
   {
     $annual_plan = AnnualPlan::findOrFail(Input::get("annual_id"));
-    Log::info('annual_plan' . $annual_plan->courses);
+//     Log::info('annual_plan' . $annual_plan->courses);
 
     /*
       error = [
@@ -1229,14 +1226,14 @@ class AnnualPlansController extends \BaseController
     */
     $error_array = [];
 
-    Log::info("Esto devuelve?");
+//     Log::info("Esto devuelve?");
 
-    Log::info($annual_plan->courses);
+//     Log::info($annual_plan->courses);
 
     foreach ($annual_plan->courses as $index => $course) {
 
-      Log::info('paired Criteria');
-      Log::info($course->paired_criteria);
+//       Log::info('paired Criteria');
+//       Log::info($course->paired_criteria);
       if (count($course->paired_criteria) <= 0) {
         $outcome = $course->paired_objective->paired_outcome;
         $objective = $course->paired_objective;
@@ -1283,7 +1280,7 @@ class AnnualPlansController extends \BaseController
       'courses' => [],
       'outcomes' => []
     ];
-    Log::info($annual_plan->courses_with_transformative_actions);
+//     Log::info($annual_plan->courses_with_transformative_actions);
     foreach ($annual_plan->courses_with_transformative_actions as $course) {
 
       foreach ($course->proposed_transformative_actions as $ta) {
@@ -1331,6 +1328,12 @@ class AnnualPlansController extends \BaseController
   {
     $alphabet = range("A", "Z");
     $annualPlan = AnnualPlan::findOrFail($annual_id);
+        Log::info(json_encode($annualPlan));
+	$temp=$annualPlan->getCoursesAttribute();
+	        Log::info("cursos plan");
+	        Log::info(json_encode($temp));
+	        Log::info("termina cursos plan");
+
     $small_alphabet = range('a', 'z');
     return View::make('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet', 'submit'));
   }
@@ -1340,15 +1343,17 @@ class AnnualPlansController extends \BaseController
     $alphabet = range("A", "Z");
     $small_alphabet = range('a', 'z');
     $annualPlan = AnnualPlan::findOrFail($annual_id);
+//     Log::info(json_encode($annualPlan));
+// Log::info($annualPlan->annual_cycle_id);
     $user_id = Auth::user()->id;
     //$pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
     //$pdf = $pdf->loadView('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet'))
     //  ->setOrientation("landscape")
 
     //  ->setPaper('legal', 'landscape');
-    $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
+    $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') .'ac'.$annualPlan->annual_cycle_id . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
     //$pdf->save($path);
-    $name = "plan-on-" . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.blade.php';
+    $name = "plan-on-" . date('d-m-Y') .'ac'.$annualPlan->annual_cycle_id .'-for-' . $annualPlan->program->id . '.blade.php';
     //$pdf->download($name);
 
     //is a path already there
@@ -1356,7 +1361,7 @@ class AnnualPlansController extends \BaseController
     $it_exists = DB::table("paths_for_annual_plans")
       ->where('path_to_pdf', $path)
       ->first();
-
+// Log::info(
     if (isset($it_exists)) {
       return '200';
     }

app/controllers/CriteriaController.php

@@ -95,7 +95,7 @@ class CriteriaController extends \BaseController
         $program_id = Input::get('program_fetch');
         $outcome_id = Input::get('outcome_fetch');
         $json = array();
-        $json['criterion'] = DB::select("SELECT * FROM `criteria` where id in (select criterion_id from criterion_objective_outcome join program_criterion_objective_outcome on program_criterion_objective_outcome.cri_obj_out = criterion_objective_outcome.id where outcome_id ={$outcome_id} and program_id = {$program_id}) ");
+        $json['criterion'] = DB::select("SELECT * FROM `criteria` where id in (select criterion_id from criterion_objective_outcome join program_criterion_objective_outcome on program_criterion_objective_outcome.cri_obj_out_id = criterion_objective_outcome.id where outcome_id ={$outcome_id} and program_id = {$program_id}) ");
 
         return json_encode($json);
     }
@@ -461,8 +461,9 @@ class CriteriaController extends \BaseController
      */
     public function create()
     {
-        $clean_input = $this->cleanInput();
+        $clean_input = $this->cleanInput();	
 
+        Log::info(json_encode($clean_input));
 
         /** Validation rules */
         $validator = $this->makeValidator($clean_input);
@@ -488,7 +489,7 @@ class CriteriaController extends \BaseController
                     return Redirect::to('criteria')->withInput();
 
                 case 2:
-                    Log::info(Input::all());
+//                     Log::info(Input::all());
                     return Redirect::to('school-criteria')->withInput();
 
                 case 3:

app/models/Activity.php

@@ -154,7 +154,9 @@ class Activity extends Eloquent
       ->select('outcomes.*')
       ->distinct()
       ->get();
-    $rubric = $this->rubric[0];
+    Log::info(json_encode($this));
+
+    if(isset($this->rubric[0]))$rubric = $this->rubric[0]; else $rubric=new stdClass();
     $outcomes_dict = [];
     foreach ($outcomes as $outcome) {
       $outcomes_dict[$outcome->id] = $outcome;
@@ -257,20 +259,10 @@ class Activity extends Eloquent
           $conteo_outcome_achieved++;
         }
       }
-      $outcome->achieved = $conteo_outcome_achieved;
-      $outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
-
-
-
-
-
-
-
-
-
-
-
+    Log::info(json_encode($outcome));
 
+      $outcome->achieved = $conteo_outcome_achieved;
+      if(isset($outcome->attempted) and $outcome->attempted!=0)$outcome->percentage = round(($outcome->achieved / $outcome->attempted * 100), 2);
 
       /*foreach ($students_attempted as $student) {
         $student_criteria[$student];

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

@@ -67,15 +67,14 @@
 
                     <!-- Associated Program -->
                     <div class="form-group form_validation program_form" id='program-checkboxes'>
-                        {{ Form::label('program_id', 'Associated Program') }}<br>
+                        {{ Form::label('program_id', 'Associated Program2') }}<br>
                         <br>
                         @if (count($programs) == 1)
                             <input type="checkbox" id="program-{{ $programs[0]->name }}" name="program_id[]"
                                 value="{{ $programs[0]->id }}" checked>
                             <label for="program-{{ $programs[0]->name }}"> {{ $programs[0]->name }}
                                 [{{ $programs[0]->school->name }}]</label><br>
-                            <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]"
-                                value="{{ $programs[0]->id }}">
+<!--                             <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]" value="{{ $programs[0]->id }}"> -->
                         @else
                             @foreach ($programs as $program)
                                 <input type="checkbox" id="program-{{ $program->id }}" name="program_id[]"
@@ -219,8 +218,7 @@
 
                         @if (count($programs) == 1)
 
-                            <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]"
-                                value="{{ $programs[0]->id }}">
+<!--                             <input type="hidden" id="{{ $programs[0]->name }}" name="program_id[]" value="{{ $programs[0]->id }}"> -->
 
                             <input type="checkbox" id="assoc_program-{{ $programs[0]->id }}" name="program_id[]"
                                 value="{{ $programs[0]->id }}" checked>

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

@@ -300,7 +300,7 @@ window.close();
 </script>
 <?php 
 
-  $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . Auth::user()->id . '.blade.php';
+  $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') .'ac'.$annualPlan->annual_cycle_id . '-for-' . $annualPlan->program->id . '-by-' . Auth::user()->id . '.blade.php';
   $ob = ob_get_contents();
   $ob = str_replace("window.close();", '', $ob);
   file_put_contents($path, $ob);

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

@@ -611,7 +611,7 @@
     data:[
     @foreach ($outcomes as $index => $outcome)
         @if( array_key_exists($outcome->id, $outcomes_activity) &&
-        $outcomes_activity[$outcome->id])
+        $outcomes_activity[$outcome->id] && $outcomes_activity[$outcome->id]->attempted!=0)
             {{$outcomes_activity[$outcome->id]->achieved / $outcomes_activity[$outcome->id]->attempted * 100}}
             {{-- ($outcomes_achieved[$outcome->id] / $outcomes_attempted[$outcome->id]) * 100 --}},
         {{--@if (is_array($outcomes_attempted) && array_key_exists($outcome->id, $outcomes_attempted) && $outcomes_attempted[$outcome->id] != 0) --}}