Ultimos cambios

app/controllers/CriteriaController.php

@@ -102,20 +102,52 @@ class CriteriaController extends \BaseController
     public function fetchObjectivesForSelect()
     {
         $json = array();
+        $role = Auth::user()->role;
+        switch ($role) {
+            case 1:
+
+                $program_ids = DB::table('programs')->lists('id');
+
+                break;
+            case 2:
+
+                $program_ids = DB::table('programs')
+                    ->where('school_id', Auth::user()->school_id)
+                    ->lists('id');
+
+                break;
+
+            case 3:
+
+                $program_ids = DB::table('program_user')
+                    ->where('user_id', Auth::user()->id)
+                    ->lists('id');
 
+                break;
+        }
         $outcome_id = Input::get('outcomeID');
 
         $json = DB::table('objectives')
             ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
+            ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
             ->where('outcome_id', '=', $outcome_id)
+            ->whereIn('program_id', $program_ids)
+            ->select('objectives.*', 'objective_outcome.*')
+            ->distinct()
             ->get();
+        foreach ($json as $objective) {
+            $objective->program_ids = json_encode(DB::table('objective_program')
+                ->where('objective_id', $objective->objective_id)
+                ->lists('program_id'));
+        }
+
 
         return json_encode($json);
     }
     public function fetchCriterionWithTrashed()
     {
 
-        $json = array();
+        /* $json = array();
         $json['criteria'] = DB::table('criteria')->where('id', Input::get('id'))->get();
 
 
@@ -133,6 +165,11 @@ class CriteriaController extends \BaseController
                 ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
                 ->where('outcome_id', $id)
                 ->get();
+            foreach ($json['objectives_assoc'][$id] as $objective) {
+                $objective->program_ids = json_encode(DB::table('objective_program')
+                    ->where('objective_id', $objective->objective_id)
+                    ->lists('program_id'));
+            }
         }
         $json['program'] = DB::table('program_criterion')->where('criterion_id', $criteria_id)->get();
         $json['activity_criterion'] = DB::table('assessments')
@@ -159,7 +196,7 @@ class CriteriaController extends \BaseController
             $json['outcomes_assoc'][$outId] = DB::select("select name from outcomes where id = {$outId}");
             $json['objectives_assoc'][$outId] = DB::select("select objectives.id, objectives.text, outcomes.name from objectives, objective_outcome, outcomes where  objective_outcome.outcome_id ={$outId} and objective_outcome.objective_id = objectives.id and objectives.active=1 and outcomes.id = objective_outcome.outcome_id");
         }*/
-
+        $criteria_id = Input::get('id');
         $criterion =  DB::table('criteria')->where('id', Input::get('id'))->first();
         if (!$criterion) return $criterion;
         $criterion->outcomes = DB::table('criterion_objective_outcome')
@@ -179,6 +216,11 @@ class CriteriaController extends \BaseController
                 ->where('criterion_id', $criterion->id)
                 ->where('outcome_id', $outcome->id)
                 ->get();
+            foreach ($outcome->assoc_objectives as $objective) {
+                $objective->program_ids = json_encode(DB::table('objective_program')
+                    ->where('objective_id', $objective->objective_id)
+                    ->lists('program_id'));
+            }
         }
         $criterion->scales = DB::table('criterion_scale')
             ->join('scales', 'criterion_scale.scale_id', '=', 'scales.id')
@@ -218,20 +260,43 @@ class CriteriaController extends \BaseController
         else
             $program_id = NULL;
 
+        $outcomes = [];
+        $objectives = [];
+        foreach ($input['objective_id'] as $objective) {
+            $parentesis = array('(', ')');
+            $outcome_objective = str_replace($parentesis, '', $objective);
+            $outcomes[] = $outcome_objective[0];
+            $objectives[] = $outcome_objective[1];
+        }
+        $scales = [];
+        foreach ($input['scale_description'] as $scale) {
+            $existing_scale = DB::table('scales')->where('description', $scale)
+                ->first();
+            if (!$existing_scale) return true;
+            $scales[] = $existing_scale->id;
+        }
+
+
         $saved_criterion = DB::table('criteria')
             ->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
             ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'criteria.id')
+            ->join('criterion_scale', 'criterion_scale.criterion_id', '=', 'criteria.id')
             ->whereIn('program_id', $input['program_id'])
-            ->whereIn('objective_id', $input['objective_id'])
-            ->whereIn('outcome_id', $input['outcome_id'])
+            ->whereIn('objective_id', $objectives)
+            ->whereIn('outcome_id', $outcomes)
             ->where('name', '=', $input['name'])
             ->where('subcriteria', '=', $input['subcriteria'])
+            ->whereIn('scale_id', $scales)
+            ->where('num_scales', $input['number_of_scales'])
+            ->where('max_score', $input['maximum_score'])
+
             ->first();
 
 
 
 
 
