Antes de to

app/controllers/Objective2Controller.php

@@ -55,6 +55,62 @@ class Objective2Controller extends \BaseController
 		return $objectives;
 	}
 
+	public function deletePCOBO()
+	{
+		$pcobo_id = Input::get('pcobo_id');
+		$criterion_id = Input::get('criterion_id');
+		//$objective_id  = Input::get('objective_id');
+		$outcome_id  = Input::get('outcome_id');
+		$program_id = Input::get('program_id');
+
+		$cri_hol_dom = DB::table('criterion_objective_outcome')
+			->where('objective_id', 0)
+			->where('criterion_id', $criterion_id)
+			->where('outcome_id', $outcome_id)
+			->first();
+
+
+		if (!isset($cri_hol_dom)) {
+			$cri_obj_out_id = DB::table('criterion_objective_outcome')->insertGetId(
+				array(
+					'objective_id' => 0,
+					'outcome_id' => $outcome_id,
+					'criterion_id' => $criterion_id
+				)
+			);
+		} else {
+			$cri_obj_out_id = $cri_hol_dom->id;
+			//no creo que esto pase pero
+
+			$exists_pair = DB::table("program_criterion_objective_outcome")
+				->where('program_id', $program_id)
+				->where('cri_obj_out_id', $cri_obj_out_id)
+				->first();
+
+			if (isset($exists_pair)) {
+				//se puede borrar la entrada
+				//porque el pareo de programa-criterio-dominio-holder ya existe, so borrar esta entrada borra duplicados. 
+
+				DB::table('program_criterion_objective_outcome')
+					->where('id', $pcobo_id)
+					->delete();
+				return 200;
+			}
+		}
+
+
+
+
+
+
+		DB::table('program_criterion_objective_outcome')
+			->where('id', $pcobo_id)->update(array(
+				'cri_obj_out_id' => $cri_obj_out_id
+			));
+
+		return 200;
+	}
+
 	public function isObjectiveUnique($input, $existing_Objective = NULL)
 	{
 
@@ -208,6 +264,177 @@ class Objective2Controller extends \BaseController
 			->get();
 	}
 
