Browse Source

Bug de rubricas

parent
commit
c7ceeb1908

+ 6
- 1
app/views/local/managers/shared/rubrics.blade.php View File

@@ -1342,6 +1342,8 @@ $('.save').on('click', function(e)
1342 1342
     {
1343 1343
             $('#js-error-row').hide();
1344 1344
     }
1345
+
1346
+    /*
1345 1347
     program_id = $('#select-program').find(':selected').data('program-id')
1346 1348
     if(program_id == 0){
1347 1349
         $('#modal-title-rubric').html("All criteria will be associated with this school's programs");
@@ -1408,10 +1410,13 @@ $('.save').on('click', function(e)
1408 1410
         });
1409 1411
     }
1410 1412
     
1411
-    $('#rubric-modal').modal('toggle');
1413
+    $('#rubric-modal').modal('toggle');*/
1412 1414
     $('#saveButton').data('button-id',$(this).attr('id'));
1413 1415
 
1414 1416
 
1417
+    saveTemplate()
1418
+
1419
+
1415 1420
 });
1416 1421
 
1417 1422
 // When the confirm  delete button is clicked

+ 4
- 2
app/views/local/managers/shared/rubrics_new.blade.php View File

@@ -1082,7 +1082,7 @@ console.log($('#select-school'));
1082 1082
             {{ Auth::user()->role }}==1
1083 1083
             || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
1084 1084
             || ({{ Auth::user()->role }}==3
1085
-                && programs.includes(selected.data('template-program-id').toString())
1085
+                && programs.includes(selected.data('template-program-id'))
1086 1086
 
1087 1087
                 && selected.data('admin')!=1
1088 1088
             )
@@ -1391,6 +1391,7 @@ $('.save').on('click', function(e)
1391 1391
     {
1392 1392
             $('#js-error-row').hide();
1393 1393
     }
1394
+    /*
1394 1395
     program_id = $('#select-program').find(':selected').data('program-id')
1395 1396
     if(program_id == 0){
1396 1397
         $('#modal-title-rubric').html("All criteria will be associated with this school's programs");
@@ -1475,10 +1476,11 @@ $('.save').on('click', function(e)
1475 1476
         });
1476 1477
     }
1477 1478
     
1478
-    $('#rubric-modal').modal('toggle');
1479
+    $('#rubric-modal').modal('toggle');*/
1479 1480
     $('#saveButton').data('button-id',$(this).attr('id'));
1480 1481
 
1481 1482
 
1483
+    saveTemplate();
1482 1484
 });
1483 1485
 
1484 1486
 // When the confirm  delete button is clicked