+
         if ($saved_criterion)
             return false;
         else
@@ -265,9 +330,7 @@ class CriteriaController extends \BaseController
 
 
         $clean_input['objective_id'] = Input::get('objective');
-        //Log::info('PA los periqueros');
-        //Log::info(Input::get('objective'));
-        //Log::info($clean_input['objective_id']);
+
 
 
 
@@ -277,10 +340,9 @@ class CriteriaController extends \BaseController
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
         $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
-        // $clean_input['scale_title'] = Input::get('title');
+
         $clean_input['scale_description'] = Input::get('Scales');
-        // $clean_input['min_score'] = Input::get('min');
-        //$clean_input['max_score'] = Input::get('max');
+
 
         $clean_input['number_of_scales'] = sizeof($clean_input['scale_description']);
 
@@ -290,27 +352,45 @@ class CriteriaController extends \BaseController
 
     private function makeValidator($clean_input)
     {
-        /** Validation rules */
+        if (isset($clean_input['scale_description'][0])) {
+            $scale = $clean_input['scale_description'][0];
+        } else {
+            $scale = 0;
+        }
+        if (isset($clean_input['program_id'][0])) {
+            $program_id = $clean_input['program_id'][0];
+        } else {
+            $program_id = NULL;
+        }
+
+        if (isset($clean_input['objective_id'][0]) && $clean_input['objective_id'][0] != '0') {
+            $objective_id = $clean_input['objective_id'][0];
+            Log::info('Estamos');
+        } else {
+            $objective_id = NULL;
+        }
         return Validator::make(
             array(
                 'name' => $clean_input['name'],
                 'subcriteria' => $clean_input['subcriteria'],
-                'outcome_id' => $clean_input['outcome_id'],
+                // 'outcome_id' => $clean_input['outcome_id'],
                 'notes' => $clean_input['notes'],
                 'copyright' => $clean_input['copyright'],
                 'maximum_score' => $clean_input['maximum_score'],
-                'scales' => $clean_input['scale_description'],
-                'objective_id' => $clean_input['objective_id']
+                'scales' => $scale,
+                'objective_id' => $objective_id,
+                'program_id' => $program_id,
             ),
             array(
                 'name' => 'required|string',
                 'subcriteria' => 'string',
-                'outcome_id' => 'required|array',
-                'scales' => 'required|array',
+                // 'outcome_id' => 'required|array',
+                'scales' => 'required|string',
                 'notes' => 'string',
                 'copyright' => 'string',
                 'maximum_score' => 'required|integer',
-                'objective_id' => 'required|array'
+                'objective_id' => 'required|string',
+                'program_id' => 'required|integer'
             )
 
         );
@@ -324,15 +404,15 @@ class CriteriaController extends \BaseController
     public function create()
     {
         $clean_input = $this->cleanInput();
-        Log::info("POG???");
+
 
         /** Validation rules */
-        //$validator = $this->makeValidator($clean_input);
+        $validator = $this->makeValidator($clean_input);
 
         /** If validation fails */
-        //if ($validator->fails()) {
-        /** Prepare error message */
-        /*    $message = '<p>Error(s) creating a new Criterion:</p><ul>';
+        if ($validator->fails()) {
+            /** Prepare error message */
+            $message = '<p>Error(s) creating a new Criterion:</p><ul>';
 
             foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
                 $message .= $validationError;
@@ -341,7 +421,7 @@ class CriteriaController extends \BaseController
             $message .= '</ul>';
 
             /** Send error message and old data */
-        /* Session::flash('status', 'danger');
+            Session::flash('status', 'danger');
             Session::flash('message', $message);
             $role = Auth::user()['role'];
             switch ($role) {
@@ -358,7 +438,7 @@ class CriteriaController extends \BaseController
             // Check criterion uniqueness
             if (!$this->isCriterionUnique($clean_input)) {
                 /** Send error message and old data*/
-        /*Session::flash('status', 'danger');
+                Session::flash('status', 'danger');
                 Session::flash('message', 'This criterion is a duplicate of an already saved criterion because its name and associated program are the same.');
 
                 $role = Auth::user()['role'];
@@ -373,114 +453,146 @@ class CriteriaController extends \BaseController
                         return Redirect::to('program-criteria')->withInput();
                 }
             }
-*/
-        /** Instantiate new criterion */
-        $criterion = new Criterion;
-        $criterion->name = $clean_input['name'];
-        $criterion->subcriteria = $clean_input['subcriteria'];
 
+            /** Instantiate new criterion */
+            $criterion = new Criterion;
+            $criterion->name = $clean_input['name'];
+            $criterion->subcriteria = $clean_input['subcriteria'];
 
-        //gabriel añadió aqui
 
-        $criterion->num_scales = sizeof($clean_input['scale_description']);
-        $criterion->max_score = $clean_input['maximum_score'];
+            //gabriel añadió aqui
 
-        if (Input::get('copyright'))
-            $criterion->copyright = $clean_input['copyright'];
+            $criterion->num_scales = sizeof($clean_input['scale_description']);
+            $criterion->max_score = $clean_input['maximum_score'];
 
-        if (Input::get('notes'))
-            $criterion->notes = $clean_input['notes'];
+            if (Input::get('copyright'))
+                $criterion->copyright = $clean_input['copyright'];
 
+            if (Input::get('notes'))
+                $criterion->notes = $clean_input['notes'];
 
 
-        /** If criterion is saved, send success message */
-        if ($criterion->save()) {
 
-            $criterionId = $criterion->id;
-            $parentesis = array('(', ')');
+            /** If criterion is saved, send success message */
+            if ($criterion->save()) {
 
-            foreach ($clean_input['objective_id'] as $objective_id) {
+                $criterionId = $criterion->id;
+                $parentesis = array('(', ')');
 
-                $outcome_objective = str_replace($parentesis, '', $objective_id);
+                foreach ($clean_input['objective_id'] as $objective_id) {
 
-                $outcome_objective = explode(',', $outcome_objective);
-                DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$outcome_objective[1]},{$outcome_objective[0]}, {$criterionId})");
-            }
+                    $outcome_objective = str_replace($parentesis, '', $objective_id);
 
+                    $outcome_objective = explode(',', $outcome_objective);
+                    DB::insert("insert into `criterion_objective_outcome` (`objective_id`, `outcome_id`, `criterion_id`) values ({$outcome_objective[1]},{$outcome_objective[0]}, {$criterionId})");
+                }
 
-            for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
 
-                $existing_scale = DB::table('scales')->where('description', $clean_input['scale_description'][$i])
-                    ->first();
-                if ($existing_scale) {
-                    DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$existing_scale->id},{$i})");
-                } else {
-                    $scale = new Scale;
+                for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
 
-                    $position = $i;
-                    $scale->description = $clean_input['scale_description'][$i];
+                    $existing_scale = DB::table('scales')->where('description', $clean_input['scale_description'][$i])
+                        ->first();
+                    if ($existing_scale) {
+                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$existing_scale->id},{$i})");
+                    } else {
+                        $scale = new Scale;
 
+                        $position = $i;
+                        $scale->description = $clean_input['scale_description'][$i];
 
-                    if ($scale->save()) {
-                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
-                    } else {
-                        Session::flash('status', 'danger');
-                        Session::flash('message', '<p>Error creating the Scales</p>');
-                        $role = Auth::user()['role'];
-                        switch ($role) {
-                            case 1:
-                                return Redirect::to('criteria')->withInput();
-
-                            case 2:
-                                return Redirect::to('school-criteria')->withInput();
-
-                            case 3:
-                                return Redirect::to('program-criteria')->withInput();
+
+                        if ($scale->save()) {
+                            DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
+                        } else {
+                            Session::flash('status', 'danger');
+                            Session::flash('message', '<p>Error creating the Scales</p>');
+                            $role = Auth::user()['role'];
+                            switch ($role) {
+                                case 1:
+                                    return Redirect::to('criteria')->withInput();
+
+                                case 2:
+                                    return Redirect::to('school-criteria')->withInput();
+
+                                case 3:
+                                    return Redirect::to('program-criteria')->withInput();
+                            }
                         }
                     }
                 }
-            }
 