+	public function updatePCOBO()
+	{
+		//aqui entra si  cambia el viejo al nuevo
+
+		$criterion_id = Input::get('criterion_id');
+		$pcobo_id = Input::get("pcobo_id");
+		$cobo_id = Input::get("cobo_id");
+		$objective_id = Input::get("objective_id");
+		$outcome_id = Input::get("outcome_id");
+		$program_id = Input::get("program_id");
+		$old_crit = Input::get('old_crit');
+		$old_cobo_id = Input::get('old_cobo');
+		$old_pcobo_id = Input::get('old_pcobo');
+		$old_outcome_id = Input::get('old_outcome');
+
+
+
+
+
+		//Existe el pareo de este criterio, este dominio y este objetivo?
+
+		$existing_cobo_id = DB::table('criterion_objective_outcome')
+			->where('objective_id', $objective_id)
+			->where('outcome_id', $outcome_id)
+			->where('criterion_id', $criterion_id)
+			->first();
+
+		if (!isset($existing_cobo_id)) {
+			$insert_cobo_id = DB::table('criterion_objective_outcome')->insertGetId(array(
+				'criterion_id' => $criterion_id,
+				'outcome_id' => $outcome_id,
+				'objective_id' => $objective_id
+
+			));
+		} else $insert_cobo_id = $existing_cobo_id->id;
+
+		$it_exists = DB::table('program_criterion_objective_outcome')
+			->where('program_id', $program_id)
+			->where('cri_obj_out_id', $insert_cobo_id)
+			->first();
+
+		if (isset($it_exists)) {
+			return "DUPLICATE";
+		}
+
+		DB::table('program_criterion_objective_outcome')
+			->where("program_id", $program_id)
+			->where('cri_obj_out_id', $old_cobo_id)
+			->update(array(
+				//'program_id' => $program_id,
+				'cri_obj_out_id' => $insert_cobo_id
+			));
+
+
+
+		//now check if old criterion_objective_outcome is being used
+
+		$other_pcobo_exist = DB::table('program_criterion_objective_outcome')
+			->where("cri_obj_out_id", $old_cobo_id)
+			->first();
+
+
+		//si ningun otro programa tiene el pareo de este criterio con ese objetivo y ese dominio
+		//lo puedes borrar
+		if (!isset($other_pcobo_exist)) {
+			DB::table('criterion_objective_outcome')
+
+				->where('id', $old_cobo_id)
+				->delete();
+		}
+
+
+
+		//Ahora hay que ver que la relacion de program, crit y dominio existe.
+
+		$relationship_exists = DB::table('criterion_objective_outcome as cobo')
+			->join('program_criterion_objective_outcome as pcobo', 'pcobo.cri_obj_out_id', '=', 'cobo.id')
+			->where('criterion_id', $old_crit)
+			->where('outcome_id', $old_outcome_id)
+			->where('program_id', $program_id)
+			->first();
+
+		if (!isset($relationship_exists)) {
+			$new_cobo_id = DB::table('criterion_objective_outcome')
+				->insertGetId(array(
+					'criterion_id' => $old_crit,
+					'outcome_id' => $old_outcome_id,
+					'objective_id' => 0
+				));
+			DB::table('program_criterion_objective_outcome')
+				->insert(array(
+					'program_id' => $program_id,
+					'cri_obj_out_id' => $new_cobo_id
+				));
+		}
+
+
+
+
+
+
+
+
+
+		return 200;
+
+
+		//Aqui es insertar
+
+
+	}
+
+	public function insertPCOBO()
+	{
+		//aqui entra si  le da a add criterio, y escoje uno nuevo
+
+		$criterion_id = Input::get('criterion_id');
+		$pcobo_id = Input::get("pcobo_id");
+		$cobo_id = Input::get("cobo_id");
+		$objective_id = Input::get("objective_id");
+		$outcome_id = Input::get("outcome_id");
+		$program_id = Input::get("program_id");
+		Log::info(Input::all());
+
+
+		//doc se esta usando? ie, objetivo_id == 0?
+
+		//Existe el pareo de este criterio, este dominio y este objetivo?
+
+
+
+		$old_cobo_id = DB::table('criterion_objective_outcome')
+			->where('objective_id', $objective_id)
+			->where('outcome_id', $outcome_id)
+			->where('criterion_id', $criterion_id)
+			->first();
+
+		if (!isset($old_cobo_id)) {
+			$insert_cobo_id = DB::table('criterion_objective_outcome')->insertGetId(array(
+				'criterion_id' => $criterion_id,
+				'outcome_id' => $outcome_id,
+				'objective_id' => $objective_id
+
+			));
+		} else $insert_cobo_id = $old_cobo_id->id;
+
+		$it_exists = DB::table('program_criterion_objective_outcome')
+			->where('program_id', $program_id)
+			->where('cri_obj_out_id', $insert_cobo_id)
+			->first();
+
+		if (isset($it_exists)) {
+			return "DUPLICATE";
+		}
+
+		DB::table('program_criterion_objective_outcome')
+			->insert(array(
+				'program_id' => $program_id,
+				'cri_obj_out_id' => $insert_cobo_id
+			));
+
+
+
+		return 200;
+
+
+		//Aqui es insertar
+
+
+	}
+
 	public function fetchObjectiveWithTrashed()
 	{
 		$json = array();

app/models/Outcome.php

@@ -275,8 +275,11 @@ class Outcome extends Eloquent
 	public function scopeObjectivesFromProgram($query, $programs)
 	{
 		return Objective::join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
+			->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
 			//->join('programs', 'programs.id', '=', 'objective_program.program_id')
 			->whereIn("program_id", $programs)
+			->where('outcome_id', $this->id)
+
 			->where('objective_program.objective_id', '<>', '0')
 			->select('objectives.*')
 			->groupBy('objectives.id');

app/models/Program.php

@@ -43,6 +43,8 @@ class Program extends Eloquent
 		if ($this->outcome_id) {
 			return Criterion::join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
 				->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'cobo.id')
+				->select('criteria.*', 'cobo.id as cobo_id', 'cobo.objective_id', 'cobo.outcome_id', 'cobo.criterion_id')
+				->addSelect('program_criterion_objective_outcome.id as pcobo_id')
 				->where('program_id', $this->id)
 				->where('outcome_id', $this->outcome_id)
 				->get();

app/routes.php

@@ -303,6 +303,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'uses' => 'CriteriaController@fetchAllCriterion'
     ));
 
