Ultimos migrations hopefully

app/controllers/CriteriaController.php

@@ -22,7 +22,7 @@ class CriteriaController extends \BaseController
 
         $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
         $programs = Program::where("id", "=", $userProgram[0]->program_id)->get();
-        return View::make('local.managers.pCoords.new_criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
+        return View::make('local.managers.pCoords.criteria', compact('title', 'outcomes', 'schools', 'criteria', 'programs', 'objectives'));
     }
 
     public function editSchool()
@@ -56,6 +56,12 @@ class CriteriaController extends \BaseController
         $json_to_send['criterion'] = DB::table('criteria')->where('id', '=', Input::get('id'))->first();
         $outcomeIDS = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $json_to_send['criterion']->id)->lists('outcome_id');
         Log::info($outcomeIDS);
+
+        $json_to_send['scales'] = DB::table('criterion_scale')
+            ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
+            ->where('criterion_id', Input::get('id'))
+            ->orderBy('position')
+            ->get();
         $json_to_send['outcomes'] = DB::table('outcomes')->whereIn('id', $outcomeIDS)->get();
         $outcomeStr = '';
         if (count($json_to_send['outcomes']) == 1) {
@@ -68,11 +74,6 @@ class CriteriaController extends \BaseController
             $outcomeStr = rtrim($outcomeStr, ',');
         }
         $json_to_send['outcomes'] = $outcomeStr;
-        $num_scales = Input::get('numberOfScale');
-        $criterionID = Input::get('id');
-
-        $json_to_send['scales'] = DB::select("select * from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id GROUP BY position order by position");
-        $json_to_send['crit_info'] = DB::select("select copyright, notes from template_criterion where id in (select template_criterion_id from scales, template_criterion_scale where template_criterion_scale.template_criterion_id in (select id from template_criterion where template_criterion.template_id in (SELECT id FROM templates where num_scales = {$num_scales}) and template_criterion.criterion_id = {$criterionID}) and scales.id = template_criterion_scale.scale_id  GROUP BY position  order by position) limit 1");
 
 
 

app/controllers/OutcomesController.php

@@ -412,7 +412,10 @@ class OutcomesController extends \BaseController
                 case 'all':
                     return DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
@@ -427,7 +430,10 @@ class OutcomesController extends \BaseController
                         $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('id'))
+                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                            ->where('criteria.max_score', '=', Input::get('maximum'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
@@ -445,7 +451,10 @@ class OutcomesController extends \BaseController
                         return 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('id'))
+                            ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                            ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                            ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                            ->where('criteria.max_score', '=', Input::get('maximum'))
                             ->whereIn('program_criterion.program_id', $program_ids)
                             ->select('criterion_id as id', 'name')
                             ->orderBy('name', 'ASC')
@@ -458,7 +467,10 @@ class OutcomesController extends \BaseController
                     $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('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->whereIn('program_criterion.program_id', Auth::user()->programs->lists('id'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
@@ -469,7 +481,10 @@ class OutcomesController extends \BaseController
                 default:
                     return DB::table('criteria')
                         ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                        ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                        ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                        ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                        ->where('criteria.max_score', '=', Input::get('maximum'))
                         ->select('criterion_id as id', 'name')
                         ->orderBy('name', 'ASC')
                         ->get();
@@ -478,7 +493,10 @@ class OutcomesController extends \BaseController
         } else {
             return DB::table('criteria')
                 ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
-                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('id'))
+                ->where('criterion_objective_outcome.outcome_id', '=', Input::get('outcome_id'))
+                ->where('criterion_objective_outcome.objective_id', '=', Input::get('objective_id'))
+                ->where('criteria.num_scales', '=', Input::get('num_scales'))
+                ->where('criteria.max_score', '=', Input::get('maximum'))
                 ->select('criterion_id as id', 'name')
                 ->orderBy('name', 'ASC')
                 ->get();

app/controllers/TemplatesController.php

@@ -135,30 +135,23 @@ class TemplatesController extends \BaseController
 				$template->program_id = Auth::user()->programs[0]->id;
 				break;
 		}
-		$scales = Input::get('scales');
+
 		$criteria = Input::get('criteria');
 
 		$max_score = Input::get('max_score');
