anhadir view a typ

app/controllers/ThreeYearPlanController.php

@@ -614,6 +614,7 @@ class ThreeYearPlanController extends \BaseController
 
   public function printPlan($program_id, $typ)
   {
+	$view=0;
 
     $program = DB::table('programs')->where('id', $program_id)->first();
     $three_year_plan = DB::table('three_year_plan')->where('id', $typ)->first();
@@ -656,6 +657,53 @@ class ThreeYearPlanController extends \BaseController
     Log::info($typ_semester_outcome);
 
 
-    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'));
+    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome', 'view'));
+  }
+  
+  public function viewPlan($program_id, $typ)
+  {
+	$view=1;
+    $program = DB::table('programs')->where('id', $program_id)->first();
+    $three_year_plan = DB::table('three_year_plan')->where('id', $typ)->first();
+
+    $typ_program_id = DB::table('typ_program')->where('three_year_plan_id', $three_year_plan->id)
+      ->where('program_id', $program->id)
+      ->first()->id;
+
+    $typ_semesters = DB::table('semesters')
+      ->join('typ_semesters', 'semesters.id', '=', 'typ_semesters.semester_id')
+      ->where('typ_id', $three_year_plan->id)
+      ->orderBy('semester_id')
+      ->get();
+
+
+    foreach ($typ_semesters as $semester) {
+      $typ_semester_outcome[$semester->semester_id] = DB::table('typ_semester_outcome')
+        ->join('outcomes', 'outcomes.id', '=', 'typ_semester_outcome.outcome_id')
+        ->where('typ_program_id', $typ_program_id)
+        ->where('semester_id', $semester->semester_id)
+        ->select('typ_semester_outcome.id as typ_id')
+        ->addSelect('outcomes.id as outcome_id', 'outcomes.name')
+        ->get();
+
+      foreach ($typ_semester_outcome[$semester->semester_id] as $outcome) {
+        $outcome->objectives = DB::table('typ_semester_objectives')
+          ->join('objectives', 'objectives.id', '=', 'typ_semester_objectives.objective_id')
+          ->where('typ_semester_outcome_id', $outcome->typ_id)
+          ->select('typ_semester_objectives.id as typ_obj_id')
+          ->addSelect('objectives.text', 'objectives.id as objective_id')
+          ->get();
+        foreach ($outcome->objectives as $objective) {
+          $objective->courses = DB::table('typ_semester_courses')
+            ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+            ->where('typ_semester_objective_id', $objective->typ_obj_id)
+            ->get();
+        }
+      }
+    }
+    Log::info($typ_semester_outcome);
+
+
+    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome', 'view'));
   }
 }

app/routes.php

@@ -245,6 +245,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'printThreeYear/{program_id}/{typ}',
         'uses' => 'ThreeYearPlanController@printPlan'
     ));
+    Route::get('viewThreeYear/{program_id}/{typ}', array(
+        'as' => 'viewThreeYear/{program_id}/{typ}',
+        'uses' => 'ThreeYearPlanController@viewPlan'
+    ));
     // Fetch all criteria associated to an outcome
     Route::post('fetchInfo', array(
         'as' => 'fetchInfo',

app/views/global/print_three_year_plan.blade.php

@@ -93,10 +93,12 @@ echo
     @media print{@page {size: landscape}}
 </style>';
 
-echo '<style type="text/css" media="print">
-  @page { size: landscape; }
-</style>';
-
+if(!$view) 
+{
+	echo '<style type="text/css" media="print">
+	  @page { size: landscape; }
+	</style>';
+}
 ?>
 <img class="logo" src="{{ asset('images/logo_uprrp_bw.png') }}" alt="UPRRP Logo">
 
@@ -136,7 +138,7 @@ echo '<style type="text/css" media="print">
             <ol>
             @foreach($objective->courses as $course)
             
-    <li>[{{$course->code}}] {{$course->name}}</li>
+    <li>[{{$course->code}}{{$course->number}}] {{$course->name}}</li>
             
             @endforeach
         </ol>
@@ -158,6 +160,8 @@ echo '<style type="text/css" media="print">
 
 echo '</body>';
 echo '</html>';
+if(!$view)
+{
 ?>
 
 <script type="text/javascript">
@@ -165,3 +169,6 @@ echo '</html>';
 window.print();
 
 </script>
+<?php
+}
+?>

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

@@ -143,6 +143,7 @@
 
         <div class="col-md-9">
             <div class="btn-group pull-right">
+                <a href="" id="view_button" class="btn btn-default" target="_blank" rel="noopener noreferrer">View</a>
                 <a href="" id="print_button" class="btn btn-default" target="_blank" rel="noopener noreferrer">Print</a>
             </div>
             <div id="cycle-display" class="panel panel-default">
@@ -419,6 +420,10 @@
                 $('#three_year_button').hide();
                 var id = $(this).data('cycle-id');
                 $('#table-cycles').data('typ-id', id);
+                $('#view_button').show();
+                $('#view_button').attr("href",
+                    "{{ URL::action('ThreeYearPlanController@viewPlan', [$program_id]) }}" +
+                    '/' + $(this).data('cycle-id'));
                 $('#print_button').show();
                 $('#print_button').attr("href",
                     "{{ URL::action('ThreeYearPlanController@printPlan', [$program_id]) }}" +