Browse Source

Ultimos cambios

parent
commit
0184b6a732

+ 1
- 4
app/controllers/ActivitiesController.php View File

818
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
818
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
819
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
819
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
820
             ->get();
820
             ->get();
821
-        //Log::info("EN mi cuarto o o o");
822
-        //Log::info($rubric_criterion);
821
+
823
 
822
 
824
         foreach ($rubric_criterion as $index => $crit) {
823
         foreach ($rubric_criterion as $index => $crit) {
825
             $crit->scales = DB::table('scales')
824
             $crit->scales = DB::table('scales')
1003
             ->select('activity_criterion.id', 'activity_criterion.criterion_id')
1002
             ->select('activity_criterion.id', 'activity_criterion.criterion_id')
1004
             ->addSelect('criteria.name')
1003
             ->addSelect('criteria.name')
1005
             ->get();
1004
             ->get();
1006
-        Log::info("AAAA");
1007
-        Log::info($results_2);
1008
 
1005
 
1009
 
1006
 
1010
 
1007
 

+ 1
- 1
app/controllers/AnnualPlansController.php View File

1200
     */
1200
     */
1201
     $annualPlan = AnnualPlan::findOrFail($queryToPath->annual_plan_id);
1201
     $annualPlan = AnnualPlan::findOrFail($queryToPath->annual_plan_id);
1202
 
1202
 
1203
-    Log::info("ERES TU?");
1203
+    // Log::info("ERES TU?");
1204
 
1204
 
1205
     //return View::make('local.managers.shared.print_annual_report', compact('annualPlan'));
1205
     //return View::make('local.managers.shared.print_annual_report', compact('annualPlan'));
1206
     $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
1206
     $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))

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

726
             if($('#agreement_assoc').is(':checked')){
726
             if($('#agreement_assoc').is(':checked')){
727
                 agreement = 1;
727
                 agreement = 1;
728
             }
728
             }
729
-            else{
730
-                alert("LMAOOOO");
731
-            }
729
+          
732
            
730
            
733
 
731
 
734
 
732