-            foreach ($clean_input['program_id'] as $program_id) {
-                DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
-            }
+                /* $role = Auth::user()->role;
+                switch ($role) {
+                    case 1:
+                        $program_ids = DB::table('criterion_objective_outcome')
+                            ->join('objective_program', 'criterion_objective_outcome.objective_id', '=', 'objective_program.program_id')
+                            ->where('criterion_id', $criterionId)
+                            ->select('program_id')
+                            ->distinct()
+                            ->lists('program_id');
+                        break;
+                    case 2:
+                        $program_ids =  DB::table('criterion_objective_outcome')
+                            ->join('objective_program', 'criterion_objective_outcome.objective_id', '=', 'objective_program.program_id')
+                            ->join('programs', 'programs.id', '=', 'objective_program.program_id')
+                            ->where('criterion_id', $criterionId)
+                            ->where('programs.school_id', Auth::user()->school_id)
+                            ->select('program_id')
+                            ->distinct()
+                            ->lists('program_id');
 
-            Session::flash('status', 'success');
-            Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
-            $role = Auth::user()['role'];
-            switch ($role) {
-                case 1:
-                    return Redirect::to('criteria')->withInput();
+                        break;
 
-                case 2:
-                    return Redirect::to('school-criteria')->withInput();
+                    case 3:
 
-                case 3:
-                    return Redirect::to('program-criteria')->withInput();
+                        $program_ids = DB::table('program_user')
+                            ->where('user_id', Auth::user()->id)
+                            ->lists('program_id');
+
+                        break;
+                }*/
+
+
+                foreach ($clean_input['program_id'] as $program_id) {
+                    DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
+                }
+
+                Session::flash('status', 'success');
+                Session::flash('message', 'Criterion created: "' . $criterion->name . '".');
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
+
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
+
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
             }
