Algunos otros bugs

app/controllers/ActivitiesController.php

@@ -310,7 +310,7 @@ class ActivitiesController extends \BaseController
                     DB::update("update activities set draft = {$activity_draft}, diagnostic = {$activity_diagnostic} where id = {$activity_id}");
                     // Outcome count
                     Session::flash('status', 'success');
-                    Session::flash('message', 'Assessment Saved. To add transforming actions click "Transforming Actions".');
+                    Session::flash('message', 'Assessment Saved. To add Formative actions click "Formative Actions".');
                     return action('ActivitiesController@show', array(Input::get('activity_id')));
 
                     $outcomeCount = Outcome::all()->count();
@@ -501,7 +501,7 @@ class ActivitiesController extends \BaseController
 
             if (is_null($exception)) {
                 Session::flash('status', 'success');
-                Session::flash('message', 'Assessment Saved. To add transforming actions click "Transforming Actions".');
+                Session::flash('message', 'Assessment Saved. To add  Formative actions click "Formative Actions".');
                 return action('ActivitiesController@show', array(Input::get('activity_id')));
             }
         } catch (Exception $e) {

app/controllers/CriteriaController.php

@@ -136,17 +136,11 @@ class CriteriaController extends \BaseController
             ->select('objectives.*', 'objective_outcome.*')
             ->distinct()
             ->get();
-        Log::info(DB::table('objectives')
-            ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
-            ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
-            ->where('outcome_id', '=', $outcome_id)
-            ->whereIn('program_id', $program_ids)
-            ->select('objectives.*', 'objective_outcome.*')
-            ->distinct()->toSql());
+
         foreach ($json as $objective) {
             $objective->program_ids = json_encode(DB::table('objective_program')
                 ->where('objective_id', $objective->objective_id)
-                ->lists('program_id'));
+                ->lists('program_id'), JSON_NUMERIC_CHECK);
         }
 
 
@@ -247,7 +241,7 @@ class CriteriaController extends \BaseController
             foreach ($outcome->assoc_objectives as $objective) {
                 $objective->program_ids = json_encode(DB::table('objective_program')
                     ->where('objective_id', $objective->id)
-                    ->lists('program_id'));
+                    ->lists('program_id'), JSON_NUMERIC_CHECK);
             }
         }
         $criterion->scales = DB::table('criterion_scale')

app/controllers/ThreeYearPlanController.php

@@ -54,13 +54,13 @@ class ThreeYearPlanController extends \BaseController
       $last_year = $last_year->year_end;
     }
 
-
+    $program = Program::find($program_id);
     // el ID de los semestres que el usuario tiene seleccionado.
     $semesters_ids = Session::get('semesters_ids');
     // buscar informacion de los semestres seleccionados
     $semesters = Semester::whereIn('id', $semesters_ids)->get();
 
-    $title = "Three Year Plans";
+    $title = "Three Year Plan for " . $program->name;
     $typs = DB::table('three_year_plan')
       ->orderBy('year_start', 'asc')
       ->get();
@@ -631,4 +631,4 @@ class ThreeYearPlanController extends \BaseController
 
     return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'));
   }
-}
+}

app/controllers/TransformativeActionsController.php

@@ -1162,7 +1162,7 @@ class TransformativeActionsController extends \BaseController
         if (!$result) {
           DB::rollback();
           Session::flash('status', 'danger');
-          Session::flash('message', 'Error saving Transforming Action. Try again later.');
+          Session::flash('message', 'Error saving Formative Action. Try again later.');
 
           return Redirect::to("professor/activities/{$activity_id}");
         }
@@ -1183,7 +1183,7 @@ class TransformativeActionsController extends \BaseController
         if (!$result2) {
           DB::rollback();
           Session::flash('status', 'danger');
-          Session::flash('message', 'Error saving Transforming Action. Try again later.');
+          Session::flash('message', 'Error saving Formative Action. Try again later.');
 
           return Redirect::to("professor/activities/{$activity_id}");
         }
@@ -1193,18 +1193,18 @@ class TransformativeActionsController extends \BaseController
       if (!($result3)) {
         DB::rollback();
         Session::flash('status', 'danger');
-        Session::flash('message', 'Error saving Transforming Action. Try again later.');
+        Session::flash('message', 'Error saving Formative Action. Try again later.');
         return Redirect::to("professor/activities/{$activity_id}");
       }
       DB::commit();
       Session::flash('status', 'success');
-      Session::flash('message', 'Transformative Actions Saved.');
+      Session::flash('message', 'Formative Actions Saved.');
 
       return Redirect::to("professor/activities/{$activity_id}");
     } else {
       DB::rollback();
       Session::flash('status', 'danger');
-      Session::flash('message', 'Error saving Transforming Action. Try again later.');
+      Session::flash('message', 'Error saving Formative Action. Try again later.');
 
       return Redirect::to("professor/activities/{$activity_id}");
     }

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

@@ -65,7 +65,7 @@
                                   
 
                 <p>A Formative Action is the educational action to be taken to address the criteria of an unachieved Learning Outcome.</p>
-                <p>Una acción transformadora es una acción educativa a tomarse para atender el o los criterios de un dominio dado que no se alcanzaron.</p>
+                <p>Una acción formativa es una acción educativa a tomarse para atender el o los criterios de un dominio dado que no se alcanzaron.</p>
 
                 <h5>Choose criteria for the transforming action <br>
                 Escoge los criterion para la acción transformadora</h5>