Arreglo a criterios

app/controllers/ActivitiesController.php

@@ -513,18 +513,19 @@ class ActivitiesController extends \BaseController
                 DB::table('activities')
                     ->where('id', Input::get('id'))
                     ->update(array(
-                        'draft' => 0,
-                        'outcomes_attempted' => NULL,
-                        'outcomes_achieved' => NULL,
-                        'criteria_achieved' => NULL,
-                        'transforming_actions' => NULL,
+                        'draft' => 1,
                         'assessment_comments' => NULL,
-                        'criteria_achieved_percentage' => NULL,
+
+
+
                         'updated_at' => date('Y-m-d H:i:s')
                     ));
 
                 // Delete students score
-                DB::table('assessments')->where('activity_id', $activity->id)->delete();
+
+                DB::table('assessments')
+                    ->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+                    ->where('activity_id', $activity->id)->delete();
 
                 // Recalculate course outcomes
                 /*$activities = DB::table('activities')
@@ -615,7 +616,7 @@ class ActivitiesController extends \BaseController
 
         if (Activity::destroy($id)) {
             // Recalculate course outcomes
-            $activities = $course->activities;
+            /*$activities = $course->activities;
 
             // Check if any assessed activties remain
             $remainingAssessed = false;
@@ -664,17 +665,18 @@ class ActivitiesController extends \BaseController
             } else {
                 $course->outcomes_achieved = NULL;
                 $course->outcomes_attempted = NULL;
-            }
+            } */
 
-            if ($course->save()) {
+            /*if ($course->save()) {
                 Session::flash('status', 'success');
                 Session::flash('message', 'Activity deleted.');
             } else {
                 Session::flash('status', 'danger');
                 Session::flash('message', 'Error deleting activity. Try again later.');
                 return Redirect::back();
-            }
-
+            }*/
+            Session::flash('status', 'success');
+            Session::flash('message', 'Activity deleted.');
             return Redirect::action('CoursesController@show', array($course->id));
         } else {
             Session::flash('status', 'danger');

app/controllers/CriteriaController.php

@@ -161,16 +161,18 @@ class CriteriaController extends \BaseController
         }*/
 
         $criterion =  DB::table('criteria')->where('id', Input::get('id'))->first();
+        if (!$criterion) return $criterion;
         $criterion->outcomes = DB::table('criterion_objective_outcome')
             ->join('outcomes', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
             ->where('criterion_id', $criterion->id)
+            ->select('outcomes.*')
             ->distinct()
             ->get();
 
         foreach ($criterion->outcomes as $outcome) {
             $outcome->assoc_objectives = DB::table('objective_outcome')
                 ->join('objectives', 'objectives.id', '=', 'objective_outcome.objective_id')
-                ->where('outcome_id', $outcome->outcome_id)
+                ->where('outcome_id', $outcome->id)
                 ->get();
             $outcome->objectives_criteria = DB::table('criterion_objective_outcome')
                 ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')

app/controllers/ObjectivesController.php

@@ -243,6 +243,8 @@ class ObjectivesController extends \BaseController
 
     $criteria_scales = DB::table('criteria')
       ->join('criterion_objective_outcome as cobo', 'criterion_id', '=', 'criteria.id')
+      ->join('program_criterion', 'cobo.criterion_id', '=', 'program_criterion.criterion_id')
+      ->whereIn('program_id', $program_ids)
       ->where('objective_id', $objective->id)
       ->select('num_scales')
       ->orderBy('num_scales', 'DESC')

app/controllers/OutcomesController.php

@@ -410,7 +410,7 @@ class OutcomesController extends \BaseController
         if (Input::get('filter')) {
             switch (Input::get('filter')) {
                 case 'all':
-                    return DB::table('criteria')
+                    $criteria = DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
                         ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
@@ -419,6 +419,19 @@ class OutcomesController extends \BaseController
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
+
+                    foreach ($criteria as $criterion) {
+                        $criterion->program_ids = json_encode(DB::table('program_criterion')
+                            ->where('criterion_id', $criterion->id)
+                            ->lists('program_id'));
+                        $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                            ->where('criterion_id', $criterion->id)
+                            ->select('objectives.*')
+                            ->distinct()
+                            ->lists('text'));
+                    }
+                    return $criteria;
                     break;
 
                 case 'school':
@@ -438,6 +451,17 @@ class OutcomesController extends \BaseController
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
                             ->get();
+                        foreach ($criteria as $criterion) {
+                            $criterion->program_ids = json_encode(DB::table('program_criterion')
+                                ->where('criterion_id', $criterion->id)
+                                ->lists('program_id'));
+                            $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                                ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                                ->where('criterion_id', $criterion->id)
+                                ->select('objectives.*')
+                                ->distinct()
+                                ->lists('text'));
+                        }
                         // Return all criteria belonging to any of those programs
                         return $criteria;
                     }
@@ -446,9 +470,10 @@ class OutcomesController extends \BaseController
                     else {
 
                         // Fetch all the programs from the user's school;
+                        // Fetch all the programs from the user's school;
                         $program_ids = DB::table('programs')->where('school_id', Auth::user()->programs[0]->school->id)->lists('id');
 
-                        return DB::table('criteria')
+                        $criteria = DB::table('criteria')
                             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                             ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
                             ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
@@ -459,6 +484,19 @@ class OutcomesController extends \BaseController
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
                             ->get();
+
+                        foreach ($criteria as $criterion) {
+                            $criterion->program_ids = json_encode(DB::table('program_criterion')
+                                ->where('criterion_id', $criterion->id)
+                                ->lists('program_id'));
+                            $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                                ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                                ->where('criterion_id', $criterion->id)
+                                ->select('objectives.*')
+                                ->distinct()
+                                ->lists('text'));
+                        }
+                        return $criteria;
                     }
 
                     break;
