Objectives

app/controllers/Objective2Controller.php

@@ -200,6 +200,8 @@ class Objective2Controller extends \BaseController
 		$clean_input['program_id'] = Input::get('program_id');
 		//		Log::info(Input::get('program_id'));
 
+		$clean_input['agreement'] = Input::get("agreement");
+
 		return $clean_input;
 	}
 
@@ -216,6 +218,7 @@ class Objective2Controller extends \BaseController
 
 		$clean_input['program_id'] = Input::get('program_id');
 		$clean_input['pair_criteria'] =  Input::get('pair_every_criteria_with_objective');
+		$clean_input['agreement'] = Input::get('agreement');
 
 
 		return $clean_input;
@@ -598,12 +601,14 @@ class Objective2Controller extends \BaseController
 						return Redirect::to('objective')->withInput();
 					}*/
 				}
-				DB::table('criterion_objective_outcome')
-					->join('program_criterion', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion.criterion_id')
-					->whereIn('program_id', $clean_input['program_id'])
-					->whereIn('outcome_id', $clean_input['outcome_id'])
-					->where('objective_id', '=', 0)
-					->update(array('objective_id' => $objectiveId));
+				if ($clean_input['agreement']) {
+					DB::table('criterion_objective_outcome')
+						->join('program_criterion', 'criterion_objective_outcome.criterion_id', "=", 'program_criterion.criterion_id')
+						->whereIn('program_id', $clean_input['program_id'])
+						->whereIn('outcome_id', $clean_input['outcome_id'])
+						->where('objective_id', '=', 0)
+						->update(array('objective_id' => $objectiveId));
+				}
 				// 				update("update criterion_objective_outcome coo join program_criterion pc on coo.criterion_id=pc.criterion_id set 
 				// 				objective_id= {$objectiveId} where program_id in (".$clean_input['program_id'].") and objective_id=0 and outcome_id in (".$clean_input['outcome_id'].")");
 
@@ -758,6 +763,11 @@ class Objective2Controller extends \BaseController
 	 * @return Response
 	 */
 
+	/*pasos que sigue
+		1. edita el texto del objetivo, si alguno,
+		2. escoge los criteri
+	 */
+
 	public function update()
 
 	{
@@ -839,32 +849,51 @@ class Objective2Controller extends \BaseController
 					->select('criterion_objective_outcome.criterion_id')
 					->lists('criterion_objective_outcome.criterion_id');
 				//DB::delete("delete from `objective_outcome` where objective_id ={$objectiveId}");
+
+
 				DB::delete("delete from objective_program where objective_id = {$objectiveId}");
 
 				foreach ($clean_input['program_id'] as $program_id) {
 					DB::insert("insert into `objective_program`(objective_id, program_id) values ({$objectiveId},{$program_id})");
 				}
 
-				//borra todos los pareos de este objetivo de programas que no estan vinculados a este objetivo
+				//$cri_obj_out_ids = DB::table('criterion_objective_outcome as cobo')
+				//->where('objective_id', $objectiveId)
+				//->lists('cobo.id')
+				//Todos los criterios, que están pareados a este objetivo, pero 
+				// están pareados a otros dominios que no son los seleccionados, ponlos en holder. 
+				DB::table('criterion_objective_outcome as cobo')
+					//->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
 
-				$cri_obj_out_ids = DB::table('criterion_objective_outcome as cobo')
+					//->whereIn('program_id', $clean_input['program_id'])
 					->where('objective_id', $objectiveId)
-					->lists('cobo.id');
-				DB::table("program_criterion_objective_outcome")
-					->whereIn('cri_obj_out_id', $cri_obj_out_ids)
-					->whereNotIn('program_id', $clean_input['program_id'])
-					->delete();
+					->whereNotIn('outcome_id', $clean_input['outcome_id'])
+					->update(array(
+						'objective_id' => 0
+					));
+
+				//borra todos los pareos de este objetivo con programas que no están en los programas que el usuario escogió
+
+
+				//DB::table("program_criterion_objective_outcome as poco")
+				//	->join("criterion_objective_outcome as cobo", 'poco.cri_obj_out_id', '=', 'cobo.id')
+				//	->where('objective_id',$objectiveId)
+				//	->whereNotIn('program_id', $clean_input['program_id'])
+				//	->delete();
+
+
 
-				//el plan es, convertir todos los pareos de criterios-obj-out asociado a mi programa
-				//a holder primero
+				Log::info($clean_input);
 
-				$cri_obj_out = DB::table('criterion_objective_outcome')
+
+
+				/*$cri_obj_out = DB::table('criterion_objective_outcome')
 					->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
 					->whereIn('program_id', $clean_input['program_id'])
 					->where('objective_id', $objectiveId)
 					->update(array(
 						'objective_id' => 0
-					));
+					));*/
 
 				//Luego por cada dominio que haya, chequea si existe ya el pareo
 				//si no existe insertalo.
@@ -887,48 +916,63 @@ class Objective2Controller extends \BaseController
 							foreach ($criteria_assoc as $criterion_id) {
 
 								$cob_id = DB::table('criterion_objective_outcome')
-									->insertGetId(array(
-										"criterion_id" => $criterion_id,
-										"objective_id" => $objectiveId,
-										"outcome_id" => $outcome_id
-									));
-								foreach ($clean_input['program_id'] as $program_id)
-									DB::table('program_criterion_objective_outcome')
-										->insert(array(
-											'cri_obj_out_id' => $cob_id,
-											'program_id' => $program_id
+									->where('criterion_id', $criterion_id)
+									->where('objective_id', $objectiveId)
+									->where('outcome_id', $outcome_id)
+									->first();
+								if (!isset($cob_id)) {
+									$cob_id = DB::table('criterion_objective_outcome')
+										->insertGetId(array(
+											"criterion_id" => $criterion_id,
+											"objective_id" => $objectiveId,
+											"outcome_id" => $outcome_id
 										));
+								} else
+									$cob_id = $cob_id->id;
+								//inserta los. criterios asociados a los nuevos dominios y parealos a estos programas_id
+
+								foreach ($clean_input['program_id'] as $program_id) {
+									$poco_id = DB::table('program_criterion_objective_outcome')
+										->where("cri_obj_out_id", $cob_id)
+										->where('program_id', $program_id)
+										->first();
+									if (!isset($poco_id)) {
+										DB::table('program_criterion_objective_outcome')
+											->insert(array(
+												"program_id" => $program_id,
+												"cri_obj_out_id" => $cob_id
+											));
+									} else {
+										DB::table('program_criterion_objective_outcome')
+											->where('id', $poco_id->id)
+											->update(array(
+												'cri_obj_out_id' => $cob_id
+											));
+									}
+								}
 							}
 						}
 					}
+				}
 
-					//aqui estoy diciendo, todos los pareos bajo estos programas que tienen objetivo 0, y este dominio,
-					//unelo a este objetivo. 
+				if ($clean_input["agreement"] == 1) {
 					DB::table('criterion_objective_outcome')
-						->join("program_criterion_objective_outcome", 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+						->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
 						->whereIn('program_id', $clean_input['program_id'])
 						->where('objective_id', 0)
-						->where('outcome_id', $outcome_id)
+						->whereIn('outcome_id', $clean_input['outcome_id'])
+
 						->update(array(
 							'objective_id' => $objectiveId
 						));
+				}
 
 
-
-
-
-
-
-
-
-
-					$criterion_array = [];
-				}
+				//Borra los objective outcomes que no estan pareado a nada
 
 				DB::table('objective_outcome')
-					->whereNotIn('outcome_id', $clean_input['outcome_id'])
 					->where('objective_id', $objectiveId)
-					->delete();
+					->whereNotIn('outcome_id', $clean_input['outcome_id'])->delete();
 
 				//Session::flash('status', 'success');
 				//Session::flash('message', 'Updated Objective: "' . $Objective->text . '"');

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

@@ -81,6 +81,17 @@
                         {{ Form::text('text', '', ['class' => 'form-control']) }}
                     </div>
 
+                    <div class = "form-group">
+                      
+                        <input type="checkbox" id="agreement" name="agreement"
+                                value="1">
+                                  {{Form::label('agreement', 'I would like to pair criteria without objectives to this one.')}}
+
+                        
+                 
+
+                    </div>
+
 
 
                     {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block', 'id' => 'createObjectiveButton']) }}
@@ -228,6 +239,17 @@
 
                     </div>
 
+                    <div class = "form-group">
+                      
+                        <input type="checkbox" id="agreement_assoc" name="agreement"
+                                value="1">
+                                  {{Form::label('agreement_assoc', 'I would like to pair criteria without objectives to this one.')}}
+
+                        
+                 
+
+                    </div>
+
                     {{ Form::submit('Update', ['class' => 'btn btn-primary btn-block', 'id' => 'update_button_to_modal']) }}
                     {{ Form::close() }}
 
@@ -699,6 +721,17 @@
                 if (this.checked)
                     program_id.push($(this).val())
             });
+
+            agreement = null;
+            if($('#agreement_assoc').is(':checked')){
+                agreement = 1;
+            }
+            else{
+                alert("LMAOOOO");
+            }
+           
+
+
             $.post(
                 "{{ URL::action('Objective2Controller@update') }}", {
                     assoc_outcome: outcome_id,
@@ -706,7 +739,8 @@
                     status: status,
                     text: text,
                     id: id,
-                    pair_every_criteria_with_objective: pair_every_criteria_with_objective
+                    pair_every_criteria_with_objective: pair_every_criteria_with_objective,
+                    agreement:agreement
                 },
                 function($array) {
                     div = $('<div/>', {