+    Route::post('insertPCOBO', 'Objective2Controller@insertPCOBO');
+
 
     Route::get('viewFormative', array(
         'as' => 'viewFormative',
@@ -540,6 +542,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         // Print course (grouped sections) report
         Route::get('print_course/{code}/{number}/{semester_code}', 'CoursesController@print_course');
 
+
         // Assessment reports
         Route::get('program-assessment-report/{program_id}', 'OutcomesController@programAssessmentReport');
         Route::get('assessment-reports', 'OutcomesController@managerAssessmentReports');
@@ -551,11 +554,14 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('fetchObjective', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjective'));
         Route::post('fetchObjectivesForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectivesForCriteria'));
 
-        //Objectives por Gabriel
+        //Objectives
         //Route::get('objective', 'Objective2Controller@edit');
         Route::post('createObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@create'));
         Route::post('updateObjective', array('before' => 'csrf', 'uses' => 'Objective2Controller@update'));
         Route::post('fetchObjectiveWithTrashed', array('before' => 'csrf', 'uses' => 'Objective2Controller@fetchObjectiveWithTrashed'));
+        Route::post('deletePCOBO', 'Objective2Controller@deletePCOBO');
+        Route::post('updatePCOBO', 'Objective2Controller@updatePCOBO');
+
 
         // Five year plans,
         Route::get('five-year-plans', 'FiveYearPlansController@index');

app/views/global/view-objectives-criteria.blade.php

@@ -85,6 +85,8 @@
 
     </div>
 
+    
+
     <div id="match_criteria" class="modal fade" tabindex="-1" data-objective-id="0">
         <div class="modal-dialog">
             <div class="modal-content">
@@ -96,13 +98,14 @@
                     <p>The following criteria appear based on objective's programs and your available programs</p>
 
                     <div class ='form-group col-md-12'>
+                        <label for="match_criteria_program">Program</label>
                         <select id="match_criteria_program" class ='form-control selectpicker select_program' onchange="changeCriteriaDisplayed('#match_criteria_program')">
                             
                         </select>
                     </div>
                     <hr>
-
-                    <div id="program_objectives">
+                    <label>Criteria associated to program</label>
+                    <div id="program_objectives" class ='form-group col-md-12' >
 
                     </div>
 
@@ -113,12 +116,42 @@
 
                 </div>
                 <div class="modal-footer">
+                    <hr>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="">Close</button>
+
+                </div>
+            </div>
+        </div>
+    </div>
+
+    
+    <div id="warning" class="modal fade" tabindex="-1" data-objective-id="0">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id = 'warning_title'></h5>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body" id = "warning_body">
+                    
+
+                
+
+
+
+
+                </div>
+                <div class="modal-footer">
+                    <hr>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="$('#match_criteria').data('objective-id', '0');">Cancel</button>
-                    <button type="button" class="btn btn-primary" onclick = 'matchCriteriaToObjective("#match_criteria")'>Save</button>
+                    <button  id='warning_delete' type="button" class="btn btn-primary" onclick = ''>Delete</button>
                 </div>
             </div>
         </div>
     </div>
+
+
+    
     <script>
         $(document).ready(function() {
             // --------------------------------------------------------------------------
@@ -222,6 +255,31 @@
             })
         });
 
+        function postDeleteCrit(criterion_id ,program_id ,outcome_id ,objective_id ,cobo_id ,pcobo_id){
+            
+            $.post(
+                "{{URL::action('Objective2Controller@deletePCOBO')}}",
+                {
+                    criterion_id:criterion_id,
+                    program_id:program_id,
+                    outcome_id:outcome_id,
+                    objective_id:objective_id,
+                    cobo_id:cobo_id,
+                    pcobo_id:pcobo_id
+                },
+                function (status){
+
+                    if(status == 200){
+                    $('.selected_criteria_to_delete').parent().parent().remove();
+                    }
+                    else{
+                        alert("something went wrong, try again later.");
+                    }
+                    
+                }
+            )
+        }
+
 
         function createSelectForModal(options){
             
@@ -234,7 +292,8 @@
             })
             select = $('<select>',{
                 'class':'selectpicker form-control criteria_select',
-                'name':'criteria[]'
+                'name':'criteria[]',
+                'onchange':'saveChanges(this)'
 
             }).html(options);
             div_rem_button = $('<div>',
@@ -245,7 +304,7 @@
             rem_button = $('<button>',{
                 'type':'button',
                 'class':'btn btn-primary',
-                'onclick':'$(this).parent().parent().remove()'
+                'onclick':'deleteCriterion(this);'
             }).html("<span class='glyphicon glyphicon-remove'></span>")
 
             div_select.append(select);
@@ -257,6 +316,97 @@
 
         }
 
