Merge branch 'debugging_log' into Merge_gabriel_mayo

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

@@ -71,23 +71,23 @@
                     <span class="glyphicon glyphicon-plus">
                     </span>
                     Filters
-                  </button>
-                  <div class='filterSection'>
-                {{ Form::open(array('action' => 'Objective2Controller@update')) }}
-                <div class="form-group">
-                    {{ Form::label('program_id2', 'Associated Program')}}
-                    <select id='select-program' class="form-control selectpicker" onchange='fetchAllObjectives("select-program", "assoc_outcomes_fetch")'>
-                        @foreach ($programs as $program)
-                        <option value='{{$program->id}}' data-subtext="{{$program->code}}">{{$program->name}}</option>
-                        @endforeach
-                    </select>
-                </div>
-                <div class="form-group">
-                    <label>Associated Outcome</label>
-                    {{ Form::select('assoc_outcomes_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) }}
+                </button>
+                <div class='filterSection'>
+                    {{ Form::open(array('action' => 'Objective2Controller@update')) }}
+                    <div class="form-group">
+                        {{ Form::label('program_id2', 'Associated Program')}}
+                        <select id='select-program' class="form-control selectpicker" onchange='fetchAllObjectives("select-program", "assoc_outcomes_fetch")'>
+                            @foreach ($programs as $program)
+                            <option value='{{$program->id}}' data-subtext="{{$program->code}}">{{$program->name}}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Associated Outcome</label>
+                        {{ Form::select('assoc_outcomes_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) }}
 
+                    </div>
                 </div>
-                  </div>
                 <div class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
                     <select id="select-objective" name="id" class="form-control selectpicker">
@@ -116,10 +116,10 @@
                         {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
 
                     </div>
-                    
+
                 </div>
-                
-                
+
+
                 <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
                     <span class='glyphicon glyphicon-plus'>
 
@@ -176,19 +176,18 @@
 </div>
 <script>
     $('.filterSection').hide();
-    $('.filterButton').on('click', function()
-{
-  var span = $(this).find('span');
-  if(span.attr('class') == 'glyphicon glyphicon-plus'){
-    span.attr('class','glyphicon glyphicon-minus');
-  } else{
-    span.attr('class','glyphicon glyphicon-plus');
-  }
-  $('.filterSection').toggle(533);
-});
+    $('.filterButton').on('click', function() {
+        var span = $(this).find('span');
+        if (span.attr('class') == 'glyphicon glyphicon-plus') {
+            span.attr('class', 'glyphicon glyphicon-minus');
+        } else {
+            span.attr('class', 'glyphicon glyphicon-plus');
+        }
+        $('.filterSection').toggle(533);
+    });
     var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
     var selectOptions = document.getElementById('outcome[0]').innerHTML;
-   
+
     function fetchAllObjectives(program, outcome) {
         var program_id_fetch = $('#' + program).find(':selected').val();
         var outcome_fetch = $('#' + outcome).find(':selected').val();
@@ -300,7 +299,7 @@
 
                 // Select associated outcome
                 for (var i = counterAssoc; i != 1; i--) {
-                    deleteLastAssoc(i-1);
+                    deleteLastAssoc(i - 1);
 
                 }
                 $('#assoc_outcome0').val(json.outcome[0].outcome_id);
@@ -327,7 +326,7 @@
                     var $button = $('<button />', {
                         'type': 'button',
                         'class': 'btn btn-primary',
-                        'onclick': 'deleteLastAssoc('+i+')'
+                        'onclick': 'deleteLastAssoc(' + i + ')'
                     });
                     $button.append('X');
                     $divForButton.append($button);
@@ -463,7 +462,7 @@
         var $button = $('<button />', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLastAssoc('+counterAssoc+')'
+            'onclick': 'deleteLastAssoc(' + counterAssoc + ')'
         });
         $button.append('X');
         $divForButton.append($button);

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

@@ -16,7 +16,7 @@
                 {{ Form::open(array('action' => 'Objective2Controller@create' )) }}
                 <div id='outcomeGroup'>
                     <label> Associated Outcome</label>
-                    <div class="form-group col-md-11" id='outcomeForm'>
+                    <div class="form-group col-md-11" id='outcomeForm='>
 
 
                         {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
@@ -40,7 +40,7 @@
                     <br>
 
 
-                    <input type ="hidden" id='{{ $programs[0]->name }}' name="program_id[]" value="{{$programs[0]->id}}">
+                    <input type="hidden" id='{{ $programs[0]->name }}' name="program_id[]" value="{{$programs[0]->id}}">
                     <input type="checkbox" id="{{ $programs[0]->name }}" name="program_id[]" value="{{$programs[0]->id}}" disabled checked>
                     <label for="{{ $programs[0]->name }}"> {{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</label><br>
 
@@ -65,18 +65,18 @@
             <div class="panel-heading">
                 Edit
             </div>
-            
+
 
             <div class="panel-body">
                 <button class="btn btn-md btn-secondary filterButton">
-                <span class="glyphicon glyphicon-plus">
-                </span>
-                Filters
-              </button>
+                    <span class="glyphicon glyphicon-plus">
+                    </span>
+                    Filters
+                </button>
                 <div class='filterSection'>
-            
+
                     {{ Form::open(array('action' => 'Objective2Controller@update')) }}
-                    
+
                     <div class="form-group">
                         {{ Form::label('program_id2', 'Associated Program')}}
                         <select id='select-program' class="form-control selectpicker" onchange='fetchAllObjectives("select-program", "assoc_outcomes_fetch")'>
@@ -88,10 +88,10 @@
                     <div class="form-group">
                         <label>Associated Outcome</label>
                         {{ Form::select('assoc_outcome_fetch', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcomes_fetch', 'onchange'=>'fetchAllObjectives("select-program", "assoc_outcomes_fetch")']) }}
-    
+
                     </div>
-                      </div>
-                      <hr>
+                </div>
+                <hr>
 
                 <div class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
@@ -118,11 +118,11 @@
                         <label>Associated Outcome</label>
 
                         {{ Form::select("assoc_outcome[]", $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
-<br><br>
+                        <br><br>
                     </div>
-                    
+
                 </div>
-                
+
                 <button id='button-add-assoc-outcome' class='btn btn-md btn-secondary' onclick='addAssoc()'>
                     <span class='glyphicon glyphicon-plus'>
 
@@ -137,8 +137,8 @@
                     <br>
 
 
-                    <input type ="hidden" id='assoc_program_id_{{ $programs[0]->id }}' name="program_id[]" value="{{$programs[0]->id}}">
-                   
+                    <input type="hidden" id='assoc_program_id_{{ $programs[0]->id }}' name="program_id[]" value="{{$programs[0]->id}}">
+
                     <input type="checkbox" id="{{ $programs[0]->name }}" id="assoc_program_id_{{$programs[0]->id}}" name="program_id[]" value="{{$programs[0]->id}}" disabled checked>
                     <label for="{{ $programs[0]->name }}"> {{ $programs[0]->name }} [{{ $programs[0]->school->name }}]</label><br>
 
@@ -168,8 +168,8 @@
                 {{ Form::close() }}
 
                 <form action="/deleteObjective" method="POST" id='deleteObj'>
-                
-                    
+
+
                 </form>
             </div>
 
@@ -181,26 +181,24 @@
     </div>
 </div>
 <script>
+    $('.filterSection').hide();
 
-$('.filterSection').hide();
-	
-    $('.filterButton').on('click', function()
-{
-  var span = $(this).find('span');
-  if(span.attr('class') == 'glyphicon glyphicon-plus'){
-    span.attr('class','glyphicon glyphicon-minus');
-  } else{	
-    span.attr('class','glyphicon glyphicon-plus');
-	
-  }
+    $('.filterButton').on('click', function() {
+        var span = $(this).find('span');
+        if (span.attr('class') == 'glyphicon glyphicon-plus') {
+            span.attr('class', 'glyphicon glyphicon-minus');
+        } else {
+            span.attr('class', 'glyphicon glyphicon-plus');
 
-  $('.filterSection').toggle(533);
+        }
 
-});
+        $('.filterSection').toggle(533);
+
+    });
     var outcomeHTML = document.getElementById('outcomeGroup').innerHTML;
     var selectOptions = document.getElementById('outcome[0]').innerHTML;
     var ran = false;
-   
+
     function fetchAllObjectives(program, outcome) {
         var program_id_fetch = $('#' + program).find(':selected').val();
         var outcome_fetch = $('#' + outcome).find(':selected').val();
@@ -433,15 +431,16 @@ $('.filterSection').hide();
             'json'
         );
     }
-   
+
 
     function deleteLastAssoc() {
 
-        div = document.getElementById('assocOutcomeForm' + (i).toString());
+        div = document.getElementById('assocOutcomeForm' + (counterAssoc - 1).toString());
         div.remove();
-        button = document.getElementById('closeAssoc' + (i).toString());
+        button = document.getElementById('closeAssoc' + (counterAssoc - 1).toString());
         button.remove();
         counterAssoc -= 1;
+        $('#counterAssoc').val(counterAssoc);
 
     }
 
@@ -452,7 +451,8 @@ $('.filterSection').hide();
             'class': "selectpicker form-control",
             'name': "assoc_outcome[]",
             'data-live-search': 'true',
-            'id': 'assoc_outcome' + counterAssoc.toString()
+            'id': 'assoc_outcome' + counterAssoc.toString(),
+            'onchange': 'fetchObjectiveForSelect("outcome' + counter + '", this.value, ' + counterAssoc + ')'
 
         });
         var $div = $('<div />', {
@@ -481,6 +481,8 @@ $('.filterSection').hide();
 
         ran = true;
         counterAssoc += 1;
+        $('#counterAssoc').val(counterAssoc);
+
 
 
     }
@@ -502,7 +504,7 @@ fetchObjectiveForEditing();
 // setCriterionStatus();
 
 
- 
+
 fetchAllObjectives("select-program", "assoc_outcomes_fetch")