-		$copyright = Input::get('copyright');
-		$notes = Input::get('notes');
-		Log::info($scales);
-		Log::info($criteria);
-		Log::info($copyright);
-		Log::info($notes);
+		$titles = Input::get('titles');
 
 
-		$template->num_scales = count($scales[0]);
+
+		$template->num_scales = count($titles);
 		$template->max_score = $max_score;
 
 		if ($template->save()) {
 			$templateId = $template->id;
 			foreach ($criteria as $index => $criterion_id) {
-				$note = $notes[$index];
-				$copy = $copyright[$index];
-				if ($copy == "Empty") $copy = NULL;
-				if ($note == "Empty") $note = NULL;
 
-				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `copyright`, `notes`) values ({$templateId},{$criterion_id}, '{$copy}', '{$note}')");
+
+				DB::insert("insert into template_criterion (`template_id`,`criterion_id`, `position`) values ({$templateId},{$criterion_id}, '{$index}')");
 				$template_criterion_id = DB::table('template_criterion')->where('template_id', '=', $templateId)
 					->where('criterion_id', '=', $criterion_id)->first();
 

app/database/migrations/2021_06_02_000507_create_rubrics_table.php

@@ -16,8 +16,8 @@ class CreateRubricsTable extends Migration
 			$table->integer('expected_points');
 			$table->integer('user_id')->unsigned();
 			$table->timestamps();
-			//$table->integer('num_scales')->unsigned();
-			//$table->integer('max_score')->unsigned();
+			$table->integer('num_scales')->unsigned();
+			$table->integer('max_score')->unsigned();
 		});
 
 		Schema::table('rubrics', function (Blueprint $table) {

app/database/migrations/2021_06_04_003757_create_activities_table.php

@@ -20,7 +20,7 @@ class CreateActivitiesTable extends Migration
 			//$table->text('outcomes_achieved')->nullable();
 			//$table->text('outcomes_attempted')->nullable();
 
-			$table->text('assessment_comments')->nullable();
+			//$table->text('assessment_comments')->nullable();
 			//$table->text('transforming_actions')->nullable();
 			//$table->text('criteria_achieved_percentage')->nullable();
 

app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php

@@ -29,8 +29,8 @@ class CreateActivityCriterionTable extends Migration
 				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
-			$table->text('transformative_actions')->nullable();
-			$table->text('assessment_comments')->nullable();
+			//$table->text('transformative_actions')->nullable();
+			//$table->text('assessment_comments')->nullable();
 
 
 			$table->decimal('weight', 6, 2)->default(1.0);

app/models/Title.php

@@ -0,0 +1,8 @@
+<?php
+
+use Illuminate\Database\Eloquent\SoftDeletingTrait;
+
+class Title extends Eloquent
+{
+    protected $table = 'titles';
+}

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

@@ -13,35 +13,43 @@
                 Create
             </div>
             <div class="panel-body">
-                {{ Form::open(array('action' => 'CriteriaController@create')) }}
-                <div id='outcomeGroup' data-value = "1">
+                {{ Form::open(array('action' => 'CriteriaController@create', 'id'=> 'create_criterion')) }}
+                <div id ='allOutcomes'>
+                <div id='outcomeGroup0' data-value = "1">
+                    <div class="form-group col-md-12">
+                        <label>Outcome 1</label>
+
+                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcome0", "objectiveGroupFor0")']) }}
+                    </div>
+                
+                <div id='objectiveGroupFor0' data-value = '1'>
                     <div class="form-group col-md-11">
-                        <label>Associated Outcomes</label>
+                        <label>Associated Objectives for Outcome 1</label>
+                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                        </select>
 
-                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")']) }}
+                    </div>
+                    <div class = "col-md-1">
                     </div>
                 </div>
-                <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
-                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
+                <input type='hidden' name='counterObjective' id='counterObjective' value=1>
+                <button  class='btn btn-md btn-secondary button-add-objective' onclick='addObjectiveTest("objectiveGroupFor0", "objective_0")'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
-                    Add another Outcome
+                    Add another Objective
                 </button>
-                <div id='objectiveGroup' data-value = '1'>
-                    <div class="form-group">
-                        <label>Associated Objectives</label>
-                        <select id="objective_0" name="objective[]" class="form-control selectpicker">
-                        </select>
-
-                    </div>
+                
+                <br></div><hr>
                 </div>
-                <input type='hidden' name='counterObjective' id='counterObjective' value=1>
-                <button id='button-add-objective' class='btn btn-md btn-secondary' onclick='addObjectiveTest()'>
+                
+                <input type='hidden' name='counterOutcome' id='counterOutcome' value=1>
+                
+                <button id='button-add-outcome' class='btn btn-md btn-secondary' onclick='addOutcomeTest()'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
-                    Add another Objective
+                    Add another Outcome
                 </button>
 
                 <!-- Associated Program -->
@@ -92,7 +100,7 @@
                     {{ Form::textarea('notes', '', array('class' => 'form-control', 'rows'=>2, 'placeholder'=>'(optional)', 'aria-labelledby'=>'notes')) }}
                 </div>
 
-                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Create', array('class' => 'btn btn-primary btn-block', 'id'=>'create_the_criterion')) }}
                 {{ Form::close() }}
             </div>
         </div>
@@ -104,7 +112,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">
@@ -126,6 +134,7 @@
 
                 </div>
                 </div>
+                <hr>
 
                 <div class="form-group">
                     {{ Form::label('criterion_id', 'Criterion') }}
@@ -144,38 +153,41 @@
                         @endforeach
                     </select>
                 </div>
-
+                <div id ='allAssocOutcomes'>
                 <!-- Associated Outcome -->
-                <div id='assocOutcomeGroup' data-value="1">
-                    <div class="form-group">
-                        <label>Associated Outcome</label>
-                        {{ Form::select('assoc_outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome_0', 'onchange'=>'fetchAssocObjective("assoc_outcome_0")']) }}
+                <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")']) }}
 
                     </div>
-                </div>
-                <button id='button-add-objective-assoc' class='btn btn-md btn-secondary' onclick='addAssocOutcome()'>
-                    <span class='glyphicon glyphicon-plus'>
-
-                    </span>
-                    Add another Outcome
-                </button>
-
-                <div id='assoc_objectiveGroup' data-value="1">
-                    <div class="form-group">
-                        <label>Associated Objectives</label>
-                        <select id="assoc_objective_0" name="assoc_objective[]" class="form-control selectpicker">
+<div id='assoc_objectiveGroupFor0' data-value="1">
+                    <div class="form-group col-md-11">
+                        <label>Associated Objectives for Outcome 1</label>
+                        <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker">
                             <option value="0">No associated objectives</option>
                         </select>
 
-                    </div>
+                    </div> <div class ='col-md-1'></div>
                 </div>
-                <button id='button-add-outcome-assoc' class='btn btn-md btn-secondary' onclick='addAssocObjective()'>
+               
+
+               <button id='button-add-objective-assoc' class='btn btn-md btn-secondary' onclick='addAssocObjective("assoc_objectiveGroupFor0", "assoc_objective_0")'>
                     <span class='glyphicon glyphicon-plus'>
 
                     </span>
                     Add another Objective
+                </button> </div><hr></div>
+                <button  class='btn btn-md btn-secondary button-add-outcome-assoc' onclick='addAssocOutcome()'>
+                    <span class='glyphicon glyphicon-plus'>
+
+                    </span>
+                    Add another Outcome
                 </button>
 
+                
+                
+
                 <!-- Associated Program -->
                 <div class="form-group">
 
@@ -213,8 +225,8 @@
                     {{ Form::textarea('subcriteria', '', array('class' => 'form-control', 'rows'=>3, 'id' => 'criterion_subcriteria')) }}
                 </div>
                 <div class="form-group">
-                    {{ Form::label('assoc_maximum_score', 'Maximum Score') }}
-                    {{ Form::text('assoc_maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
+                    {{ Form::label('maximum_score', 'Maximum Score') }}
+                    {{ Form::text('maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
                 </div>
 
 
@@ -241,7 +253,7 @@
                     {{ Form::textarea('notes', Input::old('notes'), array('class' => 'form-control', 'rows'=>2, 'id'=>'criterion_notes', 'placeholder'=>'(optional)')) }}
                 </div>
                
-                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block', 'id'=>'update_the_criterion')) }}
                 {{ Form::close() }}
                 {{ Form::open(array('action' => 'CriteriaController@delete')) }}
                 
@@ -265,6 +277,19 @@
         numberOfScales('Num_scale', 'Scales');
     });
 
+    $(document).on('submit', '#create_criterion', function(e){
+
+        if(e.originalEvent.submitter.id != "create_the_criterion")
+        e.preventDefault();
+    })
+
+    $(document).on('submit', '#update_criterion', function(e){
+
+if(e.originalEvent.submitter.id != "update_the_criterion")
+e.preventDefault();
+})
+
+
     function addOptions(select, max, scaleDiv) {
 
         
@@ -297,11 +322,11 @@
 
             fullDiv = '';
         if(division ==1){
-            for (var i = dataValue; i < amountOfScale; i++) {
+            for (var i = 0; i < amountOfScale; i++) {
                 div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(i+1)+')</label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea id = "assoc_scale_'+i+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
 
 
@@ -311,7 +336,7 @@
             div = '<div id="assoc_eval' +0 + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + 0 + '">Scale Description ('+1+' - '+maximum+') </label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + 0 + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea id = "assoc_scale_'+0+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + 0 + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
         }
         else{
@@ -320,7 +345,7 @@
             div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
                     '<div class ="form-group">' +
                     '<label for ="assoc_descripcion' + i.toString() + '">Scale Description ('+(1+(i*division))+' - '+((1+i)*division)+')</label>' +
-                    '<textarea class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                    '<textarea  id = "assoc_scale_'+i+'" class="form-control" rows="2" aria-labelledby="assoc_descripcion' + i.toString() + '" name="Scales[]" cols="50" ></textarea></div></div>';
                 fullDiv += div;
         }
         }
@@ -346,11 +371,13 @@
         var amountOfScale = parseInt($('#' + string).val());
         var dataValue = parseInt($('#' + Scales).attr('data-value'));
         var division = maximum/amountOfScale;
-        //add
-    
 
 
 
+        
+        //add
+    
+
             fullDiv = '';
             if(division ==1){
                 for (var i = 0; i < amountOfScale; i++) {
@@ -403,18 +430,20 @@ $('.filterSection').hide();
 
     //Add outcome Button
     function addOutcomeTest() {
-        counter = parseInt($('#outcomeGroup').data("value"));
+
+
+        counter = parseInt($('#outcomeGroup0').data("value"));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'outcome' + counter.toString(),
-            'onchange': 'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")'
+            'onchange': 'fetchObjectiveForSelect("outcome'+counter+'", "objectiveGroupFor'+counter+'")'
 
         });
         var $div = $('<div/>', {
             'id': 'outcomeForm' + counter.toString(),
-            'class': 'form-group col-md-11'
+            'class': 'form-group col-md-11 '
         });
 
         var $divForButton = $('<div/>', {
@@ -425,20 +454,68 @@ $('.filterSection').hide();
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("outcomeForm'+counter.toString()+'", "outcomeGroup", "close' + counter.toString() + '", "objectiveGroup")'
-   });
+            'onclick': '$(this).parent().parent().remove();'
+        });
+        var divForGroup = $('<div/>', {
+            'id' : 'outcomeGroup'+counter.toString(),
+        }).html("<label>Outcome "+(counter+1)+"</label>");
+        
+
+        var objectiveGroup = $('<div/>', {
+            'id' : 'objectiveGroupFor'+counter,
+            'data-value': '1'
+        });
+
+        var form_group_for_objective = $('<div/>', {
+            'class': 'form-group col-md-11'
+        }).html('<label>Associated Objectives for Outcome '+(counter+1)+'</label>'); 
+        
+        
+        var $select_objective = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "objective[]",
+            'data-live-search': 'true',
+            'id': 'objective_'+counter +'_counter_1'  
+        });
+
+        var empty_div = $('<div/>',{
+            'class': 'col-md-1'
+        });
+
+        
+
+        var button_for_add = $('<button/>', {
+            'class': 'btn btn-md btn-secondary button-add-objective',
+            'onclick': 'addObjectiveTest("objectiveGroupFor'+counter+'", "objective_'+counter+'")'
+        }).html("<span class='glyphicon glyphicon-plus'></span>Add another Objective");
+        
+        
+        divForGroup.append($div)
 
         $button.append('X');
         $divForButton.append($button);
-
-        $div.appendTo('#outcomeGroup')
+        
+       
+        $('#allOutcomes').append(divForGroup);
         $select.append(selectOptions);
 
         $select.appendTo('#outcomeForm' + counter.toString()).selectpicker('refresh');
-        $('#outcomeGroup').data("value", (counter +1));
-        fetchObjectiveForSelect('outcomeGroup', "objectiveGroup");
-        counter += 1;
-        $divForButton.appendTo('#outcomeGroup');
+        $('#outcomeGroup0').data("value", (counter +1));
+        
+        
+        divForGroup.append($divForButton);
+
+        form_group_for_objective.append($select_objective)
+        objectiveGroup.append(form_group_for_objective);
+        objectiveGroup.append(empty_div);
+        //objectiveGroup.append(button_for_add);
+
+        divForGroup.append(objectiveGroup);
+        divForGroup.append(button_for_add);
+        divForGroup.append('<hr>');
+        fetchObjectiveForSelect('outcome'+counter, "objectiveGroupFor"+counter);
+        $select_objective.selectpicker('refresh');
+
 
         
 
@@ -466,91 +543,96 @@ $('.filterSection').hide();
         $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);
 
 
     }
 
     //Add objective when editing
 
-    function addAssocObjective() {
-        selectObj = document.getElementById('assoc_objective_0').innerHTML;
-        assocObjectiveCounter = parseInt($('#assoc_objectiveGroup').data('value'));
+    function addAssocObjective(objForGroup, originalObjective) {
+        counter = $("#"+objForGroup).data('value');
+
+        selectObj = document.getElementById(originalObjective+'_counter_1').innerHTML;
+        assocObjectiveCounter = parseInt($('#'+objForGroup).data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
-            'name': "assoc_objective[]",
+            'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'assoc_objective_' + assocObjectiveCounter.toString(),
+            'id': originalObjective+'_counter_' + (assocObjectiveCounter+1).toString(),
 
 
         });
         var $div = $('<div/>', {
-            'id': 'assoc_objectiveForm' + assocObjectiveCounter.toString(),
-            'class': 'form-group col-md-11'
+            'id': 'assoc_objectiveForm_'+objForGroup +'_' + assocObjectiveCounter.toString(),
+            'class': 'form-group col-md-10'
         });
         var $divForButton = $('<div/>', {
-            'class': 'col-md-1',
-            'id': 'assoc_closeObj' + assocObjectiveCounter.toString()
+            'class': 'col-md-2',
+            'id': 'assoc_closeObj_'+objForGroup+'_' + assocObjectiveCounter.toString()
 
         });
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("assoc_objectiveForm' + assocObjectiveCounter.toString() + '", "assoc_closeObj' + assocObjectiveCounter.toString() + ', "assoc_objectiveGroup")'
+            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'")'
         });
 
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#assoc_objectiveGroup')
+        $div.appendTo('#'+objForGroup)
         $select.append(selectObj);
 
-        $select.appendTo('#assoc_objectiveForm' + assocObjectiveCounter.toString()).selectpicker('refresh');
-        $('#assoc_objectiveGroup').data("value", assocObjectiveCounter +1);
+        $select.appendTo($div).selectpicker('refresh');
+        //$('#assoc_objectiveGroup').data("value", assocObjectiveCounter +1);
 
-        $divForButton.appendTo('#assoc_objectiveGroup');
+        $divForButton.appendTo('#'+objForGroup);
+        $('#'+ objForGroup).data('value', counter +1);
 
     }
 
 
     //Add objective when creating a criteria
-    function addObjectiveTest() {
-        selectObj = document.getElementById('objective_0').innerHTML;
-        counter = parseInt($("#objectiveGroup").data('value'));
+    function addObjectiveTest(objForGroup, originalObjective) {
+
+        counter  =$('#'+objForGroup).data('value');
+
+        selectObj = document.getElementById(originalObjective+'_counter_1').innerHTML;
+
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'objective_' + counter.toString()
-
+            'id': originalObjective +'_counter_' + (counter+1).toString()
         });
         var $div = $('<div/>', {
-            'id': 'objectiveForm' + counter.toString(),
-            'class': 'form-group col-md-11'
+            'id': 'objectiveForm_'+objForGroup + '_' + counter.toString(),
+            'class': 'form-group col-md-10'
         });
         var $divForButton = $('<div/>', {
-            'class': 'col-md-1',
-            'id': 'closeObj' + counter.toString()
+            'class': 'col-md-2',
+            'id': 'closeObj_'+objForGroup+'_' + counter.toString()
 
         });
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("objectiveForm' + counter.toString() + '", "closeObj' + counter.toString() + '")'
+            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'")'
         });
 
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#objectiveGroup')
+        $div.appendTo('#'+objForGroup)
         $select.append(selectObj);
 