-        }
 
-        /** If saving fails, send error message and old data */
-        else {
-            Session::flash('status', 'danger');
-            Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
-            $role = Auth::user()['role'];
-            switch ($role) {
-                case 1:
-                    return Redirect::to('criteria')->withInput();
+            /** If saving fails, send error message and old data */
+            else {
+                Session::flash('status', 'danger');
+                Session::flash('message', '<p>Error creating Criterion. Please try again later.</p>');
+                $role = Auth::user()['role'];
+                switch ($role) {
+                    case 1:
+                        return Redirect::to('criteria')->withInput();
 
-                case 2:
-                    return Redirect::to('school-criteria')->withInput();
+                    case 2:
+                        return Redirect::to('school-criteria')->withInput();
 
-                case 3:
-                    return Redirect::to('program-criteria')->withInput();
+                    case 3:
+                        return Redirect::to('program-criteria')->withInput();
+                }
             }
         }
     }
 
 
 
-
     public function edit()
     {
         $title = "Criteria";
@@ -696,7 +808,36 @@ class CriteriaController extends \BaseController
                             }
                         }
                     }
-                }
+                }/*
+                switch ($role) {
+                    case 1:
+                        $program_ids = DB::table('criterion_objective_outcome')
+                            ->join('objective_program', 'criterion_objective_outcome.objective_id', '=', 'objective_program.program_id')
+                            ->where('criterion_id', $criterionId)
+                            ->select('program_id')
+                            ->distinct()
+                            ->lists('program_id');
+                        break;
+                    case 2:
+                        $program_ids =  DB::table('criterion_objective_outcome')
+                            ->join('objective_program', 'criterion_objective_outcome.objective_id', '=', 'objective_program.program_id')
+                            ->join('programs', 'programs.id', '=', 'objective_program.program_id')
+                            ->where('criterion_id', $criterionId)
+                            ->where('programs.school_id', Auth::user()->school_id)
+                            ->select('program_id')
+                            ->distinct()
+                            ->lists('program_id');
+
+                        break;
+
+                    case 3:
+
+                        $program_ids = DB::table('program_user')
+                            ->where('user_id', Auth::user()->id)
+                            ->lists('program_id');
+
+                        break;
+                }*/
                 foreach ($clean_input['program_id'] as $program_id) {
                     DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");
                 }

app/controllers/OutcomesController.php

@@ -424,12 +424,12 @@ class OutcomesController extends \BaseController
                         $criterion->program_ids = json_encode(DB::table('program_criterion')
                             ->where('criterion_id', $criterion->id)
                             ->lists('program_id'));
-                        $criterion->objectives = json_encode(DB::table('criterion_objective_outcome')
+                        $criterion->objectives = DB::table('criterion_objective_outcome')
                             ->join('objectives', 'objectives.id', '=', 'criterion_objective_outcome.objective_id')
                             ->where('criterion_id', $criterion->id)
                             ->select('objectives.*')
                             ->distinct()
-                            ->lists('text'));
+                            ->lists('text');
                     }
                     return $criteria;
                     break;

app/views/global/view-three-year-plan.blade.php