+        function saveChanges(select){
+            
+            //Create if old-cobo doesnt exist
+
+            option = $(select).find(':selected');
+            
+            criterion_id = option.val()
+            if(criterion_id ==0){
+                return;
+            }
+            pcobo_id = option.data('pcobo-id')
+            cobo_id = option.data('cobo-id');
+            objective_id = option.data('objective-id')
+            outcome_id =  option.data('outcome-id');
+            program_id = option.data('program-id')
+
+            dict_to_send = {};
+   
+            if($(select).data('old-pcobo') ===undefined){
+               dict_to_send=    {
+                        criterion_id:criterion_id,
+                        pcobo_id:pcobo_id,
+                        cobo_id:cobo_id,
+                        objective_id:objective_id,
+                        outcome_id:outcome_id,
+                        program_id:program_id
+                    } 
+                url = "{{URL::action('Objective2Controller@insertPCOBO')}}";
+
+                   
+            }
+            else{
+
+                url= "{{URL::action('Objective2Controller@updatePCOBO')}}";
+
+
+                old_crit = $(select).data('old-criterion')
+                old_outcome= $(select).data('old-outcome')
+                old_cobo = $(select).data('old-cobo')
+                old_pcobo = $(select).data('old-pcobo')
+                dict_to_send ={
+                        criterion_id:criterion_id,
+                        pcobo_id:pcobo_id,
+                        cobo_id:cobo_id,
+                        objective_id:objective_id,
+                        outcome_id:outcome_id,
+                        program_id:program_id,
+                        old_crit:old_crit,
+                        old_outcome:old_outcome,
+                        old_cobo:old_cobo,
+                        old_pcobo:old_pcobo
+
+                        
+                    } 
+
+                    
+                
+
+            }
+
+            $.post(
+                    url,
+                    dict_to_send,
+                    function(code){
+                        if(code == "DUPLICATE"){
+                            alert("This criteria is already paired to this objective")
+                            $(select).val(0)
+                            $(select).selectpicker('refresh');
+                        }
+                        else if (code==200){
+                          
+                            
+                            $(select).attr('data-old-pcobo', pcobo_id)
+                            $(select).attr('data-old-cobo', cobo_id)
+                            $(select).attr('data-old-criterion', criterion_id)
+                            $(select).attr('data-old-outcome', outcome_id)
+                            $(select).attr('data-old-objective', objective_id)
+
+
+                        }
+                    }
+                )
+                
+            
+          
+
+
+        }
+
+    
+
         function fetchCriteria(a){
             objective_id = $(a).data('objective-id');
             objective_text = $("#objective-"+objective_id).html()
@@ -307,16 +457,28 @@
                         $.each(criteria, function(ind, cri){
 
                             if(cri.objective_id == objective_id && cri.outcome_id == outcome_id){
+                                dictionary_to_keep = {
+                                'value':cri.criterion_id,
+                                'data-program-id':program.id,
+                                'data-outcome-id':outcome_id,
+                                'data-objective-id':objective_id,
+                                'data-cobo-id':cri.cobo_id,
+                                'data-pcobo-id':cri.pcobo_id
+                                
+                            }
                                 option = $("<option>",{
                                 'value':cri.criterion_id,
                                 'data-program-id':program.id,
                                 'data-outcome-id':outcome_id,
+                                'data-objective-id':objective_id,
+                                'data-cobo-id':cri.cobo_id,
+                                'data-pcobo-id':cri.pcobo_id
                                 
                             }).html(cri.name)
                            // option.prop('selected', true);
 
                             
-                            selected_options.push(cri.criterion_id);
+                            selected_options.push(dictionary_to_keep);
                             
                             
                             
@@ -328,9 +490,14 @@
                                 'value':cri.criterion_id,
                                 'data-program-id':program.id,
                                 'data-outcome-id':outcome_id,
+                                'data-objective-id':objective_id,
+                                'data-cobo-id':cri.cobo_id,
+                                'data-pcobo-id':cri.pcobo_id
+
                                 
                             }).html(cri.name)
                         }
+                        
                   
 
                             options_html += option.prop('outerHTML');
@@ -353,20 +520,27 @@
                         $('#program_objectives').append(prog_div);
                         select = createSelectForModal(options_html)
 
-                        select.find('.remove_btn').hide()
+                        select.find('div.remove-btn').hide()
                         prog_div.append(select);
                         $('select.criteria_select').selectpicker('refresh');
-
-                        $.each(selected_options, function(ind, cri_id){
-
-                            the_picker = select.find('select.criteria_select').first();
-                            the_picker.val(cri_id);
-
-                            select = createSelectForModal(options_html)
-                            prog_div.append(select)
-                           // $('.criteria_select').selectpicker('refresh');
-                        })
-
+                        if(selected_options){
+                            $.each(selected_options, function(ind, cri){
+
+                                the_picker = select.find('select.criteria_select').first();
+                                the_picker.val(cri['value']);
+                                the_picker.attr('data-old-pcobo', cri['data-pcobo-id'])
+                                the_picker.attr('data-old-cobo', cri['data-cobo-id'])
+                                the_picker.attr('data-old-criterion', cri['value'])
+                                the_picker.attr('data-old-outcome', cri['data-outcome-id'])
+                                the_picker.attr('data-old-objective', cri['data-objective-id'])
+
+                                select = createSelectForModal(options_html)
+                                prog_div.append(select)
+                            // $('.criteria_select').selectpicker('refresh');
+                            })
+                            // to remove the last one
+                            select.remove();
+                        }
                         //prog_div.append(select)
 
                        // $('#program_objectives').append(prog_div);
@@ -374,6 +548,7 @@
                         $('select.criteria_select').selectpicker('refresh');
 
                         prog_div.append(createAddCriteriaButton("program-"+program.id))
+                        
 
                     
                     })
