Que salieran los criterios en el segundo semestre de anual plan. Que los filtros esten abiertos al load

app/controllers/TransformativeActionsController.php

@@ -151,8 +151,8 @@ class TransformativeActionsController extends \BaseController
       ->whereIn('courses.program_id', $program_id)
       ->select('courses.*')
       ->groupBy('courses.number', 'courses.code',  'courses.name')
-      ->orderBy('courses.name', 'ASC')
       ->orderBy('courses.code', 'ASC')
+      ->orderBy('courses.number', 'ASC')
       ->get();
     /*
     // if user is profesor
@@ -718,6 +718,7 @@ class TransformativeActionsController extends \BaseController
       ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
       ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
       ->where('transformative_actions.id', $ta_id)
+      ->where('objectives.id', '<>',0)
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->get();
@@ -725,6 +726,7 @@ class TransformativeActionsController extends \BaseController
       ->join('transformative_objective', 'transformative_objective.ta_id', '=', 'transformative_actions.id')
       ->join('objectives', 'objectives.id', '=', 'transformative_objective.objective_id')
       ->where('transformative_actions.id', $ta_id)
+      ->where('objectives.id', '<>',0)
       ->select('objectives.text as text', 'objectives.id as id')
       ->orderBy('objectives.text', 'ASC')
       ->lists('objectives.id');
@@ -743,6 +745,7 @@ class TransformativeActionsController extends \BaseController
       ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
       ->whereIn('objective_outcome.outcome_id', $outcome_ids)
       ->whereIn('objective_program.program_id', $program_ids)
+      ->where('objective_outcome.objective_id', '<>',0)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
       ->distinct()
@@ -830,6 +833,7 @@ class TransformativeActionsController extends \BaseController
       ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
       ->join('objective_outcome', 'objective_outcome.objective_id', '=', 'objectives.id')
       ->where('objective_outcome.outcome_id', $outcome_id)
+      ->where('objective_outcome.objective_id','<>',0 )
       ->whereIn('objective_program.program_id', $program_ids)
       ->orderBy('objectives.text', 'ASC')
       ->select('objectives.text as text', 'objectives.id as id')
@@ -1321,6 +1325,8 @@ class TransformativeActionsController extends \BaseController
       ->join('transformative_activity_criterion as tac', 'tac.activity_criterion_id', '=', 'activity_criterion.id')
       ->select('courses.*')
       ->groupBy(array('courses.code', 'courses.name', 'courses.semester_id'))
+      ->orderBy('courses.code')
+      ->orderBy('courses.number')
       ->get();
 
 

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

@@ -128,7 +128,7 @@
                 <div class="panel-body">
                     {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -776,7 +776,7 @@
         }
 
 
-        $('.filterSection').hide();
+        $('.filterSection').show();
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');
             if (span.attr('class') == 'glyphicon glyphicon-plus') {

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

@@ -82,7 +82,7 @@
                 </div>
                 <div class="panel-body">
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -215,7 +215,7 @@
         </div>
     </div>
     <script>
-        $('.filterSection').hide();
+        $('.filterSection').show();
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');
             if (span.attr('class') == 'glyphicon glyphicon-plus') {

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

@@ -45,7 +45,7 @@
                 <div class="form-group col-md-11">
                   <select name="courseid" class="form-control createCourses selectpicker">
                     @foreach ($courses_create as $course)
-                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
+                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}}{{$course->number}} {{$course->name}}</option>
                     @endforeach
                   </select>
                 </div>
@@ -243,7 +243,7 @@
 
               <div class="">
                 <button class="btn btn-md btn-secondary filterButton">
-                  <span class="glyphicon glyphicon-plus">
+                  <span class="glyphicon glyphicon-minus">
                   </span>
                   Filters
                 </button>
@@ -266,7 +266,7 @@
                     <select class="form-control filterCourse selectpicker">
                       <option value="0">Show All</option>
                       @foreach ($course_filter_editPanel as $course)
-                        <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
+                        <option value="({{$course->code}},{{$course->number}})">{{$course->code}}{{$course->number}} {{$course->name}}</option>
                       @endforeach
                     </select>
                   </div>
@@ -326,7 +326,7 @@
                 <div class="form-group col-md-11 editCourse">
                   <select name="courseid" id = "edit_course" class="form-control selectpicker">
                     @foreach ($courses_create as $course)
-                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}} {{$course->name}}</option>
+                      <option value="({{$course->code}},{{$course->number}})">{{$course->code}}{{$course->number}} {{$course->name}}</option>
                     @endforeach
                   </select>
                 </div>
@@ -485,7 +485,8 @@ if(($('#approvalSelectTA').val() === "")){
 }
 
 //
-$('.filterSection').hide();
+//$('.filterSection').hide();
+$('.filterSection').show();
 
 // --------------------------------------------------------------------------
 // Functions

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

@@ -125,7 +125,7 @@
                     {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
 
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -693,7 +693,7 @@
 
         }
 
-        $('.filterSection').hide();
+        $('.filterSection').show();
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');
             if (span.attr('class') == 'glyphicon glyphicon-plus') {

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

@@ -94,7 +94,7 @@
 
                 <div class="panel-body">
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -246,7 +246,7 @@
         </div>
     </div>
     <script>
-        $('.filterSection').hide();
+        $('.filterSection').show();
 
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');

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

@@ -123,7 +123,7 @@
                 <div class="panel-body">
                     {{ Form::open(['action' => 'CriteriaController@update', 'id' => 'update_criterion', 'data-form-id' => 'update_criterion']) }}
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -779,7 +779,8 @@
         }
 
 
-        $('.filterSection').hide();
+//        $('.filterSection').hide();
+        $('.filterSection').show();
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');
             if (span.attr('class') == 'glyphicon glyphicon-plus') {

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

@@ -82,7 +82,7 @@
 
                 <div class="panel-body">
                     <button class="btn btn-md btn-secondary filterButton">
-                        <span class="glyphicon glyphicon-plus">
+                        <span class="glyphicon glyphicon-minus">
                         </span>
                         Filters
                     </button>
@@ -214,7 +214,7 @@
         </div>
     </div>
     <script>
-        $('.filterSection').hide();
+        $('.filterSection').show();
 
         $('.filterButton').on('click', function() {
             var span = $(this).find('span');

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

@@ -76,8 +76,22 @@
        
     }
     function changeOutput(show, hide){
-      $(show).show();
-      $(hide).hide();
+//       console.log($(show).selector);#firstSemester
+
+		if($(show).selector=="#secondSemester")
+		{
+		  $('#first_semester_button')[0].className="btn btn-secondary";
+		  $('#second_semester_button')[0].className="btn btn-primary";
+		 }
+		 if($(show).selector=="#firstSemester")
+		 {
+		  $('#first_semester_button')[0].className="btn btn-primary";
+		  $('#second_semester_button')[0].className="btn btn-secondary";
+	 
+		 }
+		  $(show).show();
+	  
+		  $(hide).hide();
     }
     function postToTransformativeReport(){
       program_id = {{$program_id}};
@@ -166,18 +180,21 @@ $('#here2').append($buttonForInform);*/
 
 
         $button = $('<button/>',{
-          'class': 'btn btn-secondary',
+          'id' : 'first_semester_button',
+          'class': 'btn btn-primary',
           'type': 'button',
           'style': 'width: 50%',
           'onclick': 'changeOutput("#firstSemester","#secondSemester")'
 
         }).html('First Semester');
         $button2 = $('<button/>',{
+          'id' : 'second_semester_button',
           'class': 'btn btn-secondary',
           'type': 'button',
           'style': 'float:right; width:50%',
           'onclick': 'changeOutput("#secondSemester","#firstSemester")'
         }).html('Second Semester');
+        
         $button.appendTo('#allTables');
         $button2.appendTo('#allTables');
         
@@ -299,11 +316,11 @@ $('#here2').append($buttonForInform);*/
                 var theCourse = json.first.courses[theObj.id][course];
                 courseHTML+= '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
                 courseTAhtml += '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
-
-//                 for(criterion in json.first.criteria[theObj.id][theCourse.typ_course_id]){
-                for(criterion in json.first.criteria[theObj.id][theCourse.course_id]){
-//                   theCrit = json.first.criteria[theObj.id][theCourse.typ_course_id][criterion];
-                  theCrit = json.first.criteria[theObj.id][theCourse.course_id][criterion];
+// console.log(json.first.criteria[theObj.id][theCourse.course_id]);
+                for(criterion in json.first.criteria[theObj.id][theCourse.typ_course_id]){
+//                 for(criterion in json.first.criteria[theObj.id][theCourse.course_id]){
+                  theCrit = json.first.criteria[theObj.id][theCourse.typ_course_id][criterion];
+//                   theCrit = json.first.criteria[theObj.id][theCourse.course_id][criterion];
                   courseHTML += '\t&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n\n<br>';
                   
                 }