@@ -442,9 +442,9 @@ $('.go-to-temp').on('click', function(){
           //if(typ.length>0)
           //{
           $('table').show();
-          $('#cycle1').html((year_start)+"-"+(year_start+1));
-          $('#cycle2').html((year_start+1)+"-"+(year_end-1));
-          $('#cycle3').html((year_end-1)+"-"+(year_end));
+          $('#cycle1').html((parseInt(year_start))+"-"+(parseInt(year_start)+1));
+          $('#cycle2').html((parseInt(year_start)+1)+"-"+(parseInt(year_end)-1));
+          $('#cycle3').html((parseInt(year_end)-1)+"-"+(parseInt(year_end)));
 
           $('#cycle_id').val(typ.id);
 

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

@@ -28,7 +28,7 @@
                 <div id='objectiveGroupFor0' data-value = '1'>
                     <div class="form-group col-md-11">
                         <label>Associated Objectives for Outcome 1</label>
-                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                        <select id="objective_0_counter_1" name="objective[]" class="form-control selectpicker" onchange ="visiblePrograms('allOutcomes')">
                         </select>
 
                     </div>
@@ -56,14 +56,14 @@
                 </button>
 
                 <!-- Associated Program -->
-                <div class="form-group">
+                <div class="form-group" id = 'program-checkboxes'>
                     {{ Form::label('program_id', 'Associated Program') }}<br>
                     <br>
 
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
-                    <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
+                    <input type="checkbox" id="program-{{ $program->id }}" name="program_id[]" value="{{$program->id}}" >
+                    <label for="program-{{ $program->id }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
                     @endforeach
 
                 </div>
@@ -163,7 +163,7 @@
     <div id='assoc_objectiveGroupFor0' data-value="1">
                         <div class="form-group col-md-11">
                             <label>Associated Objectives for Outcome 1</label>
-                            <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker">
+                            <select id="assoc_objective_0_counter_1" name="objective[]" class="form-control selectpicker" onchange ="visiblePrograms('allAssocOutcomes')">
                                 <option value="0">No associated objectives</option>
                             </select>
     
@@ -184,13 +184,13 @@
                         Add another Outcome
                     </button>
                 <!-- Associated Program -->
-                <div class="form-group">
+                <div class="form-group" id = 'assoc-program-checkboxes'>
 
                     {{ 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}}">
-                    <label for="assoc_program_id_{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
+                    <input type="checkbox" id="assoc_program-{{ $program->id }}" name="program_id[]" value="{{$program->id}}">
+                    <label for="assoc_program-{{ $program->id }}"> {{ $program->name }} <sub>[{{ $program->school->name }}]</sub></label><br>
                     @endforeach
                 </div>
 
@@ -285,7 +285,68 @@ if(e.originalEvent.submitter.id != "update_the_criterion")
 e.preventDefault();
 })
 
