Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

resuelto
Conflicts:
	app/controllers/ThreeYearPlanController.php

app/controllers/Objective2Controller.php

@@ -45,30 +45,51 @@ class Objective2Controller extends \BaseController
 			return true;
 	}
 
-
-	private function makeValidator($clean_input)
+	//edit == true or edit == false
+	private function makeValidator($clean_input, $edit)
 	{
 		/** Validation rules */
-		return Validator::make(
-			array(
-				'text' => $clean_input['text'],
 
-				'outcome_id' => $clean_input['outcome_id'],
-				'program_id' => $clean_input['program_id']
+		if (!$edit) {
+			return Validator::make(
+				array(
+					'text' => $clean_input['text'],
 
-			),
-			array(
-				'text' => 'required|string',
+					'outcome_id' => $clean_input['outcome_id'],
+					'program_id' => $clean_input['program_id']
 
-				'outcome_id' => 'required|array',
-				'program_id' => 'required|array'
+				),
+				array(
 
-			)
+					'outcome_id' => 'required|array',
+					'program_id' => 'required|array'
+
+				)
+
+			);
+		} else {
+			return Validator::make(
+				array(
+					'text' => $clean_input['text'],
+
+					'outcome_id' => $clean_input['outcome_id'],
+					'program_id' => $clean_input['program_id']
+
+				),
+				array(
+					'text' => 'required|string|unique',
 
-		);
+					'outcome_id' => 'required|array',
+					'program_id' => 'required|array'
+
+				)
+
+			);
+		}
 	}
 
 
+
 	private function cleanInput()
 	{
 		$clean_input = array();
@@ -78,14 +99,14 @@ class Objective2Controller extends \BaseController
 
 		$clean_input['outcome_id'] = Input::get('outcome');
 		$counter = Input::get('counter') + 0;
-		Log::info($clean_input);
+		//		Log::info($clean_input);
 
 		foreach ($clean_input['outcome_id'] as $index => $outcome_id) {
 			$clean_input['outcome_id'][$index] = trim(preg_replace('/\t+/', '', $clean_input['outcome_id'][$index]));
 		}
 
 		$clean_input['program_id'] = Input::get('program_id');
-		Log::info(Input::get('program_id'));
+		//		Log::info(Input::get('program_id'));
 
 		return $clean_input;
 	}
@@ -145,6 +166,8 @@ class Objective2Controller extends \BaseController
 				'typ_semester_outcome.id as typ_semester_outcome_id'
 			)
 			->get();
+
+
 		$json['typ_semester_objectives'] = DB::table('typ_semester_objectives')
 			->where('objective_id', Input::get('id'))
 			->get();
@@ -194,7 +217,7 @@ class Objective2Controller extends \BaseController
 		$clean_input = $this->cleanInput();
 
 		/** Validation rules */