@@ -393,17 +568,54 @@
                 }
             )
         }
+        
+        wr = "#warning"
+        function deleteCriterion(button){
+            select =  $(button).parent().parent().find('select.criteria_select');
+
+            $('.selected_criteria_to_delete').removeClass('selected_criteria_to_delete');
+
+            $(button).addClass('selected_criteria_to_delete');
+          
+            criterion_id = $(select).val()
+            if(criterion_id ==0){
+                $(button).parent().parent().remove()
+                return
+            }
+            option = $(select).find(':selected');
+            name = $(select).find(':selected').html();
+            program_id = $(option).data('program-id')
+            outcome_id = $(option).data('outcome-id')
+            objective_id = $(option).data('objective-id')
+            cobo_id = $(option).data('cobo-id')
+            pcobo_id = $(option).data('pcobo-id')
+            $(wr+'_title').html("Are you sure you want to remove this Criterion?")
+            $(wr+"_delete").attr('onclick', 'postDeleteCrit('+criterion_id+' ,'+program_id+' ,'+outcome_id+' ,'+objective_id+' ,'+cobo_id+' ,'+pcobo_id+'); $("'+wr+'").modal("hide") ');
+            $(wr+'_body').html("<p>You are about to detach <strong>"+ name+"</strong> </p>")
+            $(wr).modal('show');
+        }
 
         function createAddCriteriaButton(program_div_id){
 
-
+            div= $("<div>",{
+                'class':'col-md-12'
+            });
+            
             button = $("<button>", {
                 'class':'add_criteria btn btn-secondary',
                 'type':'button',
-                'onclick':'addSelect('+program_div_id+')'
-                
-            }).html("+ Add Criteria");
+                'onclick':'addSelect("#'+program_div_id+'")',
+                'style':'float: right'  
+            }).html(" <span class = 'glyphicon glyphicon-plus'></span> Add Criteria");
+            div.append(button)
+            div.append('<br><br>')
+            return div;
+        }
 
+        function addSelect(program_div_id){
+            options = $(program_div_id).children('.removable_div').first().find('select.criteria_select').html();
+            $(program_div_id).children(".removable_div").last().after(createSelectForModal(options));
+            $('select.criteria_select').selectpicker('refresh');
         }
 
         $('.view-scales').on('click', function() {