corrigiendo bugs

app/controllers/CriteriaController.php

@@ -130,6 +130,7 @@ class CriteriaController extends \BaseController
             ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
             ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
             ->where('outcome_id', '=', $outcome_id)
+            ->where('objectives.id', '<>', 0)
             ->whereIn('program_id', $program_ids)
             ->select('objectives.*', 'objective_outcome.*')
             ->distinct()

app/controllers/Objective2Controller.php

@@ -228,13 +228,20 @@ class Objective2Controller extends \BaseController
 				}
 				foreach ($clean_input['outcome_id'] as $outcome_id) {
 					DB::insert("insert into `objective_outcome` (objective_id, outcome_id) values ({$objectiveId}, {$outcome_id})");
-
 					/*if (!($objectiveOutcome->save())) {
 						Session::flash('status', 'danger');
 						Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
 						return Redirect::to('objective')->withInput();
 					}*/
 				}
+				DB::table('criterion_objective_outcome')
+				->join('program_criterion' , 'criterion_objective_outcome.criterion_id',"=",'program_criterion.criterion_id')
+				->whereIn('program_id',$clean_input['program_id'])
+				->whereIn('outcome_id',$clean_input['outcome_id'])
+				->where('objective_id','=',0)
+				->update(array('objective_id'=>$objectiveId));
+// 				update("update criterion_objective_outcome coo join program_criterion pc on coo.criterion_id=pc.criterion_id set 
+// 				objective_id= {$objectiveId} where program_id in (".$clean_input['program_id'].") and objective_id=0 and outcome_id in (".$clean_input['outcome_id'].")");
 
 				Session::flash('status', 'success');
 				Session::flash('message', 'Objective created: "' . $objective->text . '".');

app/controllers/OutcomesController.php

@@ -406,7 +406,8 @@ class OutcomesController extends \BaseController
 
     public function fetchCriteria()
     {
-
+// 		var_dump((Input::get('filter')));
+// 		exit();
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':

app/controllers/TemplatesController.php

@@ -378,6 +378,8 @@ class TemplatesController extends \BaseController
 			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
 			->where("template_criterion.template_id", '=', Input::get('id'))
 			->get();
+				Log::info(json_encode($template_info['criterion']));
+// 				Log::info(($temp_crit->program_ids));
 		foreach ($template_info['criterion'] as $temp_crit) {
 			$temp_crit->scales = DB::table('scales')
 				->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
@@ -388,6 +390,9 @@ class TemplatesController extends \BaseController
 			$temp_crit->program_ids = json_encode(DB::table('program_criterion')
 				->where('criterion_id', $temp_crit->id)
 				->lists('program_id'));
+				
+						Log::info("ee".json_encode($temp_crit->program_ids));
+		
 			$temp_crit->objectives = DB::table('criterion_objective_outcome')
 				->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
 				->where('criterion_id', $temp_crit->id)
@@ -404,6 +409,7 @@ class TemplatesController extends \BaseController
 			$outcomeStr = rtrim($outcomeStr, ',');
 			$temp_crit->outcomes = $outcomeStr;
 		}
+		Log::info("ee2".json_encode($template_info));
 
 		$template_info['titles'] = DB::table('titles')
 			->join('template_title', 'template_title.title_id', '=', 'titles.id')
@@ -411,7 +417,7 @@ class TemplatesController extends \BaseController
 			->orderBy('position')
 			->get();
 
-		Log::info($template_info);
+// 		Log::info(json_encode($template_info));
 
 		return json_encode($template_info);
 	}

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

@@ -528,13 +528,13 @@ function fetchCriteria(outcome, objective)
         function(data)
         {
             $('#select-criterion').empty();
-
+		console.log(data);
             // Append criteria
             data.forEach( function (arrayItem)
             {
                 objectives = JSON.stringify(arrayItem.objectives);
                 $('#select-criterion')
-                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = "'+arrayItem.program_ids+'" data-assoc-objectives= '+"'"+objectives+"'"+'>'+arrayItem.name+'</option>');
+                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = '+"'"+arrayItem.program_ids+"'"+' data-assoc-objectives= '+"'"+objectives+"'"+'>'+arrayItem.name+'</option>');
             });
 
             // If there are no criteria assigned to the selected outcome, disable the
@@ -932,12 +932,15 @@ function loadTemplate()
 
             // Set the contents of the rubric
             var temp_criterion = data.criterion;
+               console.log(temp_criterion);
             for(temp_c in temp_criterion){
                 current_criterion = temp_criterion[temp_c]
+               console.log(current_criterion.program_ids);
                 objectives = JSON.stringify(current_criterion.objectives);
-               
-                var str = '<tr data-assoc-objectives= '+"'"+objectives+"'"+' data-program_ids = "'+current_criterion.program_ids+'" data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
-                
+                //var str = '<tr data-assoc-objectives= '+"'"+objectives+"'"+' data-program_ids = "'+current_criterion.program_ids+'" data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                var str = "<tr data-assoc-objectives= "+"'"+objectives+"'"+" data-program_ids = '"+current_criterion.program_ids+"' data-criterion-name = '"+current_criterion.name+"' data-criterion-id='"+temp_criterion[temp_c].criterion_id+"' data-criterion-copyright='"+temp_criterion[temp_c].copyright+"' data-criterion-notes='"+temp_criterion[temp_c].notes+"' data-outcomes = '"+temp_criterion[temp_c].outcomes+"'><th><span class='glyphicon glyphicon-move'></span></th><td>";
+                console.log(str);
+
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
                     var subcriteria_array = JSON.parse(current_criterion.subcriteria);
@@ -967,6 +970,7 @@ function loadTemplate()
                 str+= '<td>'+current_criterion.outcomes+'</td>'
   
                 str+='<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
+                console.log(str);
 
     $('table tbody').append(str);
 
@@ -1412,7 +1416,7 @@ $('.save').on('click', function(e)
             htmlString = '';
             console.log($(this));
 
-            program_ids = $(this).data('program-ids')
+            program_ids = $(this).data('program_ids')
             if(!program_ids.includes(program_id) ){
                 title = "<h6>The following criteria and objectives will be matched with this program</h6>"
                 htmlString += "<ol style='list-style-position: inside'>"