-		$validator = $this->makeValidator($clean_input);
+		$validator = $this->makeValidator($clean_input, false);
 
 		/** If validation fails */
 		if ($validator->fails()) {
@@ -256,6 +279,8 @@ class Objective2Controller extends \BaseController
 			if ($objective->save()) {
 				$objectiveId = $objective->id;
 
+				Log::info($clean_input['outcome_id']);
+
 
 				foreach ($clean_input['program_id'] as $program_id) {
 					DB::insert("insert into objective_program (objective_id, program_id) values({$objectiveId},{$program_id})");
@@ -441,7 +466,10 @@ class Objective2Controller extends \BaseController
 		//Log::info(print_r($clean_input, true));
 
 		/** Validation rules */
-		$validator = $this->makeValidator($clean_input);
+		if ($clean_input['text'] == $Objective->text) {
+			$validator = $this->makeValidator($clean_input, true);
+		} else
+			$validator = $this->makeValidator($clean_input, false);
 
 		/** If validation fails */
 		if ($validator->fails()) {

app/controllers/ThreeYearPlanController.php

@@ -80,6 +80,7 @@ class ThreeYearPlanController extends \BaseController
     {
 	    $outcomes = DB::table('outcomes')->where('deactivation_date', '=', null)->where('level', '=', 3)->orderBy('name', 'ASC')->get();    
     }
+
     // se annadio la nueva variable
     return View::make('global.view-three-year-plan', compact('title', 'last_year', 'outcomes', 'typs', 'criteria', 'semesters', 'program_id'));
   }
@@ -375,7 +376,7 @@ class ThreeYearPlanController extends \BaseController
             ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
             ->where('objective_program.program_id', $program_id)
             ->where('objective_outcome.outcome_id', $outcome_id)
-            ->where('objective_outcome.objective_id', "<>",0)
+            ->where('objective_outcome.objective_id', "<>", 0)
             ->select('objectives.id', 'objectives.text', 'outcomes.name as outcome_name')
             ->orderBy('objectives.text', 'asc')
             ->get();
@@ -455,19 +456,19 @@ class ThreeYearPlanController extends \BaseController
 
           $semesters_->selected_objectives = array();
           foreach ($result_objectives as $objectives_) {
-//             $result_courses = DB::table('courses')
-//               ->where('courses.program_id', $program_id)
-//               ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
-//               ->orderBy('courses.number', 'asc')
-//               ->groupBy('courses.name', 'courses.code')
-//               ->get();
+            //             $result_courses = DB::table('courses')
+            //               ->where('courses.program_id', $program_id)
+            //               ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
+            //               ->orderBy('courses.number', 'asc')
+            //               ->groupBy('courses.name', 'courses.code')
+            //               ->get();
 
             $result_courses = DB::table('courses')
               ->where('courses.program_id', $program_id)
-              ->orWhereIn('courses.program_id', function ($q) use ($program_id){
-              		$q->select('other_program_id')
-              		  ->from('other_programs_courses_typ')
-              		  ->where('program_id',$program_id);	
+              ->orWhereIn('courses.program_id', function ($q) use ($program_id) {
+                $q->select('other_program_id')
+                  ->from('other_programs_courses_typ')
+                  ->where('program_id', $program_id);
               })
               ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
               ->orderBy('courses.code', 'asc')

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

@@ -103,7 +103,7 @@
             </div>
             <br>
             <!--<button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
-                          -->
+                              -->
         </div>
 
         <!-- Modal -->
@@ -404,10 +404,12 @@
                 $.post(
                     "{{ URL::action('ThreeYearPlanController@createAnnualPlan', [$program_id]) }}", {
                         typ_id: $('#table-cycles').data('typ-id')
-                    });
-                window.location.href =
-                    "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
+                    },
+                    function() {
+                        window.location.href =
+                            "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
 
+                    });
             });
 
             // When list item is clicked, load corresponding info

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

@@ -3,7 +3,7 @@
         <!--<div class="navbar-header">
       {{ HTML::linkAction('ProgramCoordinatorsController@overview','Online Learning Assessment System · Program Coordinator',[],['class' => 'navbar-brand']) }}
     </div>-->
-        <ul class="nav navbar-nav navbar-right">
+        <ul class="nav navbar-nav navbar-right ml-auto">
             <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
 
             <li class="dropdown">
@@ -142,6 +142,12 @@
                                 href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
                         </li>
                     @endforeach
+                    <h6 class="dropdown-header">View Annual Report from:</h6>
+                    @foreach (Auth::user()->programs as $program)
+                        <li><a
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
                 </ul>
             </li>
 

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

@@ -3,7 +3,7 @@
         <!--<div class="navbar-header">
       {{ HTML::linkAction('ProgramCoordinatorsController@overview','Online Learning Assessment System · Program Coordinator',[],['class' => 'navbar-brand']) }}
     </div>-->
-        <ul class="nav navbar-nav navbar-right">
+        <ul class="nav navbar-nav navbar-right ml-auto">
             <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
 
             <li class="dropdown">
@@ -69,7 +69,7 @@
                     <h6 class="dropdown-header">View Annual Plan from:</h6>
                     @foreach (Auth::user()->school->programs as $program)
                         <li><a
-                                href="{{ URL::action('AnnualPlansController@viewAllPlans', [$program->id]) }}">{{ $program->name }}</a>
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['plan', $program->id]) }}">{{ $program->name }}</a>
                         </li>
                     @endforeach
                 </ul>
@@ -130,6 +130,12 @@
                                 href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{ $program->name }}</a>
                         </li>
                     @endforeach
+                    <h6 class="dropdown-header">View Annual Report from:</h6>
+                    @foreach (Auth::user()->programs as $program)
+                        <li><a
+                                href="{{ URL::action('AnnualPlansController@annualPlansShow', ['report', $program->id]) }}">{{ $program->name }}</a>
+                        </li>
+                    @endforeach
                 </ul>
             </li>
 

app/views/local/managers/shared/annual-plans.blade.php

