Editar criterio

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

@@ -156,7 +156,7 @@
                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-                                                            @if ($criterion->program)
+                                                                 @if ($criterion->program)
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
                             @endif
                             ">
@@ -1339,7 +1339,7 @@
                             $("#update_the_criterion_button").val("Create New")
                             $("#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>'
+                                '<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> If a criterion is already used in assessments, editting it will actually create a new one </div>'
                             );
 
 
@@ -1520,50 +1520,50 @@
 
 
                     /*
-                                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 + '">';
-                                    var objectiveForOutcome = json.objectives_assoc;
-                                    var objectives = objectiveForOutcome[outcome];
-                                    for (objective in objectives) {
-                                
-
-                                        var obj= objectives[objective];
-                                        var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
-                                        optionName += (option);
+                                    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 + '">';
+                                        var objectiveForOutcome = json.objectives_assoc;
+                                        var objectives = objectiveForOutcome[outcome];
+                                        for (objective in objectives) {
+                                    
+
+                                            var obj= objectives[objective];
+                                            var option = '<option value ="' + obj.id + '">' +obj.text + '</option>';
+                                            optionName += (option);
+                                        }
+                                        optionName += "</optgroup>";
                                     }
-                                    optionName += "</optgroup>";
-                                }
 
 
-                                $('#assoc_objective_0').html(optionName);
-                                $('#assoc_objective_0').selectpicker('refresh');
-                                
+                                    $('#assoc_objective_0').html(optionName);
+                                    $('#assoc_objective_0').selectpicker('refresh');
+                                    
 
 
 
-                                try {
-                                    $('#assoc_objective_0').val(json.objectives[0].id);
-                                    $('#assoc_objective_0').selectpicker('refresh');
-                                } catch (err) {
-                                    if (!json.objectives.length) {
-                                        $('#assoc_objective_0').val(0);
+                                    try {
+                                        $('#assoc_objective_0').val(json.objectives[0].id);
                                         $('#assoc_objective_0').selectpicker('refresh');
+                                    } catch (err) {
+                                        if (!json.objectives.length) {
+                                            $('#assoc_objective_0').val(0);
+                                            $('#assoc_objective_0').selectpicker('refresh');
+                                        }
+                                    
                                     }
-                                
-                                }
 
-                                for (var i = 1; i < json.objectives.length; i++) {
-                                    addAssocObjective();
-                                    $('#assoc_objective_' + i.toString()).val(json.objectives[i].id);
-                                    $('#assoc_objective_' + i.toString()).selectpicker('refresh');
-                                }
-                                $('assoc_objectiveGroup').data('value',json.objectives.length);
+                                    for (var i = 1; i < json.objectives.length; i++) {
+                                        addAssocObjective();
+                                        $('#assoc_objective_' + i.toString()).val(json.objectives[i].id);
+                                        $('#assoc_objective_' + i.toString()).selectpicker('refresh');
+                                    }
+                                    $('assoc_objectiveGroup').data('value',json.objectives.length);
 
 
-                */
+                    */
 
 
 

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

@@ -154,7 +154,7 @@
                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-                                             @if ($criterion->program)
+                                                  @if ($criterion->program)
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
                             @endif
                             ">
@@ -210,9 +210,9 @@
                     <!-- Associated Program -->
                     <div class="form-group form_validation program_form"">
 
-                        {{ Form::label('program_id2', 'Associated Program') }}<br><br>
+                            {{ Form::label('program_id2', 'Associated Program') }}<br><br>
 
-                        <input type=" hidden" id="{{ $programs[0]->name }}" name="program_id[]"
+                            <input type=" hidden" id="{{ $programs[0]->name }}" name="program_id[]"
                         value="{{ $programs[0]->id }}">
 
                         <input type="checkbox" id="assoc_program_id_{{ $programs[0]->id }}" name="program_id[]"
@@ -1250,7 +1250,7 @@
                             $("#update_the_criterion_button").val("Create New")
                             $("#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>'
+                                '<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> If a criterion is already used in assessments, editting it will actually create a new one </div>'
                             );
 
                         }

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

@@ -143,6 +143,7 @@
                             {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class' => 'form-control selectpicker', 'id' => 'assoc_outcomes_fetch', 'onchange' => 'fetchAllCriterion("select-program", "assoc_outcomes_fetch")']) }}
 
                         </div>
+
                     </div>
                     <hr>
                     <div class="form-group">
@@ -151,7 +152,7 @@
                             onchange='fetchCriterionForEditing()'>
                             @foreach ($criteria as $criterion)
                                 <option value="{{ $criterion->id }}" data-subtext="
-               @if ($criterion->program)
+                         @if ($criterion->program)
                                     &nbsp;&nbsp;&nbsp;[{{ $criterion->program->name }}]
                             @endif
                             ">
@@ -1345,7 +1346,7 @@
                             $("#update_the_criterion_button").val("Create New")
                             $("#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>'
+                                '<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> If a criterion is already used in assessments, editting it will actually create a new one </div>'
                             );
 
 
@@ -1607,7 +1608,7 @@
 
     $('#outcome-display').parent().hide();
 
-    fetchCriterionForEditing();
+    //fetchCriterionForEditing();
     fetchObjectiveForSelect('outcome0', 'objectiveGroupFor0');
     // setCriterionStatus();
     fetchAllCriterion("select-program", "assoc_outcomes_fetch");