+visibleProgram = {};
+visibleProgram["allAssocOutcomes"]= {}
+visibleProgram["allOutcomes"]={}
+function visiblePrograms(allOutcomesDiv){
+    $('#'+allOutcomesDiv).parent().find('input:checkbox').each(function(index){
+
+        id = $(this).attr('id');
+        $(this).prop( "checked", false );
+        program_id = $(this).val();
+        if(!(program_id in visibleProgram[allOutcomesDiv])){
+            visibleProgram[allOutcomesDiv][program_id] ={};
+        }
+        visibleProgram[allOutcomesDiv][program_id]["checkbox"] =$(this).detach();
+        $("label[for='"+id+"']").next('br').remove();
+        visibleProgram[allOutcomesDiv][program_id]["label"] =$("label[for='"+id+"']").detach();
 
+    })
+    if(allOutcomesDiv =="allOutcomes"){
+    $('#'+allOutcomesDiv).parent().find("select[name='objective[]']").each(function(index){
+        var the_programs = $(this).find(':selected').data('program-ids');
+        if(!the_programs) return;
+        
+        
+        for(index in the_programs){
+            program_id = the_programs[index];
+            
+            if(program_id in visibleProgram[allOutcomesDiv] && 
+            !($('#program-checkboxes').find('#'+visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id')).val())){
+                visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo('#program-checkboxes');
+                visibleProgram[allOutcomesDiv][program_id]['label'].appendTo("#program-checkboxes");
+                $('#program-checkboxes').append('<br>');
+
+                
+
+            }
+        }
+        
+    })
+    }
+    else{
+        $('#'+allOutcomesDiv).find("select[name='objective[]']").each(function(index){
+        var the_programs = $(this).find(':selected').data('program-ids');
+        if(!the_programs) return;
+        
+        
+        for(index in the_programs){
+            program_id = the_programs[index];
+            if(program_id in visibleProgram[allOutcomesDiv] && 
+            !($('#assoc-program-checkboxes').find('#'+visibleProgram[allOutcomesDiv][program_id]['checkbox'].attr('id')).val())){
+                visibleProgram[allOutcomesDiv][program_id]['checkbox'].appendTo('#assoc-program-checkboxes');
+                visibleProgram[allOutcomesDiv][program_id]['label'].appendTo("#assoc-program-checkboxes");
+                $('#assoc-program-checkboxes').append('<br>');
+
+                
+
+            }
+        }
+        
+    })
+    }
+
+}
     function addOptions(select, max, scaleDiv) {
 
         
@@ -471,7 +532,8 @@ function addOutcomeTest() {
         'class': "selectpicker form-control",
         'name': "objective[]",
         'data-live-search': 'true',
-        'id': 'objective_'+counter +'_counter_1'  
+        'id': 'objective_'+counter +'_counter_1' ,
+        'onchange': "visiblePrograms('allOutcomes')"
     });
 
     var empty_div = $('<div/>',{
@@ -538,17 +600,20 @@ function addOutcomeTest() {
 
     }
     //Delete Objective
-    function deleteObjective(objectiveForm, closeObj, objectiveGroup) {
+    function deleteObjective(objectiveForm, closeObj, objectiveGroup, allOutcomes) {
         $div = document.getElementById(objectiveForm);
         $div.remove();
         $div = document.getElementById(closeObj);
         $div.remove();
         counter = parseInt($('#'+objectiveGroup).data("value"));
         $('#'+objectiveGroup).data("value", counter-1);
+        visiblePrograms(allOutcomes);
 
 
     }
 
+    
+
     //Add objective when editing
 
     function addAssocObjective(objForGroup, originalObjective) {
@@ -561,6 +626,7 @@ function addOutcomeTest() {
             'name': "objective[]",
             'data-live-search': 'true',
             'id': originalObjective+'_counter_' + (assocObjectiveCounter+1).toString(),
+            'onchange': "visiblePrograms('allAssocOutcomes')"
 
 
         });
@@ -576,7 +642,7 @@ function addOutcomeTest() {
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'")'
+            'onclick': 'deleteObjective("assoc_objectiveForm_'+objForGroup+'_' + assocObjectiveCounter.toString() + '", "assoc_closeObj_' +objForGroup+'_' + assocObjectiveCounter.toString() + '", "'+objForGroup+'", "allAssocOutcomes")'
         });
 
         $button.append('X');
@@ -605,7 +671,8 @@ function addOutcomeTest() {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': originalObjective +'_counter_' + (counter+1).toString()
+            'id': originalObjective +'_counter_' + (counter+1).toString(),
+            'onchange': "visiblePrograms('allOutcomes')"
         });
         var $div = $('<div/>', {
             'id': 'objectiveForm_'+objForGroup + '_' + counter.toString(),
@@ -619,7 +686,7 @@ function addOutcomeTest() {
         var $button = $('<button/>', {
             'type': 'button',
             'class': 'btn btn-primary',
-            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'")'
+            'onclick': 'deleteObjective("objectiveForm_' +objForGroup +'_' + counter.toString() + '", "closeObj_'+objForGroup+'_' + counter.toString() + '", "'+objForGroup+'", "allOutcomes")'
         });
 
         $button.append('X');
@@ -664,7 +731,7 @@ function addOutcomeTest() {
             'type': 'button',
             'class': 'btn btn-primary',
             'id': 'assoc_close_button'+assocOutcomeCounter,
-            'onclick': '$(this).parent().parent().remove()'
+            'onclick': '$(this).parent().parent().remove(); visiblePrograms("allAssocOutcomes")'
          });
 
         var divForGroup = $('<div/>', {
@@ -683,7 +750,8 @@ function addOutcomeTest() {
             'class': "selectpicker form-control",
             'name': "objective[]",
             'data-live-search': 'true',
-            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1'  
+            'id': 'assoc_objective_'+assocOutcomeCounter +'_counter_1',
+            'onchange': "visiblePrograms('allAssocOutcomes')" 
         });
 
         var empty_div = $('<div/>',{
@@ -734,7 +802,7 @@ function addOutcomeTest() {
 
     var assocObjectiveCounter = 1;
 
-    function fetchAssocObjective(outcomeDiv, objectiveGroup) {
+/*    function fetchAssocObjective(outcomeDiv, objectiveGroup) {
         var count = $('#'+outcomeDiv).data('value');
         var allOutcomes =[];
 
@@ -792,14 +860,14 @@ function addOutcomeTest() {
                     $("#assoc_objective_"+i.toString()).val(allObjectives[i].value);
                     $("#assoc_objective_"+i.toString()).selectpicker("refresh");
                     }
-                }*/
+                }
 
 
 
             },
             'json'
         );
-    }
+    }*/
 
     //Fetch objective at creating criteria
     counterForPost = 0;
@@ -824,7 +892,7 @@ function addOutcomeTest() {
                 optionName = '<option value ="0">Nothing Selected</option>';
                 for(index in varArray){
                     objectiveObject = varArray[index];
-                    optionName += '<option value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
+                    optionName += '<option data-program-ids = "'+objectiveObject.program_ids+'" value ="('+objectiveObject.outcome_id+','+objectiveObject.objective_id+')">'+
                         objectiveObject.text+'</option>';
 
                 }
@@ -1029,7 +1097,7 @@ $('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible"
                     options = "<option value ='0'>Nothing Selected</option>";
                         $(first_outcome.assoc_objectives).each(function(index, objective){
 
-                        options += '<option value ="('+first_outcome.id+','+objective.objective_id+')">'+
+                        options += '<option data-program-ids = "'+objective.program_ids+'" value ="('+first_outcome.id+','+objective.objective_id+')">'+
                             objective.text+'</option>';
 
                         })
@@ -1120,6 +1188,7 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                     }
 
                 }
+                visiblePrograms('allAssocOutcomes');
 
 
                 //counterObj =$('#assoc_objectiveGroup').data('value');
@@ -1190,7 +1259,7 @@ options += '<option value ="('+outcome.id+','+objective.objective_id+')">'+
                 $('input[type=checkbox]').prop('checked', false);
 
                 for (var i = 0; i < program_length; i++) {
-                    $('#assoc_program_id_' + criterion.program[i].program_id).prop("checked", true);
+                    $('#assoc_program-' + criterion.program[i].program_id).prop("checked", true);
                 }
 
 
@@ -1220,7 +1289,7 @@ fetchCriterionForEditing();
 fetchObjectiveForSelect('outcome0', 'objectiveGroupFor0');
 // setCriterionStatus();
 fetchAllCriterion("select-program", "assoc_outcomes_fetch");
-
+visiblePrograms('allOutcomes');
 // --------------------------------------------------------------------------
 // Functions
 // --------------------------------------------------------------------------

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

@@ -53,7 +53,7 @@
 
                     @foreach ($programs as $program)
 
-                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}">
+                    <input type="checkbox" id="{{ $program->name }}" name="program_id[]" value="{{$program->id}}" >
                     <label for="{{ $program->name }}"> {{ $program->name }} [{{ $program->school->name }}]</label><br>
                     @endforeach
 

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

@@ -315,6 +315,31 @@
         </div>
     </div>
 </div>
+
+<div class="modal fade" id="rubric-modal">
+    <div class="modal-dialog modal-md">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title text-center" id ="modal-title-rubric">You are adding criteria to your program</h4>
+        </div>
+          <div class="modal-body" id ="modal-body-rubric">
+              
+  
+  
+ 
+                 
+                  
+                  
+          </div>
+        <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+              <button type="button" class="btn btn-primary" id ="saveButton" value="Save" type="button" onclick = "saveTemplate()" >Save</button>
+
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div>
 <script>
 
     </script>
@@ -382,8 +407,9 @@ function fetchCriteria(outcome, objective)
             // Append criteria
             data.forEach( function (arrayItem)
             {
+                objectives = JSON.stringify(arrayItem.objectives);
                 $('#select-criterion')
-                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = "'+arrayItem.program_ids+'" data-assoc-objectives = "'arrayItem.objectives'">'+arrayItem.name+'</option>');
+                    .append('<option data-criterion-id="'+arrayItem.id+'" data-program-ids = "'+arrayItem.program_ids+'" data-assoc-objectives= '+"'"+objectives+"'"+'>'+arrayItem.name+'</option>');
             });
 
             // If there are no criteria assigned to the selected outcome, disable the
@@ -423,7 +449,8 @@ function addCriterion()
 
     // Get the selected criterion's id
     var id= parseInt($('#select-criterion').find(':selected').data('criterion-id'));
-
+    var program_ids = $('#select-criterion').find(':selected').data('program-ids');
+    var objectives = $('#select-criterion').find(':selected').data('assoc-objectives');
     // Check for duplicates
     var duplicates=false;
     numberOfScale = $('#number_of_scales').find(':selected').val();
@@ -469,7 +496,7 @@ function addCriterion()
             }
             
             
-            var str ='<tr data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+            var str ='<tr data-criterion-name ="'+data.criterion.name+'" data-program-ids = "['+program_ids+']" data-assoc-objectives = '+"'"+objectives+"'"+' data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
             var subcriteria = '';
             if(data.criterion.subcriteria){
@@ -782,8 +809,9 @@ function loadTemplate()
             // Set the contents of the rubric
             var temp_criterion = data.criterion;
             for(temp_c in temp_criterion){
-                var str = '<tr data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
                 current_criterion = temp_criterion[temp_c]
+                var str = '<tr data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
                     var subcriteria_array = JSON.parse(current_criterion.subcriteria);
@@ -841,7 +869,7 @@ function loadTemplate()
             contents.forEach(function (data)
             {
                 // Append the fetched data
-                var str ='<tr data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
+                var str ='<tr  data-criterion-id="'+data.id+'" data-criterion-copyright="'+data.copyright+'" data-criterion-notes="'+data.notes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
 
 
                 var subcriteria = '';
@@ -1170,48 +1198,12 @@ $('#button-add-criterion').on('click', function(e)
     //Add new criterion
     addCriterion();
 });
-
-// When the create or update buttons are clicked (.save)
-$('.save').on('click', function(e)
+function saveTemplate(button_id)
 {
     //Prevent page refresh
-    e.preventDefault();
-
-    // Empty field validation
-    var emptyFields=false;
-
-    $('#allCriteria').children('td').each(function()
-    {
-        if (($(this).text() == "" || $(this).text() == "Empty") && !($(this).hasClass('nullable')) )
-        {
-            emptyFields=true;
-        }
-    });
-
-
-    // If any fields are empty, display error
-    if(emptyFields || $.trim($('#rubric-name').val())=='')
-    {
-        $('#js-error-row').show();
-        $('#js-error-row').find('#error-message').text('Error: Please fill all the fields. Make sure your rubric has a name and all scale scores are filled.');
-        return;
-    }
-    else
-    {
-            $('#js-error-row').hide();
-    }
+    
 
-    // Check whether a rubric with the written name already exists
-    if($(this).attr('id')=='button-create-rubric' && nameExists())
-    {
-        $('#js-error-row').show();
-        $('#js-error-row').find('#error-message').text('Error: A template with that name already exists.');
-        return;
-    }
-    else
-    {
-            $('#js-error-row').hide();
-    }
+    
 
     var criterionObject = new Object();
     var criteriaArray = new Array();
@@ -1305,6 +1297,116 @@ $('.save').on('click', function(e)
         );
     }
 
+}
+// When the create or update buttons are clicked (.save)
+$('.save').on('click', function(e)
+{
+    //Prevent page refresh
+    e.preventDefault();
+    var emptyFields=false;
+
+    $('#allCriteria').children('td').each(function()
+    {
+        if (($(this).text() == "" || $(this).text() == "Empty") && !($(this).hasClass('nullable')) )
+        {
+            emptyFields=true;
+        }
+    });
+
+
+    // If any fields are empty, display error
+    if(emptyFields || $.trim($('#rubric-name').val())=='')
+    {
+        $('#js-error-row').show();
+        $('#js-error-row').find('#error-message').text('Error: Please fill all the fields. Make sure your rubric has a name and all scale scores are filled.');
+        return;
+    }
+    else
+    {
+            $('#js-error-row').hide();
+    }
+
+    // Check whether a rubric with the written name already exists
+    if($(this).attr('id')=='button-create-rubric' && nameExists())
+    {
+        $('#js-error-row').show();
+        $('#js-error-row').find('#error-message').text('Error: A template with that name already exists.');
+        return;
+    }
+    else
+    {
+            $('#js-error-row').hide();
+    }
+    program_id = $('#select-program').find(':selected').data('program-id')
+    if(program_id == 0){
+        $('#modal-title-rubric').html("All criteria will be associated with this school's programs");
+        htmlString = "<h5>The following criteria and objectives will be matched with all programs</h5>"
+        htmlString += "<ol style='list-style-position: inside'>"
+
+        $('tbody tr').each(function( index )
+        {
+            objectives = $(this).data('assoc-objectives');
+            objectives = objectives.split(',');
+            htmlString += "<li>" +$(this).data('criterion-name');
+            htmlString += "<br><h5>This criterion is associated with these objectives</h5>"
+            htmlString +="<ul style='padding-left: 5%; list-style-position: inside'>"
+            for(index in objectives){
+                
+                objective_string = objectives[index];
+                htmlString +="<li>"+objective_string+"</li>";
+
+            }
+            htmlString += "</ul>"
+           
+            htmlString +="</li>" 
+            htmlString+= "<br>";
+        });
+        htmlString +='</ol>';
+        $("#modal-body-rubric").html(htmlString);
+
+
+    }
+    else{
+        $('#modal-title-rubric').html('Some criteria will be associated with this program');
+        $('tbody tr').each(function( index )
+        {
+            htmlString = '';
+            
+            program_ids = $(this).data('program-ids')
+            if(!program_ids.includes(program_id) ){
+                title = "<h6>The following criteria and objectives will be matched with this program</h6>"
+                htmlString += "<ol style='list-style-position: inside'>"
+        
+                objectives = $(this).data('assoc-objectives');
+            objectives = objectives.split(',');
+            htmlString += "<li>" +$(this).data('criterion-name');
+            htmlString += "<br><h6>This criterion is associated with these objectives</h6>"
+            htmlString +="<ul style='padding-left: 5%; list-style-position: inside'>"
+            for(index in objectives){
+                
+                objective_string = objectives[index];
+                htmlString +="<li>"+objective_string+"</li>";
+
+            }
+            htmlString += "</ul>"
+           
+            htmlString +="</li>" 
+            htmlString+= "<br>";
+
+            }
+            if(htmlString != ''){
+                $("#modal-body-rubric").html(title);
+
+                $("#modal-body-rubric").append(htmlString);
+
+            }
+        });
+    }
+    
+    $('#rubric-modal').modal('toggle');
+    $('#saveButton').attr('onclick','saveTemplate("'+$(this).attr('id')+'")')
+
+
 });
 
 // When the confirm  delete button is clicked