@@ -1353,12 +1353,12 @@
                         'role': 'group'
                     });
                     button_save = $('<button>', {
-                        'class': 'btn btn-lg btn-primary',
+                        'class': 'btn btn-lg btn-primary btn-block',
                         'type': 'button',
                         'onclick': 'check_if_ready(' + annual_id + ')'
                     }).html('Submit Annual Plan');
                     button_print = $("<button>", {
-                        "class": 'btn btn-lg btn-primary',
+                        "class": 'btn btn-lg btn-primary btn-block',
                         "type": "button",
                         "onclick": "window.location.href = " +
                             "'{{ URL::action('AnnualPlansController@printAnnualPlan') }}" +

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

@@ -68,14 +68,14 @@
 
 
                     <!-- <div class="table-responsive">
-                                                                                                                                                                                                                                                                                                                <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
-                                                                                                                                                                                                                                                                                                                  <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
-                                                                                                                                                                                                                                                                                                                  <tbody>
-                                                                                                                                                                                                                                                                                                                  </tbody>
+                                                                                                                                                                                                                                                                                                                    <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
+                                                                                                                                                                                                                                                                                                                      <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
+                                                                                                                                                                                                                                                                                                                      <tbody>
+                                                                                                                                                                                                                                                                                                                      </tbody>
 
-                                                                                                                                                                                                                                                                                                                </table>
-                                                                                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                                                            </div>-->
+                                                                                                                                                                                                                                                                                                                    </table>
+                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                </div>-->
 
                 </div>
             </div>
@@ -1580,12 +1580,12 @@
                         'role': 'group'
                     });
                     button_save = $('<button>', {
-                        'class': ' btn btn-lg btn-primary ',
+                        'class': ' btn btn-lg btn-primary btn-block',
                         'type': 'button',
                         'onclick': 'check_if_ready(' + annual_id + ')'
                     }).html('Submit Annual Report');
                     button_print = $("<button>", {
-                        "class": 'btn btn-lg btn-primary ',
+                        "class": 'btn btn-lg btn-primary btn-block',
                         "type": "button",
                         "onclick": "window.location.href = " +
                             "'{{ URL::action('AnnualPlansController@printAnnualReport') }}" +

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

@@ -29,7 +29,7 @@
                         <div class="form-group col-md-11" id='outcomeForm'>
 
 
-                            <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker">
+                            <select id="outcome[0]" name="outcome[0]" class="form-control selectpicker createOutcome">
 
                                 @foreach ($outcomes as $outcome)
                                     <option value="{{ $outcome->id }}">
@@ -83,7 +83,7 @@
 
 
 
-                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block']) }}
+                    {{ Form::submit('Create', ['class' => 'btn btn-primary btn-block', 'id' => 'createObjectiveButton']) }}
                     {{ Form::close() }}
                 </div>
             </div>
@@ -141,8 +141,8 @@
                             @foreach ($objectives as $objective)
                                 <option value="{{ $objective->id }}"
                                     data-subtext="
-                                                                                                                                                                                                                             @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
-                                                                                                                                                                                                            ">
+                                                                                                                                                                                                                                         @if ($objective->program) &nbsp;&nbsp;&nbsp;[{{ $objective->program->name }}] @endif
+                                                                                                                                                                                                                        ">
                                     {{ $objective->text }}
 
 
@@ -311,6 +311,8 @@
             );
         }
 
+
+
         var counter = 1;
         var counterAssoc = 0;
         //Add Another Outcome
@@ -339,7 +341,7 @@
 
         function addOutcomeTest() {
             var $select = $('<select/>', {
-                'class': "selectpicker form-control",
+                'class': "selectpicker form-control createOutcome",
                 'name': "outcome[" + counter.toString() + "]",
                 'data-live-search': 'true'
 
@@ -406,7 +408,7 @@
 
                     // Select associated outcome
                     $(".removable-outcome").remove();
-                    $('.alert-dismissible').remove();
+                    $('.warning-objective').remove();
                     $('#assoc_outcome0').val(json.outcome[0].outcome_id);
 
                     disabled = 0;
@@ -466,7 +468,7 @@
 
                     if (disabled == 1) {
                         alert = $('<div/>', {
-                            'class': 'alert alert-danger alert-dismissible',
+                            'class': 'alert alert-danger alert-dismissible warning-objective',
                             'role': 'alert'
                         })
                         button = $('<button/>', {