@@ -475,11 +513,22 @@ class OutcomesController extends \BaseController
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
+                    foreach ($criteria as $criterion) {
+                        $criterion->program_ids = json_encode(DB::table('program_criterion')
+                            ->where('criterion_id', $criterion->id)
+                            ->lists('program_id'));
+                        $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                            ->where('criterion_id', $criterion->id)
+                            ->select('objectives.*')
+                            ->distinct()
+                            ->lists('text'));
+                    }
                     return $criteria;
                     break;
 
                 default:
-                    return DB::table('criteria')
+                    $criteria = DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                         ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
                         ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
@@ -488,10 +537,23 @@ class OutcomesController extends \BaseController
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
+
+                    foreach ($criteria as $criterion) {
+                        $criterion->program_ids = json_encode(DB::table('program_criterion')
+                            ->where('criterion_id', $criterion->id)
+                            ->lists('program_id'));
+                        $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                            ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                            ->where('criterion_id', $criterion->id)
+                            ->select('objectives.*')
+                            ->distinct()
+                            ->lists('text'));
+                    }
+                    return $criteria;
                     break;
             }
         } else {
-            return DB::table('criteria')
+            $criteria = DB::table('criteria')
                 ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
                 ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
                 ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
@@ -500,6 +562,19 @@ class OutcomesController extends \BaseController
                 ->select('criterion_id as id', 'name')
                 ->orderBy('name', 'ASC')
                 ->get();
+
+            foreach ($criteria as $criterion) {
+                $criterion->program_ids = json_encode(DB::table('program_criterion')
+                    ->where('criterion_id', $criterion->id)
+                    ->lists('program_id'));
+                $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                    ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+                    ->where('criterion_id', $criterion->id)
+                    ->select('objectives.*')
+                    ->distinct()
+                    ->lists('text'));
+            }
+            return $criteria;
         }
     }
 

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

@@ -119,7 +119,7 @@
                 Edit
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@update')) }}
+                {{ Form::open(array('action' => 'CriteriaController@update','id'=>'update_criterion')) }}
                 <button class="btn btn-md btn-secondary filterButton">
                     <span class="glyphicon glyphicon-plus">
                     </span>
@@ -163,7 +163,7 @@
                     <div id='assocOutcomeGroup0' data-value="1">
                         <div class="form-group col-md-12">
                             <label>Outcome 1</label>
-                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
+                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
     
                         </div>
     <div id='assoc_objectiveGroupFor0' data-value="1">
@@ -549,8 +549,8 @@ function addOutcomeTest() {
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
-        //counter = parseInt($('#'+objectiveGroup).data("value"));
-        //$('#'+objectiveGroup).data("value", counter-1);
+        counter = parseInt($('#'+objectiveGroup).data("value"));
+        $('#'+objectiveGroup).data("value", counter-1);
 
 
     }
