arreglos de criterion y rubrics,

app/controllers/TemplatesController.php

@@ -227,6 +227,16 @@ class TemplatesController extends \BaseController
 				->where('criterion_scale.criterion_id', '=', $temp_crit->criterion_id)
 				->orderBy('position', 'ASC')
 				->get();
+
+			$temp_crit->program_ids = json_encode(DB::table('program_criterion')
+				->where('criterion_id', $temp_crit->id)
+				->lists('program_id'));
+			$temp_crit->objectives = DB::table('criterion_objective_outcome')
+				->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
+				->where('criterion_id', $temp_crit->id)
+				->select('objectives.*')
+				->distinct()
+				->lists('text');
 			$outcomeID = DB::table('criterion_objective_outcome')->where('criterion_id', '=', $temp_crit->criterion_id)
 				->lists('outcome_id');
 			$outcomes = DB::table('outcomes')->whereIn('id', $outcomeID)->get();

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -347,7 +347,7 @@ $(document).ready(function()
           new_table_div.appendTo('.table-responsive-0');
 
           var table2 = $('#'+table_id).DataTable( {
-            order : [[criterions_levels+2, "asc"]],
+            order : [[parseInt(criterions_levels)+2, "asc"]],
             buttons: [
             {
               lengthMenu: [5, 10, 25, 50],

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

@@ -334,7 +334,7 @@
           </div>
         <div class="modal-footer">
               <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-              <button type="button" class="btn btn-primary" id ="saveButton" value="Save" type="button" onclick = "saveTemplate()" >Save</button>
+              <button type="button" class="btn btn-primary" id ="saveButton" data-button-id = '' value="Save" type="button" onclick = "saveTemplate()" >Save</button>
 
         </div>
       </div><!-- /.modal-content -->
@@ -349,7 +349,108 @@
 
 <!-- jQuery Sortable Tables -->
 <script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
+<script>
+function saveTemplate()
+{
+    //Prevent page refresh
+    
+
+    
+
+    var criterionObject = new Object();
+    var criteriaArray = new Array();
+
+    var criteria = [];
+    var titles = [];
+
+    
+    var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
+    var max = parseInt($('#max_score').find(':selected').val());
+    // For each criterion in the rubric, get its value and put it into an array
+    $('tbody tr').each(function( index )
+    {
+            criteria.push($(this).data('criterion-id'));
+            
+            
+            
+
+            
+
+            
+           
+
+    });
+
+    $('.editable').each(function(index){
+        titles.push($(this).text());
+    })
+
+    button_id = $("#saveButton").data('button-id');
+    //console.log('school', $('#select-school').find(':selected').data('school-id') );
+    //console.log('program', $('#select-program').find(':selected').data('program-id') );
+
+    if(button_id=='button-create-rubric')
+    {
+        // Create
+        $.post
+        (
+            "{{ URL::to('saveTemplate') }}",
+            {
+                name: $('#rubric-name').val(),
+                
+                school_id: $('#select-school').find(':selected').data('school-id'),
+                program_id: $('#select-program').find(':selected').data('program-id'),
+                expected_percentage: $('#expected_percentage').find(':selected').val(),
+                expected_points: $('#expected_points').find(':selected').val(),
+                is_visible: $('input[name=is_visible]:checked').val(),
+                criteria : criteria,
+                //scales: scales,
+                max_score : max,
+                /*copyright : copyright,
+                notes :notes*/
+                titles: titles
+
+            },
+            function(data)
+            {
+                location.reload(true);
+            }
+        );
+    }
+    else
+    {
+        console.log('school', $('#select-school').find(':selected').data('school-id') );
+        console.log('program', $('#select-program').find(':selected').data('program-id') );
+
+        // Update database
+        $.post
+        (
+            "{{ URL::to('updateTemplate') }}",
+            {
+                id: $('#select-template').find(':selected').data('template-id'),
+                name: $('#rubric-name').val(),
+                
+                school_id: $('#select-school').find(':selected').data('school-id'),
+                program_id: $('#select-program').find(':selected').data('program-id'),
+                expected_percentage: $('#expected_percentage').find(':selected').val(),
+                expected_points: $('#expected_points').find(':selected').val(),
+                is_visible: $('input[name=is_visible]:checked').val(),
+                criteria : criteria,
+                //scales: scales,
+                max_score : max,
+                /*copyright : copyright,
+                notes :notes*/
+                titles: titles
+            },
+            function(data)
+            {
+                location.reload(true);
+            }
+        );
+    }
 
+}
+    </script>
 <!-- X-Editable js -->
 <script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
 
@@ -494,7 +595,7 @@ function addCriterion()
             if(data.criterion.notes){
                 notes = data.criterion.notes;
             }
-            
+            objectives = JSON.stringify(objectives);
             
             var str ='<tr data-criterion-name ="'+data.criterion.name+'" data-program-ids = "['+program_ids+']" data-assoc-objectives = '+"'"+objectives+"'"+' data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
@@ -810,7 +911,9 @@ function loadTemplate()
             var temp_criterion = data.criterion;
             for(temp_c in temp_criterion){
                 current_criterion = temp_criterion[temp_c]
-                var str = '<tr data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                objectives = JSON.stringify(current_criterion.objectives);
+               
+                var str = '<tr data-assoc-objectives= '+"'"+objectives+"'"+' data-program_ids = "'+current_criterion.program_ids+'" data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
                 
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
@@ -969,6 +1072,7 @@ function loadTemplate()
     );
 }
 
+
 // Checks whether the user wants to save a rubric with a name that already exists
 function nameExists()
 {
@@ -1198,106 +1302,7 @@ $('#button-add-criterion').on('click', function(e)
     //Add new criterion
     addCriterion();
 });
-function saveTemplate(button_id)
-{
-    //Prevent page refresh
-    
-
-    
-
-    var criterionObject = new Object();
-    var criteriaArray = new Array();
-
-    var criteria = [];
-    var titles = [];
-
-    
-    var amount_of_scales =parseInt($('#number_of_scales').find(':selected').val())+2;
-    var max = parseInt($('#max_score').find(':selected').val());
-    // For each criterion in the rubric, get its value and put it into an array
-    $('tbody tr').each(function( index )
-    {
-            criteria.push($(this).data('criterion-id'));
-            
-            
-            
-
-            
-
-            
-           
-
-    });
-
-    $('.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') );
-
-    if($(this).attr('id')=='button-create-rubric')
-    {
-        // Create
-        $.post
-        (
-            "{{ URL::to('saveTemplate') }}",
-            {
-                name: $('#rubric-name').val(),
-                
-                school_id: $('#select-school').find(':selected').data('school-id'),
-                program_id: $('#select-program').find(':selected').data('program-id'),
-                expected_percentage: $('#expected_percentage').find(':selected').val(),
-                expected_points: $('#expected_points').find(':selected').val(),
-                is_visible: $('input[name=is_visible]:checked').val(),
-                criteria : criteria,
-                //scales: scales,
-                max_score : max,
-                /*copyright : copyright,
-                notes :notes*/
-                titles: titles
-
-            },
-            function(data)
-            {
-                location.reload(true);
-            }
-        );
-    }
-    else
-    {
-        console.log('school', $('#select-school').find(':selected').data('school-id') );
-        console.log('program', $('#select-program').find(':selected').data('program-id') );
-
-        // Update database
-        $.post
-        (
-            "{{ URL::to('updateTemplate') }}",
-            {
-                id: $('#select-template').find(':selected').data('template-id'),
-                name: $('#rubric-name').val(),
-                
-                school_id: $('#select-school').find(':selected').data('school-id'),
-                program_id: $('#select-program').find(':selected').data('program-id'),
-                expected_percentage: $('#expected_percentage').find(':selected').val(),
-                expected_points: $('#expected_points').find(':selected').val(),
-                is_visible: $('input[name=is_visible]:checked').val(),
-                criteria : criteria,
-                //scales: scales,
-                max_score : max,
-                /*copyright : copyright,
-                notes :notes*/
-                titles: titles
-            },
-            function(data)
-            {
-                location.reload(true);
-            }
-        );
-    }
 
-}
 // When the create or update buttons are clicked (.save)
 $('.save').on('click', function(e)
 {
@@ -1346,7 +1351,7 @@ $('.save').on('click', function(e)
         $('tbody tr').each(function( index )
         {
             objectives = $(this).data('assoc-objectives');
-            objectives = objectives.split(',');
+           
             htmlString += "<li>" +$(this).data('criterion-name');
             htmlString += "<br><h5>This criterion is associated with these objectives</h5>"
             htmlString +="<ul style='padding-left: 5%; list-style-position: inside'>"
@@ -1404,7 +1409,7 @@ $('.save').on('click', function(e)
     }
     
     $('#rubric-modal').modal('toggle');
-    $('#saveButton').attr('onclick','saveTemplate("'+$(this).attr('id')+'")')
+    $('#saveButton').data('button-id',$(this).attr('id'));
 
 
 });