Final Push?

app/controllers/Objective2Controller.php

@@ -294,7 +294,7 @@ class Objective2Controller extends \BaseController
 	public function edit()
 	{
 		$title = "Objective";
-		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 		$programs = Program::orderBy('name', 'ASC')->get();
@@ -310,7 +310,7 @@ class Objective2Controller extends \BaseController
 		$userProgram = DB::select("select program_user.program_id from program_user where user_id = {$userProgram}");
 
 		$title = "Objective";
-		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->lists('name', 'id');
+		$outcomes = Outcome::whereNull("deactivation_date")->orderBy('name', 'ASC')->get();
 
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->get();
 
@@ -387,6 +387,7 @@ class Objective2Controller extends \BaseController
 
 
 			/** Set info */
+			Log::info($clean_input);
 			$Objective->text = $clean_input['text'];
 
 

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

@@ -19,8 +19,16 @@
                     <div class="form-group col-md-11" id='outcomeForm'>
 
 
-                        {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
-
+                        <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
+                            @foreach ($outcomes as $outcome)
+                            <option value="{{ $outcome->id }}">
+                                {{ $outcome->name }}
+    
+    
+    
+                            </option>
+                            @endforeach
+                        </select>
                     </div>
 
                 </div>
@@ -84,10 +92,11 @@
                     </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")']) }}
+                        {{ 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 class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
                     <select id="select-objective" name="id" class="form-control selectpicker">
@@ -113,8 +122,17 @@
                     <div id='assocOutcomeGroup'>
                         <label>Associated Outcome</label>
 
-                        {{ Form::select('outcome[]', $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
-
+                        <select id="assoc_outcome0" name="assoc_outcome[]" class="form-control selectpicker">
+                            @foreach ($outcomes as $outcome)
+                            <option value="{{ $outcome->id }}">
+                                {{ $outcome->name }}
+    
+    
+    
+                            </option>
+                            @endforeach
+                        </select><br><br>
+                   
                     </div>
 
                 </div>
@@ -135,7 +153,7 @@
                     {{ Form::label('program_id2', 'Associated Program') }}<br><br>
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="assoc_program_id[]" value="{{$program->id}}">
                     <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
                     @endforeach
                 </div>
@@ -161,7 +179,7 @@
 
                 </div>
 
-                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block', 'id' => 'update_button')) }}
                 {{ Form::close() }}
                 <form action="/deleteObjective" method="POST" id='deleteObj'>
 
@@ -299,7 +317,7 @@
 
                 // Select associated outcome
                 for (var i = counterAssoc; i != 1; i--) {
-                    deleteLastAssoc(i - 1);
+                    deleteLastAssoc(i);
 
                 }
                 $('#assoc_outcome0').val(json.outcome[0].outcome_id);
@@ -309,7 +327,7 @@
                     counterAssoc = i + 1;
                     var $select = $('<select />', {
                         'class': "selectpicker form-control",
-                        'name': "outcome[]",
+                        'name': "assoc_outcome[]",
                         'data-live-search': 'true',
                         'id': 'assoc_outcome' + i.toString()
 
@@ -326,7 +344,7 @@
                     var $button = $('<button />', {
                         'type': 'button',
                         'class': 'btn btn-primary',
-                        'onclick': 'deleteLastAssoc(' + i + ')'
+                        'onclick': 'deleteLastAssoc()'
                     });
                     $button.append('X');
                     $divForButton.append($button);
@@ -430,13 +448,14 @@
         );
     }
 
-    function deleteLastAssoc(i) {
+    function deleteLastAssoc() {
 
-        div = document.getElementById('assocOutcomeForm' + (i).toString());
-        div.remove();
-        button = document.getElementById('closeAssoc' + (i).toString());
-        button.remove();
-        counterAssoc -= 1;
+div = document.getElementById('assocOutcomeForm' + (counterAssoc -1).toString());
+div.remove();
+button = document.getElementById('closeAssoc' + (counterAssoc-1).toString());
+button.remove();
+counterAssoc -=1;
+$('#counterAssoc').val(counterAssoc);
 
     }
 
@@ -445,7 +464,7 @@
 
         var $select = $('<select />', {
             'class': "selectpicker form-control",
-            'name': "outcome[]",
+            'name': "assoc_outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome' + counterAssoc.toString()
 
@@ -462,7 +481,7 @@
         var $button = $('<button />', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteLastAssoc(' + counterAssoc + ')'
+            'onclick': 'deleteLastAssoc()'
         });
         $button.append('X');
         $divForButton.append($button);
@@ -476,9 +495,40 @@
 
 
         counterAssoc += 1;
+        $('#counterAssoc').val(counterAssoc);
 
 
     }
+    $('#update_button').on('click', function(e){
+        e.preventDefault();
+
+        outcome_id= []
+        program_id= [];
+        status = $('#status').val();
+        text =$('#objective-text').val();
+        id = $('#select-objective').val();
+
+        $('#assocOutcomeGroup').find('select').each(function(){
+            outcome_id.push($(this).val())
+        })
+        $('input[name="assoc_program_id[]"]').each(function(){
+            if(this.checked)
+            program_id.push($(this).val())
+        });
+        $.post(
+            "{{URL::action('Objective2Controller@update')}}",
+            {
+                assoc_outcome:outcome_id,
+                program_id:program_id,
+                status:status,
+                text:text,
+                id:id
+            },
+   function(){
+       location.reload(true);
+   }
+        )
+    })
 </script>
 @stop
 

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

@@ -19,8 +19,27 @@
                     <div class="form-group col-md-11" id='outcomeForm='>
 
 
-                        {{ Form::select('outcome[0]', $outcomes, null, ['class'=>'form-control selectpicker', 'id' =>'outcome[0]']) }}
-
+                        <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
+                            	
+                                                        @foreach ($outcomes as $outcome)
+                            	
+                                                        <option value="{{ $outcome->id }}">
+                            	
+                                                            {{ $outcome->name }}
+                            	
+                                
+                            	
+                                
+                            	
+                                
+                            	
+                                                        </option>
+                            	
+                                                        @endforeach
+                            	
+                                                    </select>
+                            	
+                            
                     </div>
 
                 </div>
@@ -40,7 +59,7 @@
                     <br>
 
 
-                    <input type="hidden" id='{{ $programs[0]->name }}' name="program_id[]" value="{{$programs[0]->id}}">
+                    <input type="hidden" id='assoc_program' 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>
 
@@ -95,7 +114,7 @@
 
                 <div class="form-group">
                     {{ Form::label('objective_id', 'Objectives') }}
-                    <select id="select-objective" name="id" class="form-control selectpicker">
+                    <select id="select-objective" name='id' class="form-control selectpicker" >
                         @foreach ($objectives as $objective)
                         <option value="{{ $objective->id }}" data-subtext="
                                         @if($objective->program)
@@ -109,6 +128,8 @@
                         </option>
                         @endforeach
                     </select>
+        
+
                 </div>
 
                 <!-- Associated Outcome -->
@@ -117,8 +138,27 @@
                     <div id='assocOutcomeGroup'>
                         <label>Associated Outcome</label>
 
-                        {{ Form::select("assoc_outcome[]", $outcomes, null, ['class'=>'form-control selectpicker', 'id'=>'assoc_outcome0']) }}
-                        <br><br>
+                        <select id="assoc_outcome0" name="assoc_outcome[]" class="form-control selectpicker">
+                            
+                                                        @foreach ($outcomes as $outcome)
+                            
+                                                        <option value="{{ $outcome->id }}">
+                            
+                                                            {{ $outcome->name }}
+                        
+                                
+                        
+                                
+                        
+                                
+                        
+                                                        </option>
+                    	
+                                     @endforeach
+                        
+                                 </select>
+                    	
+                                                <br><br>
                     </div>
 
                 </div>
@@ -137,7 +177,7 @@
                     <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="assoc_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>
@@ -164,7 +204,7 @@
 
                 </div>
 
-                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block', 'id' => 'update_button')) }}
                 {{ Form::close() }}
 
                 <form action="/deleteObjective" method="POST" id='deleteObj'>
@@ -215,6 +255,7 @@
                 }
                 $('#select-objective').html(fullHTML);
                 $('#select-objective').selectpicker('refresh');
+                
                 fetchObjectiveForEditing();
 
             },
@@ -292,7 +333,7 @@
 
     function fetchObjectiveForEditing() {
         var id = $('#select-objective').find(':selected').val();
-
+        
         $.post(
             "{{ URL::action('Objective2Controller@fetchObjectiveWithTrashed') }}", {
                 id: id
@@ -439,7 +480,7 @@
         div.remove();
         button = document.getElementById('closeAssoc' + (counterAssoc - 1).toString());
         button.remove();
-        counterAssoc -= 1;
+        counterAssoc -=1;
         $('#counterAssoc').val(counterAssoc);
 
     }
@@ -452,8 +493,7 @@
             'name': "assoc_outcome[]",
             'data-live-search': 'true',
             'id': 'assoc_outcome' + counterAssoc.toString(),
-            'onchange': 'fetchObjectiveForSelect("outcome' + counter + '", this.value, ' + counterAssoc + ')'
-
+           
         });
         var $div = $('<div />', {
             'id': 'assocOutcomeForm' + counterAssoc.toString(),
@@ -486,6 +526,33 @@
 
 
     }
+    $('#update_button').on('click', function(e){
+        e.preventDefault();
+
+        outcome_id= []
+        program_id= $('#assoc_program').val();
+        status = $('#status').val();
+        text =$('#objective-text').val();
+        id = $('#select-objective').val();
+
+        $('#assocOutcomeGroup').find('select').each(function(){
+            outcome_id.push($(this).val())
+        })
+       
+        $.post(
+            "{{URL::action('Objective2Controller@update')}}",
+            {
+                assoc_outcome:outcome_id,
+                program_id:program_id,
+                status:status,
+                text:text,
+                id:id
+            },
+   function(){
+       location.reload(true);
+   }
+        )
+    })
 </script>
 @stop
 
@@ -543,6 +610,7 @@ $(this).next().stop().slideToggle();
 // When list item is clicked, load corresponding info
 $('#select-objective').on('change', function()
 {
+
 fetchObjectiveForEditing();
 $('.selectpicker').selectpicker('refresh');
 });

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

@@ -132,7 +132,7 @@
     
                             </option>
                             @endforeach
-                        </select>
+                        </select><br><br>
                    
 
                     </div>
@@ -151,7 +151,7 @@
                     {{ Form::label('program_id2', 'Associated Program') }}<br><br>
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <input type="checkbox" id="assoc_program_id_{{ $program->id }}" name="assoc_program_id[]" value="{{$program->id}}">
                     <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
                     @endforeach
                 </div>
@@ -176,7 +176,7 @@
 
                 </div>
 
-                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block')) }}
+                {{ Form::submit('Update', array('class' => 'btn btn-primary btn-block', 'id' => 'update_button')) }}
                 {{ Form::close() }}
                 <form action="/deleteObjective" method="POST" id='deleteObj'>
                 
@@ -329,7 +329,7 @@
                 for (var i = 1; i < json.outcome.length; i++) {
                     counterAssoc = i + 1;
                     var $select = $('<select />', {
-                        'class': "selectpicker form-control",
+                        'class': "selectpicker form-control ",
                         'name': "assoc_outcome[]",
                         'data-live-search': 'true',
                         'id': 'assoc_outcome' + i.toString()
@@ -454,11 +454,12 @@
 
     function deleteLastAssoc() {
 
-        div = document.getElementById('assocOutcomeForm' + (counterAssoc).toString());
+        div = document.getElementById('assocOutcomeForm' + (counterAssoc -1).toString());
         div.remove();
-        button = document.getElementById('closeAssoc' + (counterAssoc).toString());
+        button = document.getElementById('closeAssoc' + (counterAssoc-1).toString());
         button.remove();
-        counterAssoc -= 1;
+        counterAssoc -=1;
+        $('#counterAssoc').val(counterAssoc);
 
     }
 
@@ -469,7 +470,8 @@
             'class': "selectpicker form-control",
             'name': "assoc_outcome[]",
             'data-live-search': 'true',
-            'id': 'assoc_outcome' + counterAssoc.toString()
+            'id': 'assoc_outcome' + counterAssoc.toString(),
+ 
 
         });
         var $div = $('<div />', {
@@ -498,9 +500,40 @@
 
         ran = true;
         counterAssoc += 1;
-
+        $('#counterAssoc').val(counterAssoc);
 
     }
+
+    $('#update_button').on('click', function(e){
+        e.preventDefault();
+
+        outcome_id= []
+        program_id= [];
+        status = $('#status').val();
+        text =$('#objective-text').val();
+        id = $('#select-objective').val();
+
+        $('#assocOutcomeGroup').find('select').each(function(){
+            outcome_id.push($(this).val())
+        })
+        $('input[name="assoc_program_id[]"]').each(function(){
+            if(this.checked)
+            program_id.push($(this).val())
+        });
+        $.post(
+            "{{URL::action('Objective2Controller@update')}}",
+            {
+                assoc_outcome:outcome_id,
+                program_id:program_id,
+                status:status,
+                text:text,
+                id:id
+            },
+   function(){
+       location.reload(true);
+   }
+        )
+    })
 </script>
 @stop