@@ -653,7 +653,7 @@ function addOutcomeTest() {
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome_' + assocOutcomeCounter.toString(),
-            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
+            'onchange': 'fetchObjectiveForSelect("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
 
         });
         var $div = $('<div/>', {
@@ -763,7 +763,7 @@ function addOutcomeTest() {
                 allOutcomes: allOutcomes
             },
 
-            function(json) {
+            function(varArray) {
 
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
@@ -789,16 +789,16 @@ function addOutcomeTest() {
                 }
 
                 for (var i = allObjectives.length - 1; i > 0; i--) {
-                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup');
-                }
-                for(var i=1; i<allObjectives.length; i++){
+                    deleteObjective('assoc_objectiveForm_' + objectiveGroup +'_'+i, 'assoc_closeObj_'+objectiveGroup+'_' + i.toString(), objectiveGroup);
+               }
+               /* for(var i=1; i<allObjectives.length; i++){
                     addAssocObjective();
                     $('#assoc_objective_'+i.toString()).selectpicker('refresh');
                     if($("#assoc_objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
                     $("#assoc_objective_"+i.toString()).val(allObjectives[i].value);
                     $("#assoc_objective_"+i.toString()).selectpicker("refresh");
                     }
-                }
+                }*/
 
 
 
@@ -935,10 +935,25 @@ function addOutcomeTest() {
             "{{ URL::action('CriteriaController@fetchCriterionWithTrashed') }}", {
                 id: id
             },
-            function(json) {
+            function(criterion) {
+
+                
+if (!(criterion.length)) {
+    name = ' ';
+    var subcriteria = '';
+    copyright = null;
+    notes = null;
+    $('#status').val(0);
+    maximum = 1;
+    $('#assoc_maximum_score').val(1);
 
-                if (!(json.activity_criterion.length)) {
 
+}
+
+
+else { 
+criterion = criterion[0];
+if (!(criterion.activity_criterion.length)) {
 $('#DeleteButton').prop('disabled', false);
 $("#update_the_criterion").val('Update');
 $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update')}}")
@@ -952,48 +967,38 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 }
 
-                if (!(json.criteria.length)) {
-                    name = ' ';
-                    var subcriteria = '';
-                    copyright = null;
-                    notes = null;
-                    $('#status').val(0);
-                    maximum = 1;
-                    $('#assoc_maximum_score').val(1);
-
-
-                } else {
-                    var name = json.criteria[0].name;
-                    if (json.criteria[0].subcriteria) {
-                        subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
-                    } else {
+              
+var name = criterion.name;
+                    if (criterion.subcriteria) {
+                        subcriteria = JSON.parse(criterion.subcriteria).join('\n');
+ } else {
                         subcriteria = "";
                     }
-                    if (json.criteria[0].copyright) {
-                        var copyright = json.criteria[0].copyright;
+                    if (criterion.copyright) {
+                        var copyright = criterion.copyright;
                     } else {
                         var copyright = ''
                     }
-                    if (json.criteria[0].notes) notes = json.criteria[0].notes;
-                    else notes = '';
+                    if (criterion.notes) notes = criterion.notes;
+                   else notes = '';
 
                     // Display info
                     $('#criterion_name').val(name);
                     $('#criterion_subcriteria').text(subcriteria);
-                    if (json.criteria[0].deleted_at)
-                        $('#status').val(0);
+                    if (criterion.deleted_at)
+                       $('#status').val(0);
                     else
                         $('#status').val(1);
-                    $('#assoc_maximum_score').val(json.criteria[0].maximum_score);
-                    var maximum = json.criteria[0].maximum_score;
+                        $('#assoc_maximum_score').val(criterion.max_score);
+                    var maximum = criterion.max_score;
 
                     addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales");
-                    $('#Num_assoc_scale').val(json.criteria[0].num_scales)
-                    $('#Num_assoc_scale').selectpicker('refresh');
+                    $('#Num_assoc_scale').val(criterion.num_scales)
+                   $('#Num_assoc_scale').selectpicker('refresh');
                     $('#Num_assoc_scale').trigger('change');
 
-                    for(i=0; i<json.criteria[0].num_scales;i++){
-                        $('#assoc_scale_'+i).val(json.scales[i].description);
+                    for(i=0; i<criterion.num_scales;i++){
+                        $('#assoc_scale_'+i).val(criterion.scales[i].description);
                     }
                     // If copyright or notes aren't empty, load them
 
@@ -1014,8 +1019,8 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
                 // Select associated outcome
                 try {
-                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup0").data('value'));
-                    for (var i = assocOutcomeCounter - 1; i > 0; i--) {
+                    assocOutcomeCounter = parseInt($("#assocOutcomeGroup0").data('value'));
+                   for (var i = assocOutcomeCounter - 1; i > 0; i--) {
                         $('#assoc_close_button'+i).click();
                                }
                     $('#assocOutcomeGroup0').data('value', 1); 
@@ -1023,36 +1028,45 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
                     var Notran = true;
                 }
 
-                if (json.outcomes.length) 
+                if (criterion.outcomes.length) 
                     {
-                    $('#assoc_outcome_0').val(json.outcomes[0].id);
-                    $('#assoc_outcome_0').selectpicker('refresh');
+                    $('#assoc_outcome_0').val(criterion.outcomes[0].id);
+                     $('#assoc_outcome_0').selectpicker('refresh');
 
-                    var first_outcome_id = json.outcomes[0].id;
+                     var first_outcome = criterion.outcomes[0];
                     options = "<option value ='0'>Nothing Selected</option>";
+                    $(first_outcome.assoc_objectives).each(function(index, objective){
 
-                    for(objective_index  in json.objectives_assoc[first_outcome_id]){
+options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
+    objective.text+'</option>';
+
+})
+                    /*for(objective_index  in json.objectives_assoc[first_outcome_id]){
                         objective = json.objectives_assoc[first_outcome_id][objective_index]
                         options += '<option value ="('+first_outcome_id+','+objective.objective_id+')">'+
                             objective.text+'</option>';
-                    }
+                    }*/
                     $('#assoc_objective_0_counter_1').html(options);
                     $('#assoc_objective_0_counter_1').selectpicker('refresh');
                     
-                    if(json.objectives[first_outcome_id].length){
-                        objective_id = json.objectives[first_outcome_id][0].objective_id;
-                    value = '('+first_outcome_id+','+objective_id+')';
+                    if(first_outcome.objectives_criteria.length){
+                        objective_id = first_outcome.objectives_criteria[0].objective_id;
+                    value = '('+first_outcome.id+','+objective_id+')';
                     $('#assoc_objective_0_counter_1').val(value);
                     $('#assoc_objective_0_counter_1').selectpicker('refresh');
 
                     }
-                    
+                    if($("#assoc_objectiveGroupFor0").find(".btn-primary").length>0){
+                        $("#assoc_objectiveGroupFor0").find(".btn-primary").each(function(){
+                            $(this).click()
+                        })
+                    }
 
-                    for(var i =1; i<json.objectives[first_outcome_id].length; i++ ){
+                    for(var i =1; i<first_outcome.objectives_criteria.length; i++ ){
                         addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0");
-                        objective_id = json.objectives[first_outcome_id][i].objective_id;
-                        value = "("+first_outcome_id+","+objective_id+")";
-                        $('#assoc_objective_0_counter_'+(i+1)).val(value);
+                        objective_id = first_outcome.objectives_criteria[i].objective_id;
+                        value = "("+first_outcome.id+","+objective_id+")";
+                       $('#assoc_objective_0_counter_'+(i+1)).val(value);
                         $('#assoc_objective_0_counter_'+(i+1)).selectpicker('refresh');
                         
 
@@ -1067,35 +1081,41 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 
                
-                for (var i = 1; i < json.outcomes.length; i++) {
+                for (var i = 1; i < criterion.outcomes.length; i++) {
                     addAssocOutcome(true);
 
 
-                    $('#assoc_outcome_' + i.toString()).val(json.outcomes[i].id);
-                    $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
+                    $('#assoc_outcome_' + i.toString()).val(criterion.outcomes[i].id);
+                   $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
-                    var outcome_id = json.outcomes[i].id;
-                    options = "<option value ='0'>Nothing Selected</option>";
+                   var outcome = criterion.outcomes[i];
+                  options = "<option value ='0'>Nothing Selected</option>";
 
-                    for(objective_index  in json.objectives_assoc[outcome_id]){
-                        objective = json.objectives_assoc[outcome_id][objective_index]
-                        options += '<option value ="('+outcome_id+','+objective.objective_id+')">'+
-                            objective.text+'</option>';
-                    }
+                  $(outcome.assoc_objectives).each(function(index, objective){
+
+options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
+    objective.text+'</option>';
+
+})
+                    //for(objective_index  in json.objectives_assoc[outcome_id]){
+                    //    objective = json.objectives_assoc[outcome_id][objective_index]
+                    //    options += '<option value ="('+outcome_id+','+objective.objective_id+')">'+
+                    //        objective.text+'</option>';
+                    //}
                     $('#assoc_objective_'+i+'_counter_1').html(options);
                     $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh');
-                    if(json.objectives[outcome_id].length){
-                        objective_id = json.objectives[outcome_id][0].objective_id;
-                        value = "("+outcome_id+","+objective_id+")"
-                    $('#assoc_objective_'+i+'_counter_1').val(value);
+                    if(outcome.objectives_criteria.length){
+                        objective_id = outcome.objectives_criteria[0].objective_id;
+                        value = "("+outcome.id+","+objective_id+")"
+                                       $('#assoc_objective_'+i+'_counter_1').val(value);
                     $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh')
                     }
                     
 
-                    for(var j =1; i<json.objectives[outcome_id].length; i++ ){
+                    for(var j =1; j<outcome.objectives_criteria.length; j++ ){
                         addAssocObjective("assoc_objectiveGroupFor"+i, "assoc_objective_"+i);
-                        objective_id = json.objectives[outcome_id][j].objective_id;
-                        value = "("+outcome_id+","+objective_id+")";
+                        objective_id =outcome.objectives_criteria[j].objective_id;
+                        value = "("+outcome.id+","+objective_id+")";
                         $('#assoc_objective_'+i+'_counter_'+(j+1)).val(value);
                         $('#assoc_objective_'+i+'_counter_'+(j+1)).selectpicker('refresh');
                         
@@ -1169,22 +1189,21 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 
                 // Select associated program
-                var program_length = json.program.length;
+                var program_length = criterion.program.length;
                 $('input[type=checkbox]').prop('checked', false);
 
                 for (var i = 0; i < program_length; i++) {
-                    $('#assoc_program_id_' + json.program[i].program_id).prop("checked", true);
+                    $('#assoc_program_id_' + criterion.program[i].program_id).prop("checked", true);
                 }
 
-
                 // Select status
 
 
 
 
 
-            },
-            'json'
+            }
+            
         );
     }
 </script>@stop

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

@@ -36,7 +36,7 @@
                             </div>
                         </div>
                         <input type='hidden' name='counterObjective' id='counterObjective' value=1>
-                        <button class='btn btn-md btn-secondary button-add-objective' onclick='addObjectiveTest("objectiveGroupFor0", "objective_0")'>
+                        <button  class='btn btn-md btn-secondary button-add-objective' onclick='addObjectiveTest("objectiveGroupFor0", "objective_0")'>
                             <span class='glyphicon glyphicon-plus'>
 
                             </span>
@@ -117,7 +117,7 @@
                 Edit
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@update', 'id'=>'update_criterion')) }}
+                {{ Form::open(array('action' => 'CriteriaController@update','id'=>'update_criterion')) }}
 
                 <button class="btn btn-md btn-secondary filterButton">
                     <span class="glyphicon glyphicon-plus">
@@ -163,8 +163,8 @@
                     <div id='assocOutcomeGroup0' data-value="1">
                         <div class="form-group col-md-12">
                             <label>Outcome 1</label>
-                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
-
+                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
+    
                         </div>
                         <div id='assoc_objectiveGroupFor0' data-value="1">
                             <div class="form-group col-md-11">
@@ -547,8 +547,8 @@
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
-        //counter = parseInt($('#'+objectiveGroup).data("value"));
-        // $('#'+objectiveGroup).data("value", counter-1);
+        counter = parseInt($('#'+objectiveGroup).data("value"));
+         $('#'+objectiveGroup).data("value", counter-1);
 
 
     }
@@ -651,7 +651,7 @@
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome_' + assocOutcomeCounter.toString(),
-            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor' + assocOutcomeCounter + '")'
+            'onchange': 'fetchObjectiveForSelect("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor' + assocOutcomeCounter + '")'
 
         });
         var $div = $('<div/>', {
@@ -759,7 +759,7 @@
                 allOutcomes: allOutcomes
             },
 
-            function(json) {
+            function(varArray) {
 
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for (outcome in varArray.outcomes) {
@@ -785,16 +785,16 @@
                 }
 
                 for (var i = allObjectives.length - 1; i > 0; i--) {
-                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup');
+                    deleteObjective('assoc_objectiveForm_' + objectiveGroup +'_'+i, 'assoc_closeObj_'+objectiveGroup+'_' + i.toString(), objectiveGroup);
                 }
-                for (var i = 1; i < allObjectives.length; i++) {
+                /*for (var i = 1; i < allObjectives.length; i++) {
                     addAssocObjective();
                     $('#assoc_objective_' + i.toString()).selectpicker('refresh');
                     if ($("#assoc_objective_" + i.toString() + " option[value='" + allObjectives[i].value + "']").length > 0) {
                         $("#assoc_objective_" + i.toString()).val(allObjectives[i].value);
                         $("#assoc_objective_" + i.toString()).selectpicker("refresh");
                     }
-                }
+                }*/
 
 
 
@@ -932,9 +932,28 @@
             "{{ URL::action('CriteriaController@fetchCriterionWithTrashed') }}", {
                 id: id
             },
-            function(json) {
+                function(criterion) {
+
+                
+if (!(criterion.length)) {
+    name = ' ';
+    var subcriteria = '';
+    copyright = null;
+    notes = null;
+    $('#status').val(0);
+    maximum = 1;
+    $('#assoc_maximum_score').val(1);
 
-                if (!(json.activity_criterion.length)) {
+
+}
+
+
+else { 
+criterion = criterion[0];
+if (!(criterion.activity_criterion.length)) {
+
+
+              
 
                     $('#DeleteButton').prop('disabled', false);
                     $("#update_the_criterion").val('Update');
@@ -947,50 +966,38 @@
                     $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> The criterion is already used in assessments. Editting the criterion will actually create a new criterion </div>');
 
                 }
-
-                if (!(json.criteria.length)) {
-                    name = ' ';
-                    var subcriteria = '';
-                    copyright = null;
-                    notes = null;
-                    $('#status').val(0);
-                    maximum = 1;
-                    $('#assoc_maximum_score').val(1);
-
-
-                } else {
-                    var name = json.criteria[0].name;
-                    if (json.criteria[0].subcriteria) {
-                        subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
+                var name = criterion.name;
+                    if (criterion.subcriteria) {
+                        subcriteria = JSON.parse(criterion.subcriteria).join('\n');
                     } else {
                         subcriteria = "";
                     }
-                    if (json.criteria[0].copyright) {
-                        var copyright = json.criteria[0].copyright;
-                    } else {
+                    if (criterion.copyright) {
+                        var copyright = criterion.copyright;
+                 } else {
                         var copyright = ''
                     }
-                    if (json.criteria[0].notes) notes = json.criteria[0].notes;
-                    else notes = '';
+                    if (criterion.notes) notes = criterion.notes;
+                     else notes = '';
 
                     // Display info
                     $('#criterion_name').val(name);
                     $('#criterion_subcriteria').text(subcriteria);
-                    if (json.criteria[0].deleted_at)
+                    if (criterion.deleted_at)
                         $('#status').val(0);
                     else
                         $('#status').val(1);
-                    $('#assoc_maximum_score').val(json.criteria[0].max_score);
-                    var maximum = json.criteria[0].max_score;
+                        $('#assoc_maximum_score').val(criterion.max_score);
+                    var maximum = criterion.max_score;
 
                     addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales");
-                    $('#Num_assoc_scale').val(json.criteria[0].num_scales)
-                    $('#Num_assoc_scale').selectpicker('refresh');
+                    $('#Num_assoc_scale').val(criterion.num_scales)
+                  $('#Num_assoc_scale').selectpicker('refresh');
                     $('#Num_assoc_scale').trigger('change');
 
-                    for (i = 0; i < json.criteria[0].num_scales; i++) {
-                        $('#assoc_scale_' + i).val(json.scales[i].description);
-                    }
+                    for(i=0; i<criterion.num_scales;i++){
+                        $('#assoc_scale_'+i).val(criterion.scales[i].description);
+                     }
 
 
 
@@ -1022,36 +1029,48 @@
                     var Notran = true;
                 }
 
-                if (json.outcomes.length) {
-                    $('#assoc_outcome_0').val(json.outcomes[0].id);
-                    $('#assoc_outcome_0').selectpicker('refresh');
+                if (criterion.outcomes.length) 
+                    {
+                    $('#assoc_outcome_0').val(criterion.outcomes[0].id);
+                                    $('#assoc_outcome_0').selectpicker('refresh');
 
-                    var first_outcome_id = json.outcomes[0].id;
-                    options = "<option value ='0'>Nothing Selected</option>";
+                                    var first_outcome = criterion.outcomes[0];
+                   options = "<option value ='0'>Nothing Selected</option>";
+                   $(first_outcome.assoc_objectives).each(function(index, objective){
+
+options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
+    objective.text+'</option>';
 
-                    for (objective_index in json.objectives_assoc[first_outcome_id]) {
+})
+                    /*for (objective_index in json.objectives_assoc[first_outcome_id]) {
                         objective = json.objectives_assoc[first_outcome_id][objective_index]
                         options += '<option value ="(' + first_outcome_id + ',' + objective.objective_id + ')">' +
                             objective.text + '</option>';
-                    }
+                    }*/
                     $('#assoc_objective_0_counter_1').html(options);
                     $('#assoc_objective_0_counter_1').selectpicker('refresh');
 
-                    if (json.objectives[first_outcome_id].length) {
-                        objective_id = json.objectives[first_outcome_id][0].objective_id;
-                        value = '(' + first_outcome_id + ',' + objective_id + ')';
-                        $('#assoc_objective_0_counter_1').val(value);
+                    if(first_outcome.objectives_criteria.length){
+                        objective_id = first_outcome.objectives_criteria[0].objective_id;
+                    value = '('+first_outcome.id+','+objective_id+')';
+                  $('#assoc_objective_0_counter_1').val(value);
                         $('#assoc_objective_0_counter_1').selectpicker('refresh');
 
                     }
 
+                    if($("#assoc_objectiveGroupFor0").find(".btn-primary").length>0){
+                        $("#assoc_objectiveGroupFor0").find(".btn-primary").each(function(){
+                            $(this).click()
+                        })
+                    }
 
-                    for (var i = 1; i < json.objectives[first_outcome_id].length; i++) {
+                    for(var i =1; i<first_outcome.objectives_criteria.length; i++ ){
                         addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0");
-                        objective_id = json.objectives[first_outcome_id][i].objective_id;
-                        value = "(" + first_outcome_id + "," + objective_id + ")";
-                        $('#assoc_objective_0_counter_' + (i + 1)).val(value);
-                        $('#assoc_objective_0_counter_' + (i + 1)).selectpicker('refresh');
+                        objective_id = first_outcome.objectives_criteria[i].objective_id;
+                        value = "("+first_outcome.id+","+objective_id+")";
+                        $('#assoc_objective_0_counter_'+(i+1)).val(value);
+                        $('#assoc_objective_0_counter_'+(i+1)).selectpicker('refresh');
+                        
 
 
 
@@ -1065,37 +1084,46 @@
 
 
 
-                for (var i = 1; i < json.outcomes.length; i++) {
-                    addAssocOutcome(true);
+                for (var i = 1; i < criterion.outcomes.length; i++) {
+                                   addAssocOutcome(true);
 
 
-                    $('#assoc_outcome_' + i.toString()).val(json.outcomes[i].id);
-                    $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
+                                   $('#assoc_outcome_' + i.toString()).val(criterion.outcomes[i].id);
+                   $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
-                    var outcome_id = json.outcomes[i].id;
+                    var outcome = criterion.outcomes[i];
                     options = "<option value ='0'>Nothing Selected</option>";
 
-                    for (objective_index in json.objectives_assoc[outcome_id]) {
+                   
+                    $(outcome.assoc_objectives).each(function(index, objective){
+
+options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
+    objective.text+'</option>';
+
+})
+                    /*for (objective_index in json.objectives_assoc[outcome_id]) {
                         objective = json.objectives_assoc[outcome_id][objective_index]
                         options += '<option value ="(' + outcome_id + ',' + objective.objective_id + ')">' +
                             objective.text + '</option>';
-                    }
+                    }*/
                     $('#assoc_objective_' + i + '_counter_1').html(options);
                     $('#assoc_objective_' + i + '_counter_1').selectpicker('refresh');
-                    if (json.objectives[outcome_id].length) {
-                        objective_id = json.objectives[outcome_id][0].objective_id;
-                        value = "(" + outcome_id + "," + objective_id + ")"
-                        $('#assoc_objective_' + i + '_counter_1').val(value);
-                        $('#assoc_objective_' + i + '_counter_1').selectpicker('refresh')
+                    if(outcome.objectives_criteria.length){
+                        objective_id = outcome.objectives_criteria[0].objective_id;
+                        value = "("+outcome.id+","+objective_id+")"
+                    $('#assoc_objective_'+i+'_counter_1').val(value);
+                    $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh')
                     }
+                                        }
 
 
-                    for (var j = 1; i < json.objectives[outcome_id].length; i++) {
-                        addAssocObjective("assoc_objectiveGroupFor" + i, "assoc_objective_" + i);
-                        objective_id = json.objectives[outcome_id][j].objective_id;
-                        value = "(" + outcome_id + "," + objective_id + ")";
-                        $('#assoc_objective_' + i + '_counter_' + (j + 1)).val(value);
-                        $('#assoc_objective_' + i + '_counter_' + (j + 1)).selectpicker('refresh');
+                                        for(var j =1; j<outcome.objectives_criteria.length; j++ ){
+                        addAssocObjective("assoc_objectiveGroupFor"+i, "assoc_objective_"+i);
+                        objective_id =outcome.objectives_criteria[j].objective_id;
+                        value = "("+outcome.id+","+objective_id+")";
+                        $('#assoc_objective_'+i+'_counter_'+(j+1)).val(value);
+                        $('#assoc_objective_'+i+'_counter_'+(j+1)).selectpicker('refresh');
+                        
 
 
                     }

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

@@ -157,7 +157,7 @@
                     <div id='assocOutcomeGroup0' data-value="1">
                         <div class="form-group col-md-12">
                             <label>Outcome 1</label>
-                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
+                            {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchObjectiveForSelect("assoc_outcome_0", "assoc_objectiveGroupFor0")']) }}
     
                         </div>
     <div id='assoc_objectiveGroupFor0' data-value="1">
@@ -543,8 +543,8 @@ function addOutcomeTest() {
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
-        //counter = parseInt($('#'+objectiveGroup).data("value"));
-        //$('#'+objectiveGroup).data("value", counter-1);
+        counter = parseInt($('#'+objectiveGroup).data("value"));
+        $('#'+objectiveGroup).data("value", counter-1);
 
 
     }
@@ -647,7 +647,7 @@ function addOutcomeTest() {
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome_' + assocOutcomeCounter.toString(),
-            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
+            'onchange': 'fetchObjectiveForSelect("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
 
         });
         var $div = $('<div/>', {
@@ -757,7 +757,7 @@ function addOutcomeTest() {
                 allOutcomes: allOutcomes
             },
 
-            function(json) {
+            function(varArray) {
 
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for(outcome in varArray.outcomes){
@@ -783,16 +783,16 @@ function addOutcomeTest() {
                 }
 
                 for (var i = allObjectives.length - 1; i > 0; i--) {
-                    deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup');
+                    deleteObjective('assoc_objectiveForm_' + objectiveGroup +'_'+i, 'assoc_closeObj_'+objectiveGroup+'_' + i.toString(), objectiveGroup);
                 }
-                for(var i=1; i<allObjectives.length; i++){
+ /*               for(var i=1; i<allObjectives.length; i++){
                     addAssocObjective();
                     $('#assoc_objective_'+i.toString()).selectpicker('refresh');
                     if($("#assoc_objective_"+i.toString()+" option[value='"+allObjectives[i].value+"']").length>0){
                     $("#assoc_objective_"+i.toString()).val(allObjectives[i].value);
                     $("#assoc_objective_"+i.toString()).selectpicker("refresh");
                     }
-                }
+                }*/
 
 
 
@@ -929,9 +929,25 @@ function addOutcomeTest() {
             "{{ URL::action('CriteriaController@fetchCriterionWithTrashed') }}", {
                 id: id
             },
-            function(json) {
+            function(criterion) {
 
-                if (!(json.activity_criterion.length)) {
+                
+                if (!(criterion.length)) {
+                    name = ' ';
+                    var subcriteria = '';
+                    copyright = null;
+                    notes = null;
+                    $('#status').val(0);
+                    maximum = 1;
+                    $('#assoc_maximum_score').val(1);
+
+
+                }
+               
+
+ else { 
+     criterion = criterion[0];
+     if (!(criterion.activity_criterion.length)) {
 
 $('#DeleteButton').prop('disabled', false);
 $("#update_the_criterion").val('Update');
@@ -944,49 +960,37 @@ $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create
 $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> The criterion is already used in assessments. Editting the criterion will actually create a new criterion </div>');
 
 }
-
-                if (!(json.criteria.length)) {
-                    name = ' ';
-                    var subcriteria = '';
-                    copyright = null;
-                    notes = null;
-                    $('#status').val(0);
-                    maximum = 1;
-                    $('#assoc_maximum_score').val(1);
-
-
-                } else {
-                    var name = json.criteria[0].name;
-                    if (json.criteria[0].subcriteria) {
-                        subcriteria = JSON.parse(json.criteria[0].subcriteria).join('\n');
+                    var name = criterion.name;
+                    if (criterion.subcriteria) {
+                        subcriteria = JSON.parse(criterion.subcriteria).join('\n');
                     } else {
                         subcriteria = "";
                     }
-                    if (json.criteria[0].copyright) {
-                        var copyright = json.criteria[0].copyright;
+                    if (criterion.copyright) {
+                        var copyright = criterion.copyright;
                     } else {
                         var copyright = ''
                     }
-                    if (json.criteria[0].notes) notes = json.criteria[0].notes;
+                    if (criterion.notes) notes = criterion.notes;
                     else notes = '';
 
                     // Display info
                     $('#criterion_name').val(name);
                     $('#criterion_subcriteria').text(subcriteria);
-                    if (json.criteria[0].deleted_at)
+                    if (criterion.deleted_at)
                         $('#status').val(0);
                     else
                         $('#status').val(1);
-                    $('#assoc_maximum_score').val(json.criteria[0].max_score);
-                    var maximum = json.criteria[0].max_score;
+                    $('#assoc_maximum_score').val(criterion.max_score);
+                    var maximum = criterion.max_score;
 
                     addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales");
-                    $('#Num_assoc_scale').val(json.criteria[0].num_scales)
+                    $('#Num_assoc_scale').val(criterion.num_scales)
                     $('#Num_assoc_scale').selectpicker('refresh');
                     $('#Num_assoc_scale').trigger('change');
 
-                    for(i=0; i<json.criteria[0].num_scales;i++){
-                        $('#assoc_scale_'+i).val(json.scales[i].description);
+                    for(i=0; i<criterion.num_scales;i++){
+                        $('#assoc_scale_'+i).val(criterion.scales[i].description);
                     }
                     // If copyright or notes aren't empty, load them
 
@@ -1007,7 +1011,7 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
                 // Select associated outcome
                 try {
-                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup0").data('value'));
+                    assocOutcomeCounter = parseInt($("#assocOutcomeGroup0").data('value'));
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
                         $('#assoc_close_button'+i).click();
                                }
@@ -1016,35 +1020,48 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
                     var Notran = true;
                 }
 
-                if (json.outcomes.length) 
+                if (criterion.outcomes.length) 
                     {
-                    $('#assoc_outcome_0').val(json.outcomes[0].id);
+                    $('#assoc_outcome_0').val(criterion.outcomes[0].id);
                     $('#assoc_outcome_0').selectpicker('refresh');
 
-                    var first_outcome_id = json.outcomes[0].id;
+                    var first_outcome = criterion.outcomes[0];
                     options = "<option value ='0'>Nothing Selected</option>";
+                        $(first_outcome.assoc_objectives).each(function(index, objective){
 
-                    for(objective_index  in json.objectives_assoc[first_outcome_id]){
+                        options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
+                            objective.text+'</option>';
+
+                        })
+                    /*for(objective_index  in json.objectives_assoc[first_outcome_id]){
                         objective = json.objectives_assoc[first_outcome_id][objective_index]
                         options += '<option value ="('+first_outcome_id+','+objective.objective_id+')">'+
                             objective.text+'</option>';
-                    }
+                    }*/
                     $('#assoc_objective_0_counter_1').html(options);
                     $('#assoc_objective_0_counter_1').selectpicker('refresh');
                     
-                    if(json.objectives[first_outcome_id].length){
-                        objective_id = json.objectives[first_outcome_id][0].objective_id;
-                    value = '('+first_outcome_id+','+objective_id+')';
+                    if(first_outcome.objectives_criteria.length){
+                        objective_id = first_outcome.objectives_criteria[0].objective_id;
+                    value = '('+first_outcome.id+','+objective_id+')';
                     $('#assoc_objective_0_counter_1').val(value);
                     $('#assoc_objective_0_counter_1').selectpicker('refresh');
 
                     }
+
+                    if($("#assoc_objectiveGroupFor0").find(".btn-primary").length>0){
+                        $("#assoc_objectiveGroupFor0").find(".btn-primary").each(function(){
+                            $(this).click()
+                        })
+                    }
+
+
                     
 
-                    for(var i =1; i<json.objectives[first_outcome_id].length; i++ ){
+                    for(var i =1; i<first_outcome.objectives_criteria.length; i++ ){
                         addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0");
-                        objective_id = json.objectives[first_outcome_id][i].objective_id;
-                        value = "("+first_outcome_id+","+objective_id+")";
+                        objective_id = first_outcome.objectives_criteria[i].objective_id;
+                        value = "("+first_outcome.id+","+objective_id+")";
                         $('#assoc_objective_0_counter_'+(i+1)).val(value);
                         $('#assoc_objective_0_counter_'+(i+1)).selectpicker('refresh');
                         
@@ -1060,35 +1077,42 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 
                
-                for (var i = 1; i < json.outcomes.length; i++) {
+                for (var i = 1; i < criterion.outcomes.length; i++) {
                     addAssocOutcome(true);
 
 
-                    $('#assoc_outcome_' + i.toString()).val(json.outcomes[i].id);
+                    $('#assoc_outcome_' + i.toString()).val(criterion.outcomes[i].id);
                     $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
-                    var outcome_id = json.outcomes[i].id;
+                    var outcome = criterion.outcomes[i];
                     options = "<option value ='0'>Nothing Selected</option>";
 
-                    for(objective_index  in json.objectives_assoc[outcome_id]){
-                        objective = json.objectives_assoc[outcome_id][objective_index]
-                        options += '<option value ="('+outcome_id+','+objective.objective_id+')">'+
-                            objective.text+'</option>';
-                    }
+                    $(outcome.assoc_objectives).each(function(index, objective){
+
+options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
+    objective.text+'</option>';
+
+})
+                    //for(objective_index  in json.objectives_assoc[outcome_id]){
+                    //    objective = json.objectives_assoc[outcome_id][objective_index]
+                    //    options += '<option value ="('+outcome_id+','+objective.objective_id+')">'+
+                    //        objective.text+'</option>';
+                    // }
                     $('#assoc_objective_'+i+'_counter_1').html(options);
                     $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh');
-                    if(json.objectives[outcome_id].length){
-                        objective_id = json.objectives[outcome_id][0].objective_id;
-                        value = "("+outcome_id+","+objective_id+")"
+
+                    if(outcome.objectives_criteria.length){
+                        objective_id = outcome.objectives_criteria[0].objective_id;
+                        value = "("+outcome.id+","+objective_id+")"
                     $('#assoc_objective_'+i+'_counter_1').val(value);
                     $('#assoc_objective_'+i+'_counter_1').selectpicker('refresh')
                     }
                     
 
-                    for(var j =1; i<json.objectives[outcome_id].length; i++ ){
+                    for(var j =1; j<outcome.objectives_criteria.length; j++ ){
                         addAssocObjective("assoc_objectiveGroupFor"+i, "assoc_objective_"+i);
-                        objective_id = json.objectives[outcome_id][j].objective_id;
-                        value = "("+outcome_id+","+objective_id+")";
+                        objective_id =outcome.objectives_criteria[j].objective_id;
+                        value = "("+outcome.id+","+objective_id+")";
                         $('#assoc_objective_'+i+'_counter_'+(j+1)).val(value);
                         $('#assoc_objective_'+i+'_counter_'+(j+1)).selectpicker('refresh');
                         
@@ -1117,8 +1141,8 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
                 assocOutcomeCounter = 0;
                 var i = 0;
                 optionName = '<option value ="0">Nothing Selected</option>';
-                for(outcome in json.outcomes_assoc){
-                    optionName += '<optgroup label="' + json.outcomes_assoc[outcome][0].name + '">';
+                for(outcome in criterion.outcomes_assoc){
+                    optionName += '<optgroup label="' + criterion.outcomes_assoc[outcome][0].name + '">';
                     var objectiveForOutcome = json.objectives_assoc;
                     var objectives = objectiveForOutcome[outcome];
                     for (objective in objectives) {
@@ -1162,11 +1186,11 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
 
 
                 // Select associated program
-                var program_length = json.program.length;
+                var program_length = criterion.program.length;
                 $('input[type=checkbox]').prop('checked', false);
 
                 for (var i = 0; i < program_length; i++) {
-                    $('#assoc_program_id_' + json.program[i].program_id).prop("checked", true);
+                    $('#assoc_program_id_' + criterion.program[i].program_id).prop("checked", true);
                 }
 
 

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

@@ -383,7 +383,7 @@ function fetchCriteria(outcome, objective)
             data.forEach( function (arrayItem)
             {
                 $('#select-criterion')
-                    .append('<option data-criterion-id="'+arrayItem.id+'" >'+arrayItem.name+'</option>');
+                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = "'+arrayItem.program_ids+'" data-assoc-objectives = "'arrayItem.objectives'">'+arrayItem.name+'</option>');
             });
 
             // If there are no criteria assigned to the selected outcome, disable the