-        $select.appendTo('#objectiveForm' + counter.toString()).selectpicker('refresh');
+        $select.appendTo($div).selectpicker('refresh');
         
 
-        $divForButton.appendTo('#objectiveGroup');
-        $('#objectiveGroup').data('value', counter +1);
+        $divForButton.appendTo('#'+objForGroup);
+        $('#'+ objForGroup).data('value', counter +1);
     }
 
     //Create outcome for editing
@@ -558,14 +640,14 @@ $('.filterSection').hide();
     var assocOutcomeCounter = 0;
 
 
-    function addAssocOutcome() {
-        assocOutcomeCounter = parseInt($('#assocOutcomeGroup').data('value'));
+    function addAssocOutcome(depends= null) {
+        assocOutcomeCounter = parseInt($('#assocOutcomeGroup0').data('value'));
         var $select = $('<select/>', {
             'class': "selectpicker form-control",
-            'name': "assoc_outcome[]",
+            'name': "outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome_' + assocOutcomeCounter.toString(),
-            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '")'
+            'onchange': 'fetchAssocObjective("assoc_outcome_' + assocOutcomeCounter.toString() + '", "assoc_objectiveGroupFor'+assocOutcomeCounter+'")'
 
         });
         var $div = $('<div/>', {
@@ -581,20 +663,67 @@ $('.filterSection').hide();
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLast("assoc_outcomeForm' + assocOutcomeCounter.toString() + '", "assocOutcomeGroup", "assoc_close' + assocOutcomeCounter.toString() + '","assoc_objectiveGroup")'
+            'id': 'assoc_close_button'+assocOutcomeCounter,
+            'onclick': '$(this).parent().parent().remove()'
          });
 
+        var divForGroup = $('<div/>', {
+            'id' : 'assocOutcomeGroup'+assocOutcomeCounter.toString(),
+        }).html("<label>Outcome "+(assocOutcomeCounter+1)+"</label>");
+
+        var objectiveGroup = $('<div/>', {
+            'id' : 'assoc_objectiveGroupFor'+assocOutcomeCounter,
+            'data-value': '1'
+        });
+        var form_group_for_objective = $('<div/>', {
+            'class': 'form-group col-md-11'
+        }).html('<label>Associated Objectives for Outcome '+(assocOutcomeCounter+1)+'</label>'); 
+        
+        var $select_objective = $('<select/>', {
+            'class': "selectpicker form-control",
+            'name': "objective[]",
+            'data-live-search': 'true',
+            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1'  
+        });
+
+        var empty_div = $('<div/>',{
+            'class': 'col-md-1'
+        });
+
+        var button_for_add = $('<button/>', {
+            'class': 'btn btn-md btn-secondary button-add-objective',
+            'onclick': 'addAssocObjective("assoc_objectiveGroupFor'+assocOutcomeCounter+'", "assoc_objective_'+assocOutcomeCounter+'")'
+        }).html("<span class='glyphicon glyphicon-plus'></span>Add another Objective");
+        
+        divForGroup.append($div)
         $button.append('X');
         $divForButton.append($button);
 
-        $div.appendTo('#assocOutcomeGroup')
+        $('#allAssocOutcomes').append(divForGroup);
+        
+
+        //$div.appendTo('#assocOutcomeGroup')
         $select.append(selectOptions);
 
         $select.appendTo('#assoc_outcomeForm' + assocOutcomeCounter.toString()).selectpicker('refresh');
-         assocOutcomeCounter += 1;
-        $divForButton.appendTo('#assocOutcomeGroup');
+        //assocOutcomeCounter += 1;
+        $('#assocOutcomeGroup0').data('value', assocOutcomeCounter+1);
+        //$divForButton.appendTo('#assocOutcomeGroup');
+        divForGroup.append($divForButton);
+
+        form_group_for_objective.append($select_objective)
+        objectiveGroup.append(form_group_for_objective);
+        objectiveGroup.append(empty_div);
+        //objectiveGroup.append(button_for_add);
+
+        divForGroup.append(objectiveGroup);
+        divForGroup.append(button_for_add);
+        divForGroup.append('<hr>');
+        if(!depends)fetchObjectiveForSelect('assoc_outcome_'+assocOutcomeCounter, 'assoc_objectiveGroupFor'+assocOutcomeCounter);
+        $select_objective.selectpicker('refresh');
+
 
-        $('#assocOutcomeGroup').data('value', assocOutcomeCounter);
+       
 
 
     }
@@ -673,13 +802,10 @@ $('.filterSection').hide();
     //Fetch objective at creating criteria
     counterForPost = 0;
 
-    function fetchObjectiveForSelect(outcomeDiv, objectiveGroup) {
-        var count = $("#" + outcomeDiv).data('value');
-        var allOutcomes = [];
-        $("#" + outcomeDiv + ' select').each(function() {
-            allOutcomes.push( this.value);
+    
 
-        })
+    function fetchObjectiveForSelect(outcome, objectiveGroup) {
+        outcomeID = $('#'+outcome).val();
         var allObjectives = [];
         $("#" + objectiveGroup + ' select').each(function() {
             var temp = {
@@ -691,11 +817,18 @@ $('.filterSection').hide();
 
         $.post(
             "{{ URL::action('CriteriaController@fetchObjectivesForSelect') }}", {
-                allOutcomes: allOutcomes
+                outcomeID: outcomeID
             },
             function(varArray) {
                 counterOutcome =0;
                 optionName = '<option value ="0">Nothing Selected</option>';
+                for(index in varArray){
+                    objectiveObject = varArray[index];
+                    optionName += '<option value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
+                        objectiveObject.text+'</option>';
+
+                }
+                /*
                 for(outcome in varArray.outcomes){
                     optionName += '<optgroup label="' + varArray.outcomes[outcome][0].name + '">';
                     var objectiveForOutcome = varArray.objectives;
@@ -708,12 +841,17 @@ $('.filterSection').hide();
                         optionName += (option);
                     }
                     optionName += "</optgroup>";
-                }
+                }*/
                 
-
+                for(index in allObjectives){
+                    
+                    id = allObjectives[index].id
+                    $('#'+id).html(optionName);
+                    $('#'+id).selectpicker('refresh');
+                }
                 
 
-                $('#objective_0').html(optionName);
+                /*$('#objective_0').html(optionName);
                 $('#objective_0').selectpicker('refresh');
                 if($("#objective_0 option[value='"+allObjectives[0].value+"']").length>0){
                     $("#objective_0").val(allObjectives[0].value);
@@ -731,7 +869,7 @@ $('.filterSection').hide();
                     $("#objective_"+i.toString()).val(allObjectives[i].value);
                     $("#objective_"+i.toString()).selectpicker("refresh");
                 }
-                }
+                }*/
 
                 
 
@@ -794,11 +932,17 @@ $('.filterSection').hide();
 
                 if (!(json.activity_criterion.length)) {
 
-$('#DeleteButton').prop('enabled', true);
+                    $('#DeleteButton').prop('disabled', false);
+                    $("#update_the_criterion").val('Update');
+                    $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update')}}")
 
-} else {
-$('#DeleteButton').prop('disabled', true);
-}
+                } else {
+                    $('#DeleteButton').prop('disabled', true);
+                    $("#update_the_criterion").val("Create New")
+                    $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create')}}")
+                    alert("The criterion is already used in assessments. Editting the criterion will actually create a new criterion");
+
+                    }
 
                 if (!(json.criteria.length)) {
                     name = ' ';
@@ -832,8 +976,19 @@ $('#DeleteButton').prop('disabled', true);
                         $('#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(json.criteria[0].max_score);
+                    var maximum = json.criteria[0].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').trigger('change');
+
+                    for(i=0; i<json.criteria[0].num_scales;i++){
+                        $('#assoc_scale_'+i).val(json.scales[i].description);
+                    }
+
+
 
                     // If copyright or notes aren't empty, load them
 
@@ -854,10 +1009,11 @@ $('#DeleteButton').prop('disabled', true);
 
                 // Select associated outcome
                 try {
-                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup").data('value'));
+                    assocOutcomeCounter= parseInt($("#assocOutcomeGroup0").data('value'));
                     for (var i = assocOutcomeCounter - 1; i > 0; i--) {
-                        deleteLast("assoc_outcomeForm" + i.toString() , "assocOutcomeGroup", "assoc_close" + i.toString() ,"assoc_objectiveGroup");
+                        $('#assoc_close_button'+i).click();
                                }
+                    $('#assocOutcomeGroup0').data('value', 1);
                 } catch (err) {
                     var Notran = true;
                 }
@@ -865,36 +1021,102 @@ $('#DeleteButton').prop('disabled', true);
                 if (json.outcomes.length) {
                     $('#assoc_outcome_0').val(json.outcomes[0].id);
                     $('#assoc_outcome_0').selectpicker('refresh');
+
+                    var first_outcome_id = json.outcomes[0].id;
+                    options = "<option value ='0'>Nothing Selected</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+')';
+                    $('#assoc_objective_0_counter_1').val(value);
+                    $('#assoc_objective_0_counter_1').selectpicker('refresh');
+
+                    }
+                    
+
+                    for(var i =1; i<json.objectives[first_outcome_id].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');
+                        
+
+
+                    }
+                    
                 } else {
                     $('#assoc_outcome_0').val($('#assoc_outcomes_fetch').find(':selected').val());
                     $('#assoc_outcome_0').selectpicker('refresh');
+
                 }
 
 
 
                 for (var i = 1; i < json.outcomes.length; i++) {
-                    addAssocOutcome();
+                    addAssocOutcome(true);
+
+
                     $('#assoc_outcome_' + i.toString()).val(json.outcomes[i].id);
                     $('#assoc_outcome_' + i.toString()).selectpicker('refresh');
 
+                    var outcome_id = json.outcomes[i].id;
+                    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>';
+                    }
+                    $('#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')
+                    }
+                    
+
+                    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');
+                        
+
+                    }
+
                 }
 
-                counterObj =$('#assoc_objectiveGroup').data('value');
+                
 
 
-                try {
+                /*try {
                     for (var i = counterObj - 1; i > 0; i--) {
                         deleteObjective('assoc_objectiveForm' + i.toString(), 'assoc_closeObj' + i.toString(), 'assoc_objectiveGroup')
                     }
                 } catch (err) {
                     var noEntro = true;
-                }
-                $('#assoc_objectiveGroup').data('value', 1);
+                }*/
 
 
+                //$('#assoc_objectiveGroup').data('value', 1);
+                //counterObj =$('#assoc_objectiveGroup').data('value');
 
 
 
+
+        /*
                 assocOutcomeCounter = 0;
                 var i = 0;
                 optionName = '<option value ="0">Nothing Selected</option>';
@@ -945,7 +1167,7 @@ $('#DeleteButton').prop('disabled', true);
                 
 
 
-
+        */
 
 
 
@@ -977,7 +1199,7 @@ $('.panel-group .panel-body').hide();
 $('#outcome-display').parent().hide();
 
 fetchCriterionForEditing();
-fetchObjectiveForSelect('outcomeGroup', 'objectiveGroup');
+fetchObjectiveForSelect('outcome0', 'objectiveGroupFor0');
 // setCriterionStatus();
 
 
@@ -1000,7 +1222,7 @@ $('.filterButton').on('click', function(e) {
     
     return false;
     });
-$('#button-add-objective-assoc').on('click', function(e) {
+$('.button-add-objective-assoc').on('click', function(e) {
 // Prevent the default action of the clicked item. In this case that is submit
 e.preventDefault();
 
@@ -1014,7 +1236,7 @@ e.preventDefault();
 
 return false;
 });
-$('#button-add-objective').on('click', function(e) {
+$('.button-add-objective').on('click', function(e) {
 // Prevent the default action of the clicked item. In this case that is submit
 e.preventDefault();
 

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

@@ -203,7 +203,7 @@
                 </div>
                 <div class="form-group">
                     <label>Select an Objective</label>
-                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), this)">
+                    <select id="select-objective" class="form-control selectpicker" onchange="fetchCriteria($('#select-outcome'), $(this))">
                         
                     </select>
                 </div>
@@ -224,7 +224,7 @@
                 </div>
                 <div class="form-group">
                     <label>Select the Type of Rubric</label>
-                <select id="number_of_scales" class="form-control selectpicker">
+                <select id="number_of_scales" class="form-control selectpicker" onchange ="fetchCriteria($('#select-outcome'), $('#select-objective'))">
                     @for($i = 1; $i <= 20; $i++)
                     @if(8%$i == 0)
                     @if($i==1)
@@ -275,6 +275,9 @@
     <div class="col-md-12">
         <table class="table table-striped table-condensed" style="table-layout: fixed">
             <thead id="theHead"><tr><th colspan="7 "><input id="rubric-name" type="text" class="form-control input-lg" placeholder="Rubric Name"></th></tr></thead>
+            <thead id = "theScaleTitles">
+
+            </thead>
             <thead>
                 <tr id ="criterion-header">
                     <th></th>
@@ -287,7 +290,7 @@
 
         <div id="copyright-info">
             <hr>
-            <p class="small"><strong>Outcomes Evaluated</strong></p>
+            <p class="small"><strong>Copyright</strong></p>
             <ul id="copyright-list" class="list-unstyled small">
             </ul>
             <hr>
@@ -340,11 +343,17 @@ function fetchObjective(outcome){
 // Fetch criteria associated to a specific learning outcome
 function fetchCriteria(outcome, objective)
 {
+    amount_of_scales = parseInt($('#number_of_scales').find(':selected').val());
+            
+    maximum = parseInt($('#max_score').find(":selected").val());
     $.post
     (
         "{{ URL::route('fetchCriteria') }}",
         {
-            id: outcome.find(':selected').data('outcome-id'),
+            outcome_id: outcome.find(':selected').data('outcome-id'),
+            objective_id: objective.find(':selected').val(),
+            num_scales: amount_of_scales,
+            maximum: maximum,
             filter: $('input[name=criteria-filter]:checked').val()
         },
         function(data)
@@ -427,15 +436,17 @@ function addCriterion()
     (
         "{{ URL::route('fetchCriterionWithTemplate') }}",
         { id: id,
-        numberOfScale: numberOfScale },
+         },
         function(data)
         {
             // Append the fetched data
             copyright = null;
             notes = null;
-            if(data.crit_info.length){
-                copyright = data.crit_info[0].copyright;
-                notes = data.crit_info[0].notes;
+            if(data.criterion.copyright){
+                copyright = data.criterion.copyright;
+            }
+            if(data.criterion.notes){
+                notes = data.criterion.notes;
             }
             
             
@@ -462,17 +473,14 @@ function addCriterion()
                 str+='<span>'+data.criterion.name+'</span><sup></sup>'+subcriteria+'</td>';
             }
             numberOfScale = $('#number_of_scales').find(':selected').val();
-            if(data.scales.length)
+            
             for(i=0; i<numberOfScale; i++){
-                str+='<td class="editable" data-type="textarea">'+data.scales[i].description+'</td>';
+                str+='<td>'+data.scales[i].description+'</td>';
                 
           
             }
-            else{
-                for(i=0; i<numberOfScale; i++){
-                str+='<td class="editable" data-type="textarea"></td>';
-            }
-        }
+           
+        
         str+= '<td>'+data.outcomes+'</td>'
         
 
@@ -540,8 +548,8 @@ function buildCopyrightList()
     {
         var criterion = $(this);
         // If there's copyright info
-        if(criterion.data('copyright')!=null){
-            var copyright = criterion.data('copyright');
+        if(criterion.data('criterion-copyright')!=null){
+            var copyright = criterion.data('criterion-copyright');
             if($('#copyright-list li').length>0)
             {
                 var found = false;
@@ -661,6 +669,7 @@ function refreshSelects()
     $('#expected_percentage').selectpicker('refresh');
     $('#expected_points').selectpicker('refresh');
     $('#number_of_scales').selectpicker('refresh');
+    $('#select-objective').selectpicker('refresh');
 }
 
 // Fetch programs associated to a specific school
@@ -948,6 +957,7 @@ function toggleProgramSelect(school)
 
 }
 
+fetchObjective($('#select-outcome'));
 // --------------------------------------------------------------------------
 // Events
 // --------------------------------------------------------------------------
@@ -1037,17 +1047,20 @@ function changeTable(){
             
            
             newScaleHeaders = '<th></th><th>Criterion</th>';
+            editableTitles = '<th></th><th></th>';
             counter = 0;
             division = maximum/amount_of_scales;
             if(amount_of_scales==1){
-                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Score (1 - "+maximum+")</th>";
+                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+                editableTitles += "<th  class = 'editable' data-type = 'textarea'>Click to edit Title </th>"
             }
             else if(maximum!= amount_of_scales){
             while(counter <amount_of_scales){
                 
                 minimumScore = 1+(counter*division);
                 maximumScore = (1+counter)*division;
-                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                editableTitles+="<th  class = 'editable' data-type = 'textarea'>Click to edit Title "+(counter+1)+"</th>"
                 counter++;
             }
             }else{
@@ -1055,11 +1068,16 @@ function changeTable(){
                 
        
                 newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
+                editableTitles+="<th  class = 'editable' data-type = 'textarea'>Click to edit Title "+(counter+1)+"</th>"
+              
                 counter++;
             }
             }
             newScaleHeaders += '<th>Outcomes</th><th></th>';
-            
+            editableTitles += '<th></th><th></th>';
+
+
+            $('#theScaleTitles').html(editableTitles);
             $("#criterion-header").html(newScaleHeaders);
             $('#allCriteria').html(' ');
 }
@@ -1099,6 +1117,7 @@ $('#max_score').on('change', function(){
     $('#expected_points').val(expected_points);
     refreshSelects();
     changeTable();
+    fetchCriteria($('#select-outcome'), $('#select-objective'))
 })
 $('#number_of_scales').on('change', function(){
     changeTable();
@@ -1165,12 +1184,7 @@ $('.save').on('click', function(e)
     var criteriaArray = new Array();
 
     var criteria = [];
-    scales = [];
-    scalesMaxArray =[];
-    scalesMinArray =[];
-    scales_id =[];
-    copyright = [];
-    notes = [];
+    var titles = [];
 
     
     var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
@@ -1179,27 +1193,22 @@ $('.save').on('click', function(e)
     $('tbody tr').each(function( index )
     {
             criteria.push($(this).data('criterion-id'));
-            each_criterion_scale = [];
-            for(i=2; i<amount_of_scales; i++){
-               each_criterion_scale.push($(this.children[i]).text());
-
-            }
-            copyright.push($(this.children[i]).text());
-            i+=1;
-            notes.push($(this.children[i]).text());
-
-            scales.push(each_criterion_scale);
-
+            
             
             
 
             
 
-            // Clone the object and push it into the array
+            
            
 
     });
 
+    $('.editable').each(function(index){
+        titles.push($(this).text());
+    })
+
+
     //console.log('school', $('#select-school').find(':selected').data('school-id') );
     //console.log('program', $('#select-program').find(':selected').data('program-id') );
 
@@ -1218,10 +1227,11 @@ $('.save').on('click', function(e)
                 expected_points: $('#expected_points').find(':selected').val(),
                 is_visible: $('input[name=is_visible]:checked').val(),
                 criteria : criteria,
-                scales: scales,
+                //scales: scales,
                 max_score : max,
-                copyright : copyright,
-                notes :notes
+                /*copyright : copyright,
+                notes :notes*/
+                titles: titles
 
             },
             function(data)
@@ -1329,7 +1339,7 @@ if({{Auth::user()->role}}==1)
     toggleProgramSelect($('#select-school'));
 
 // Fetch criteria of first outcome
-fetchCriteria($('#select-outcome'));
+fetchCriteria($('#select-outcome'), $('#select-objective'));
 changeTable();
 
 // Hide table