reportes y annualplans

app/controllers/AnnualPlansController.php

@@ -129,7 +129,7 @@ class AnnualPlansController extends \BaseController
   }*/
   public function adminIndex()
   {
-  	Log::info("Entre".json_encode($this));
+    Log::info("Entre" . json_encode($this));
 
     $title = "Annual Plans";
     $programs = Program::get();
@@ -322,7 +322,7 @@ class AnnualPlansController extends \BaseController
 
       $typ_info['courses'][$objective->id] = DB::select("select c.id, c.number, c.name, c.code, typ.id typ_course_id from courses c, typ_semester_courses typ, (select course_id, id  from typ_semester_courses where typ_semester_objective_id in (select id from typ_semester_objectives where objective_id ={$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in(select id from typ_program where program_id ={$program_id})))) rel where typ.course_id =c.id and rel.course_id = c.id and typ.id = rel.id ", array(Input::get('id')));
 
-      $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where deleted_at IS NULL and id in (select criterion_id from criterion_objective_outcome join program_criterion_objective_outcome on program_criterion_objective_outcome.cri_obj_out_id = criterion_objective_outcome.id where outcome_id = ? and program_id {$program_id} and objective_id = {$objective->id})", array(Input::get('id')));
+      $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where deleted_at IS NULL and id in (select criterion_id from criterion_objective_outcome join program_criterion_objective_outcome on program_criterion_objective_outcome.cri_obj_out_id = criterion_objective_outcome.id where outcome_id = ? and program_id  = {$program_id} and objective_id = {$objective->id})", array(Input::get('id')));
       Log::info($typ_info['criteria'][$objective->id]);
       $typ_info['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id =? and semester_id ={$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id}))", array(Input::get('id')));
       Log::info($typ_info['typ_objective_id'][$objective->id]);
@@ -963,7 +963,7 @@ class AnnualPlansController extends \BaseController
   }
 
   //Print annual report
-  public function printAnnualReport($annual_id = null)
+  public function printAnnualReport($annual_id = null, $submit = null)
   {
 
 
@@ -981,7 +981,9 @@ class AnnualPlansController extends \BaseController
     $pdf->save(app_path() . '/storage/annual_pdfs/' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf');
     return $pdf->download(date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf');
     */ //pdf = $pdf->setOrientation("landscape");
-    return View::make('local.managers.shared.print_annual_report', compact('annualPlan'));
+    Log::info("submit");
+    Log::info($submit);
+    return View::make('local.managers.shared.print_annual_report', compact('annualPlan', 'submit'));
   }
 
   public function postAnnualReport($annual_id)
@@ -989,15 +991,16 @@ class AnnualPlansController extends \BaseController
 
     $annualPlan = AnnualPlan::findOrFail($annual_id);
     $user_id = Auth::user()->id;
-    $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
-    $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
-      ->setOrientation("landscape")
 
-      ->setPaper('legal', 'landscape');
-    $path = app_path() . '/storage/annual_pdfs/' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.pdf';
-    $pdf->save($path);
-    $name = date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
-    $pdf->download($name);
+    //$pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
+    //$pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
+    //  ->setOrientation("landscape")
+
+    //  ->setPaper('legal', 'landscape');
+    $path = app_path() . '/views/annual_htmls/report-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
+    //$pdf->save($path);
+    //$name = date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
+    //$pdf->download($name);
 
     //is a path already there
 
@@ -1072,6 +1075,50 @@ class AnnualPlansController extends \BaseController
     return View::make('local.managers.shared.new_view_annual_plans', compact('paths_with_users', 'title', 'report', 'last', 'annual_report_or_plan', 'program_id'));
   }
 
+  public function findHTML($type_of_annual, $path_id)
+  {
+    $path = DB::table('paths_for_annual_plans')->where('id', $path_id)->first();
+
+    if (isset($path)) {
+      Log::info($path->path_to_pdf);
+      Log::info(app_path()); //. "/views/annual_htmls/");
+
+
+      //FALTA COMO HACER PAl REPORT.
+      // Este problema esta bien algarete. So si le doy str_replace(app_path() . '/views/annual_htmls/'),
+      // si yo añado '/' al substring "htmls/" , me borra '/pla'. For no reason. 
+      // so el plan, no se. 
+      // 
+      //
+
+      //$path = str_replace(app_path() . '/views/annual_htmls/', '', $path->path_to_pdf);
+      //$path = trim($path->path_to_pdf, app_path() . '/views/annual_');
+      //$path = trim($path, "htmls");
+      //$path = trim($path, '/'); //. "/views/annual_htmls/");
+      //Log::info($path);
+
+      //aqui tambien pasa una loquera
+      $path = str_replace(app_path() . '/views/annual_htmls/', '', $path->path_to_pdf);
+
+
+
+
+
+      $path = trim($path, ".blade.php");
+      $dir =  '';
+
+      if ($type_of_annual == "plan") {
+        $dir = 'annual_htmls.pla';
+      } else {
+        $dir = "annual_htmls.";
+      }
+      return View::make($dir . $path);
+    }
+    Session::flash('status', 'warning');
+    Session::flash('message', 'Error loading Annual Plan. Please try again later.');
+    return Redirect::back();
+  }
+
   public function adminReportIndex()
   {
   }
@@ -1145,7 +1192,12 @@ class AnnualPlansController extends \BaseController
     */
     $error_array = [];
 
+    Log::info("Esto devuelve?");
+
+    Log::info($annual_plan->courses);
+
     foreach ($annual_plan->courses as $index => $course) {
+
       Log::info('paired Criteria');
       Log::info($course->paired_criteria);
       if (count($course->paired_criteria) <= 0) {
@@ -1238,32 +1290,32 @@ class AnnualPlansController extends \BaseController
   }
 
 
-  function printAnnualPlan($annual_id)
+  public function printAnnualPlan($annual_id, $submit = null)
   {
     $alphabet = range("A", "Z");
     $annualPlan = AnnualPlan::findOrFail($annual_id);
     $small_alphabet = range('a', 'z');
-    return View::make('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet'));
+    return View::make('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet', 'submit'));
   }
 
-  function submitAnnualPlan($annual_id)
+  public function submitAnnualPlan($annual_id)
   {
     $alphabet = range("A", "Z");
     $small_alphabet = range('a', 'z');
     $annualPlan = AnnualPlan::findOrFail($annual_id);
     $user_id = Auth::user()->id;
-    $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
-    $pdf = $pdf->loadView('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet'))
-      ->setOrientation("landscape")
+    //$pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/plan_pdf');
+    //$pdf = $pdf->loadView('local.managers.shared.print_annual_plan', compact('annualPlan', 'alphabet', 'small_alphabet'))
+    //  ->setOrientation("landscape")
 
-      ->setPaper('legal', 'landscape');
-    $path = app_path() . '/storage/annual_pdfs/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.pdf';
-    $pdf->save($path);
-    $name = "plan-on-" . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.pdf';
-    $pdf->download($name);
+    //  ->setPaper('legal', 'landscape');
+    $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . $user_id . '.blade.php';
+    //$pdf->save($path);
+    $name = "plan-on-" . date('d-m-Y') . '-for-' . $annualPlan->program->id . '.blade.php';
+    //$pdf->download($name);
 
     //is a path already there
-
+    $submit = 1;
     $it_exists = DB::table("paths_for_annual_plans")
       ->where('path_to_pdf', $path)
       ->first();

app/controllers/ThreeYearPlanController.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Barryvdh\DomPDF\PDF as PDF;
+use Illuminate\Support\Facades\View;
 
 class ThreeYearPlanController extends \BaseController
 {
@@ -41,9 +42,9 @@ class ThreeYearPlanController extends \BaseController
       return Redirect::to("three-years-plan/{$program_id}");
     }
   }
-    public function adminIndex()
+  public function adminIndex()
   {
-  	Log::info("Entre".json_encode($this));
+    Log::info("Entre" . json_encode($this));
 
     $title = "Three Years Plans";
     $programs = Program::get();
@@ -51,18 +52,33 @@ class ThreeYearPlanController extends \BaseController
     return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
   }
 
-    public function manageSemesterCycle()
+  public function manageSemesterCycle()
   {
-//   	Log::info("Entre".json_encode($this));
+    //   	Log::info("Entre".json_encode($this));
 
     $title = "Semesters Cycles";
-//     $programs = Program::get();
+    //     $programs = Program::get();
 
-		return $this->adminIndex();
-//     return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
+    return $this->adminIndex();
+    //     return View::make('local.managers.admins.show-typ-program', compact('title', 'programs'));
   }
 
+  //busca los links de public y los loadea
+  public function findHTML($path_id)
+  {
+
+    $path = DB::table('paths_for_three_year_plans')->where('id', $path_id)->first();
 
+    if (isset($path)) {
+
+      $path = trim($path->path_to_pdf, app_path() . "/views/three_year_plan_htmls/");
+      $path = trim($path, ".blade.php");
+      return View::make("three_year_plan_htmls." . $path);
+    }
+    Session::flash('status', 'warning');
+    Session::flash('message', 'Error loading typ. Please try again later.');
+    return Redirect::back();
+  }
   // load the Three year Plan page
   public function threeYearsReport($program_id)
   {
@@ -601,8 +617,8 @@ class ThreeYearPlanController extends \BaseController
     $count = 0;
     $yearStartPlusOne = $current_typ->year_start + 1;
     $yearStart = $current_typ->year_start;
-    Log::info($yearStart);
-    Log::info($yearStartPlusOne);
+    //Log::info($yearStart);
+    //Log::info($yearStartPlusOne);
     while ($count < 3) {
 
 
@@ -635,6 +651,7 @@ class ThreeYearPlanController extends \BaseController
 
   public function  createThreeYearPlanPdf($program_id, $typ)
   {
+
     $program = DB::table('programs')->where('id', $program_id)->first();
     $three_year_plan = DB::table('three_year_plan')->where('id', $typ)->first();
 
@@ -642,12 +659,15 @@ class ThreeYearPlanController extends \BaseController
       ->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();
 
+    //Log::info("Stop 2");
+
 
     foreach ($typ_semesters as $semester) {
       $typ_semester_outcome[$semester->semester_id] = DB::table('typ_semester_outcome')
@@ -674,26 +694,43 @@ class ThreeYearPlanController extends \BaseController
       }
     }
 
-    $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/three_year_plan_pdfs');
-    $pdf = $pdf->loadView('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'))
-      ->setOrientation("landscape")
+    //html para salvar
+
+    $submit = 1;
+    $view = 0;
+
+
+    //$pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/three_year_plan_pdfs');
 
-      ->setPaper('legal', 'landscape');
-    $path = app_path() . '/storage/three_year_plan_pdfs/' . date('d-m-Y') . '-for-' . $program->id . '-by-' . Auth::user()->id . '.pdf';
-    $pdf->save($path);
-    $name = date('d-m-Y') . '-for-' . $program->id . '.pdf';
-    $pdf->download($name);
 
-    //is a path already there
+    //$pdf = $pdf->loadView('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome'))
+    //  ->setOrientation("landscape")
+
+    // ->setPaper('legal', 'landscape');
+
+
+    $path = app_path() . '/views/three_year_plan_htmls/' . date('d-m-Y') . '-for-' . $program->id . '-by-' . Auth::user()->id . '.blade.php';
+
+
+
+    $name = date('d-m-Y') . '-for-' . $program->id . '-by-' . Auth::user()->id . '.blade.php';
+
+
+
+    //is a path already there, if it is, leave the same path
 
     $it_exists = DB::table("paths_for_three_year_plans")
       ->where('path_to_pdf', $path)
       ->first();
+    //Log::info("pero aqui?");
 
     if (isset($it_exists)) {
-      return '200';
+      return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome', 'view', 'app_path', 'submit'));
     }
-    //$user_id = Auth::user()->id;
+
+    //else save the new path and update time
+
+
     DB::table("paths_for_three_year_plans")
       ->where('typ_program_id', $typ_program_id)
       ->where('user_id', Auth::user()->id)
@@ -702,6 +739,7 @@ class ThreeYearPlanController extends \BaseController
         'last' => 0
       ));
 
+
     DB::table('paths_for_three_year_plans')->insert(array(
       "path_to_pdf" => $path,
       'typ_program_id' => $typ_program_id,
@@ -709,9 +747,10 @@ class ThreeYearPlanController extends \BaseController
       'user_id' => Auth::user()->id,
       'date_posted' => date('Y-m-d')
     ));
+    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome', 'view', 'app_path', 'submit'));
   }
 
-  public function printPlan($program_id, $typ)
+  public function printPlan($program_id, $typ, $submit = NULL)
   {
     $view = 0;
 
@@ -756,7 +795,11 @@ 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', 'view'));
+    //TEMP
+
+    //$app_path = app_path() . '/jsPDF-master/src/jspdf.js';
+    //$submit = 1;
+    return View::make('global.print_three_year_plan', compact('typ_semesters', 'program', 'three_year_plan', 'typ_semesters', 'typ_semester_outcome', 'view', 'app_path', 'submit'));
   }
 
   public function viewPlan($program_id, $typ)
@@ -841,7 +884,7 @@ class ThreeYearPlanController extends \BaseController
     return View::make('local.managers.shared.new_view_three_year_plans', compact('paths_with_users', 'title', 'last', 'program_id'));
   }
 
-  public function downloadPDF($download, $path_id)
+  /*public function downloadPDF($download, $path_id)
   {
     $pdf = new PDF(app('config'), app("Filesystem"), app('view'), '/storage/three_year_plan_pdfs');
 
@@ -907,4 +950,5 @@ class ThreeYearPlanController extends \BaseController
     else
       return $pdf->stream(basename($queryToPath->path_to_pdf));
   }
+  */
 }

app/models/AnnualPlan.php

@@ -23,7 +23,7 @@ class AnnualPlan extends \Eloquent
 
 	public function getCoursesAttribute()
 	{
-
+		/*
 		$sql = Course::join('typ_semester_courses', 'typ_semester_courses.course_id', '=', 'courses.id')
 			->join('typ_semester_objectives', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
 			->join("typ_semester_outcome", 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
@@ -32,14 +32,16 @@ class AnnualPlan extends \Eloquent
 					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
 			})
 			->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
-			->join('typ_program', 'typ_program.program_id','=','annual_plans.program_id')
-			->where('typ_program.id','=','typ_semester_outcome.typ_program_id')
+			->join('typ_program', 'typ_program.program_id', '=', 'annual_plans.program_id')
+			->where('typ_program.id', '=', 'typ_semester_outcome.typ_program_id')
 			->where('annual_plans.program_id', $this->program_id)
 			->where('annual_plans.id', $this->id)
 			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id')
 			->toSql();
 		Log::info($sql);
 		Log::info("Aqui sql");
+
+		*/
 		return Course::join('typ_semester_courses', 'typ_semester_courses.course_id', '=', 'courses.id')
 			->join('typ_semester_objectives', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
 			->join("typ_semester_outcome", 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
@@ -48,8 +50,12 @@ class AnnualPlan extends \Eloquent
 					->orOn('typ_semester_outcome.semester_id', '=', 'annual_cycle.semester_end');
 			})
 			->join('annual_plans', 'annual_plans.annual_cycle_id', '=', 'annual_cycle.id')
-			->join('typ_program', 'typ_program.program_id','=','annual_plans.program_id')
-			->where('typ_program.id','=','typ_semester_outcome.typ_program_id')
+			->join('typ_program', function ($join) {
+
+				$join->on('typ_program.program_id', '=', 'annual_plans.program_id')
+					->on('typ_program.id', '=', 'typ_semester_outcome.typ_program_id');
+			})
+
 			->where('annual_plans.program_id', $this->program_id)
 			->where('annual_plans.id', $this->id)
 			->select('courses.*', 'typ_semester_courses.id as typ_semester_course_id', 'annual_plans.program_id', 'typ_semester_outcome.semester_id as semester_id')
@@ -105,7 +111,7 @@ class AnnualPlan extends \Eloquent
 			->join('typ_semester_objectives', 'typ_semester_objectives.typ_semester_outcome_id', '=', 'typ_semester_outcome.id')
 			->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
 			->where('annual_plans.id', $this->id)
-			->groupBy('outcomes.id')
+			->groupBy('outcomes.id', 'semester_id')
 			->orderBy('typ_semester_outcome.semester_id')
 			->select(
 				'outcomes.*',

app/models/Outcome.php

@@ -19,10 +19,10 @@ class Outcome extends Eloquent
 				->where('program_id', $this->program_id)
 				->where('semester_id', $this->semester_id)
 				->first();
-			Log::info("PApi que hayy chabau");
-			Log::info(array($expected_target));
+			//Log::info("PApi que hayy chabau");
+			//Log::info(array($expected_target));
 			if ($expected_target != null) {
-				Log::info("PApi no chabau");
+				//Log::info("PApi no chabau");
 				return $expected_target->expected_target;
 			} else return "Go to Annual Plan and define a target for learning outcome";
 		}

app/routes.php

@@ -183,7 +183,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
 
     Route::post('postAnnualReport/{annual_id?}', 'AnnualPlansController@postAnnualReport');
-    Route::get('printAnnualPlan/{annual_plan?}', 'AnnualPlansController@printAnnualPlan');
+    Route::get('printAnnualPlan/{annual_plan?}/{submit?}', 'AnnualPlansController@printAnnualPlan');
     Route::post('checkIfPlanReady', 'AnnualPlansController@checkIfPlanReady');
 
     Route::post('submitAnnualPlan/{annual_id?}', 'AnnualPlansController@submitAnnualPlan');
@@ -191,7 +191,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
 
     Route::post("checkIfReady", 'AnnualPlansController@checkIfReady');
 
-    Route::get("printAnnualReport/{annual_plan?}", 'AnnualPlansController@printAnnualReport');
+    Route::get("printAnnualReport/{annual_plan?}/{submit?}", 'AnnualPlansController@printAnnualReport');
     Route::post('fetchObjectiveInfo', array(
         'as' => 'fetchObjectiveInfo',
         'uses' => 'AnnualPlansController@fetchObjectiveInfo'
@@ -232,12 +232,13 @@ Route::group(array('before' => 'auth|has_access'), function () {
     //View Three year plan
 
     Route::get('three-year-plan/show/{program_id}', "ThreeYearPlanController@showPDFs");
-    Route::get("downloadThreeYearPlanPDF/{download}/{path_id}", "ThreeYearPlanController@downloadPDF");
+    Route::get("downloadThreeYearPlanPDF/{path_id}", "ThreeYearPlanController@showHTML");
+    Route::get("findHTMLlinksTYP/{path_id}", 'ThreeYearPlanController@findHTML');
 
     //View annual plans and report
 
     Route::get('{annual_report_or_plan}/show/{program_id}', "AnnualPlansController@annualPlansShow");
-    Route::get("downloadAnnualPDF/{download}/{path_id}", "AnnualPlansController@downloadPDF");
+    Route::get("findHTMLlinksAP/{type_of_annual}/{path_id}", "AnnualPlansController@findHTML");
 
     //Route::post('submitAnnualPlan', array('uses' => 'AnnualPlansController@submitAnnualPlan'));
 
@@ -260,8 +261,8 @@ Route::group(array('before' => 'auth|has_access'), function () {
         'as' => 'createThreeYearCycle',
         'uses' => 'ThreeYearPlanController@create'
     ));
-    Route::get('printThreeYear/{program_id}/{typ}', array(
-        'as' => 'printThreeYear/{program_id}/{typ}',
+    Route::get('printThreeYear/{program_id}/{typ}/{submit?}', array(
+        'as' => 'printThreeYear/{program_id}/{typ}/{submit?}',
         'uses' => 'ThreeYearPlanController@printPlan'
     ));
     Route::get('viewThreeYear/{program_id}/{typ}', array(
@@ -355,10 +356,10 @@ Route::group(array('before' => 'auth|has_access'), function () {
         array('only' => array('create'))
     );
 
- 	Route::get('agreement', 'AgreementController@index');
+    Route::get('agreement', 'AgreementController@index');
     Route::post('agreement/agree', array('before' => 'csrf', 'uses' => 'AgreementController@agree'));
 
-   // Show users all learning outcomes and criteria
+    // Show users all learning outcomes and criteria
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
     // Show users all objectives and criteria

app/storage/three_year_plan_pdfs/03-10-2022-for-999-by-5478.html

@@ -0,0 +1,506 @@
+<html><head></head><body id="theDocument"><style type="text/css">
+    body
+    {
+        font-family: "Arial", sans-serif;
+        width:90%;
+        margin: 0 auto;
+    }
+    .header-text
+    {
+        text-align:center;
+        font-weight: bold;
+        margin:0;
+    }
+
+    h1.header-text
+    {
+      margin: 15px auto;
+      width:75%;
+      font-size: 25px;
+    }
+
+    table
+    {
+        border-collapse: collapse;
+        border: 1px solid black;
+        width: 100%;
+        margin: 30px auto;
+        font-size:1.5vw;
+    }
+    td, th
+    {
+        border: 1px solid black;
+        padding: 5px;
+    }
+
+    .activity-name-row
+    {
+      background:black;
+      color:white;
+    }
+
+    .activity-headers-row
+    {
+      background:lightgrey;
+      font-weight:bold;
+    }
+
+    .report-info
+    {
+      margin:5px 0;
+      font-size: 16px;
+    }
+
+    .criterion-field
+    {
+      text-align:left;
+    }
+
+    .score-field, .total, .percentage
+    {
+      text-align:center;
+    }
+
+    .header
+    {
+      margin: 30px 0;
+    }
+
+    .content
+    {
+      font-size: 12px;
+    }
+
+    .logo
+    {
+      position:absolute;
+      right:0;
+      top: 30px;
+      width: 100px;
+    }
+
+    ol{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+</style><style type="text/css" media="print">
+	  @page { size: landscape; }
+	</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
+
+<div class="header">
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
+    <p class="header-text">Online Learning Assessment System</p>
+
+    <h1 class="header-text">Three Year Plan for Unassigned from 2019 to
+        2022</h1>
+</div>
+
+
+
+    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2019-2020</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Redactar enunciados aplicando teorías del aprendizaje
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ADMI6590] FUNDAMENTOS EMPRENDERISMO </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2019-2020</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Redactar enunciados aplicando teorías del aprendizaje
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ADPU6195] FUENTES EXTERNAS DE FINANC</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INCO4102] COM DE CRISIS </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>First Semester 2020-2021</h2>
+    <br>
+                  <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Esto es un objetivo 1 para prueba 1
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ANAT8528] NEUROFISIOLOGIA</li>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3046] LAB PRINC DE TELEVISION   </li>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2020-2021</h2>
+    <br>
+                  <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ESSI3121] LENG ESPA SEG IDIO:BASI I </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3046] LAB PRINC DE TELEVISION   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2021-2022</h2>
+    <br>
+                  <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIFI4074] CIENC MAT EN ARTE </li>
+                                                                    <li>[CIFI3074] LABORATORIO </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIFI3074] MAT EN ARTE Y CONSERVACION</li>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Esto es un objetivo 1 para prueba 1
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3043] PRINCIPIOS DE TELEVISION  </li>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2021-2022</h2>
+    <br>
+                  <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                            <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                
+
+</body></html>
+
+

app/views/annual_htmls/plan-on-04-10-2022-for-999-by-5478.blade.php

@@ -0,0 +1,442 @@
+<html><body><style type="text/css">
+    body
+    {
+        font-family: "Arial", sans-serif;
+        width:90%;
+        margin: 0 auto;
+    }
+    .header-text
+    {
+        text-align:center;
+        font-weight: bold;
+        margin:0;
+    }
+    .outcome-text
+    {
+        text-align:left;
+        font-weight: bold;
+        margin:0;
+    }
+    h1.header-text
+    {
+      margin: 15px auto;
+      width:75%;
+      font-size: 25px;
+    }
+
+    table
+    {
+        border-collapse: collapse;
+        border: 1px solid black;
+        width: 100%;
+        margin: 30px auto;
+        font-size:1.5vw;
+    }
+    td, th
+    {
+        border: 1px solid black;
+        padding: 5px;
+    }
+
+    .activity-name-row
+    {
+      background:black;
+      color:white;
+    }
+
+    .activity-headers-row
+    {
+      background:lightgrey;
+      font-weight:bold;
+    }
+
+    .report-info
+    {
+      margin:5px 0;
+      font-size: 16px;
+    }
+
+    .criterion-field
+    {
+      text-align:left;
+    }
+
+    .score-field, .total, .percentage
+    {
+      text-align:center;
+    }
+
+    .header
+    {
+      margin: 30px 0;
+    }
+
+    .content
+    {
+      font-size: 12px;
+    }
+
+    .logo
+    {
+      position:absolute;
+      right:0;
+      top: 30px;
+      width: 100px;
+    }
+
+    ul{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+
+    .outcome-header{
+        text-align:left
+    }
+    hr{
+        border-block-color: black
+    }
+
+    .course-title {
+      text-align:center;
+      font-weight:bold;
+    }
+</style><style type="text/css" media="print">
+  @page { size: landscape; }
+</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
+
+<div class="header">
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
+    <p class="header-text">Online Learning Assessment System</p>
+    <p class="header-text">Unassigned Program Report</p>
+
+    <h1 class="header-text">Academic Year 2019-2020 </h1>
+</div>
+
+    <h1 class="outcome-header">Content Knowledge, Skills or Dispositions in the academic program learning outcomes <sub>(Semester
+            B91)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Redactar enunciados aplicando teorías del aprendizaje
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>ADMI-6590</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Identificación de la información más importante
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        
+            <h2>Program Transformative Actions</h2>
+            <hr>
+
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Transformative Action</th>
+                        <th>Category</th>
+
+
+                    </tr>
+                </thead>
+                <tbody>
+                                            <tr>
+                            <td>1.</td>
+                            <td>
+                                <strong>Si pa: </strong>Si le metemos entonces full
+
+
+                            </td>
+                            <td>
+                                Cosa guapa
+                            </td>
+
+
+
+
+                        </tr>
+                                            <tr>
+                            <td>2.</td>
+                            <td>
+                                <strong>[09g][ugv: </strong>pi;hyv[ougbo[b[biujb[kjb
+
+
+
+                            </td>
+                            <td>
+                                Cosa guapa
+                            </td>
+
+
+
+
+                        </tr>
+                    
+                </tbody>
+            </table>
+            <hr>
+        
+        <h1 class="outcome-header">Content Knowledge, Skills or Dispositions in the academic program learning outcomes <sub>(Semester
+            B92)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Redactar enunciados aplicando teorías del aprendizaje
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>ADPU-6195</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Organización de la información
+                                            </li>
+                                                                                    <li>
+                                                Identificación de la información más importante
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        
+            <h2>Program Transformative Actions</h2>
+            <hr>
+
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Transformative Action</th>
+                        <th>Category</th>
+
+
+                    </tr>
+                </thead>
+                <tbody>
+                                            <tr>
+                            <td>1.</td>
+                            <td>
+                                <strong>gabriel: </strong>sukdfhsdf
+
+
+                            </td>
+                            <td>
+                                Acción transformadora para Debugging
+                            </td>
+
+
+
+
+                        </tr>
+                    
+                </tbody>
+            </table>
+            <hr>
+        
+        <h1 class="outcome-header">Information Literacy <sub>(Semester
+            B92)</sub></h1>
+    <hr>
+    <p class="outcome-text">Target to achieve the learning outcome: 66.66 or more of
+        the
+        attempts</p>
+    <p class="outcome-text">Expected percent of students achieving the target by learning outcome:
+        70.00%
+
+        <hr>
+    <table class="table table-striped table-condensed">
+        <thead>
+            <tr>
+                <th>
+                    Objectives for Courses
+                </th>
+
+                <th>
+                    Courses and Criteria
+                </th>
+                <th>
+                    Transformative Actions to be Implemented
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+                            <tr>
+                    <td>
+                        
+                        A. Vamos a ver que pasaahora
+                    </td>
+                    <td>
+                        <ol type="1">
+
+
+                                                            <li>
+                                    <p>INCO-4102</p>
+
+                                    <ol type="a">
+                                                                                    <li>
+                                                Contenido (relación con el tema de investigación)
+                                            </li>
+                                                                                    <li>
+                                                Organización
+                                            </li>
+                                                                                    <li>
+                                                Organización de la información
+                                            </li>
+                                                                            </ol>
+
+                                    
+
+                                </li>
+                                                    </ol>
+                    </td>
+                    <td>
+                        <ol type="1">
+                                                                                                                </ol>
+
+
+                    </td>
+
+
+                </tr>
+            
+        </tbody>
+
+    </table>
+
+        
+            <h2>Program Transformative Actions</h2>
+            <hr>
+
+            <table class="table table-striped table-condensed">
+                <thead>
+                    <tr>
+                        <th></th>
+                        <th>Transformative Action</th>
+                        <th>Category</th>
+
+
+                    </tr>
+                </thead>
+                <tbody>
+                                            <tr>
+                            <td>1.</td>
+                            <td>
+                                <strong>anda pal carajo: </strong>qo9uhwouwhfoushddf
+
+
+
+                            </td>
+                            <td>
+                                Unas cabras nuevas de maya??
+                            </td>
+
+
+
+
+                        </tr>
+                    
+                </tbody>
+            </table>
+            <hr>
+        
+    
+
+</body></html>
+<script type="text/javascript">
+
+
+</script>

app/views/global/print_three_year_plan.blade.php

@@ -1,7 +1,16 @@
+
+
 <?php
 
+
+if(isset($submit)){
+  ob_start();
+}
 echo '<html>';
-echo '<body>';
+echo '<head>';
+
+echo '</head>';
+echo '<body id="theDocument">';
 
 //Inline styles (only for printing)
 echo '<style type="text/css">
@@ -85,7 +94,7 @@ echo '<style type="text/css">
       width: 100px;
     }
 
-    ul{
+    ol{
       list-style-type:none;
     }
 
@@ -115,6 +124,7 @@ echo '<style type="text/css" media="print">
     <h2 class='header-text'>{{ $semester->name }}</h2>
     <br>
     @foreach ($typ_semester_outcome[$semester->semester_id] as $outcome)
+      @if(count($outcome->objectives))
         <span>
             <h3>{{ $outcome->name }}</h3>
         </span>
@@ -141,6 +151,7 @@ echo '<style type="text/css" media="print">
                                     <li>[{{ $course->code }}{{ $course->number }}] {{ $course->name }}</li>
                                 @endforeach
                             </ol>
+                        </td>
 
                     </tr>
                 @endforeach
@@ -149,19 +160,43 @@ echo '<style type="text/css" media="print">
         </table>
         <br>
         <br>
-    @endforeach
-@endforeach
+        @endif
+        @endforeach
+@endforeach 
 
-<?php
 
-echo '</body>';
-echo '</html>';
+</body></html>
 
-?>
 
-<script type="text/javascript">
+<script>
+
+  @if($view==0 && !isset($submit))
     window.print();
-</script>
-<?php
 
-?>
+  @elseif(isset($submit))
+
+    window.close();
+  @endif
+
+
+
+  </script>
+
+
+@if(isset($submit))
+<?php 
+
+  $path = app_path() . '/views/three_year_plan_htmls/' . date('d-m-Y') . '-for-' . $program->id . '-by-' . Auth::user()->id . '.blade.php';
+  $ob = ob_get_contents();
+  $ob = str_replace("window.close();", '', $ob);
+  file_put_contents($path, $ob);
+  ob_end_flush();
+
+  //return Redirect::action('AnnualPlansController@showPlan', array($program->id));
+
+  ?>
+
+  @endif
+
+
+

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

@@ -404,13 +404,16 @@
             // --------------------------------------------------------------------------
 
             $('.go-to-temp').on('click', function() {
+                typ_id =$('#table-cycles').data('typ-id');
                 $.post(
                     "{{ URL::action('ThreeYearPlanController@createAnnualPlan', [$program_id]) }}", {
-                        typ_id: $('#table-cycles').data('typ-id')
+                        typ_id: typ_id
                     },
                     function() {
-                        window.location.href =
-                            "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
+                        
+                        window.open("{{ URL::action('ThreeYearPlanController@printPlan', [$program_id]) }}"+"/"+typ_id+"/1", '_blank');
+                        window.location.href = "{{ URL::action('AnnualPlansController@showPlan', [$program_id]) }}";
+                            
 
                     });
             });

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

@@ -1544,6 +1544,10 @@
                             '<strong>The Annual Plan was submitted. You can check it out in View Annual Plans or Print Plan </strong>'
                         )
                         alert.appendTo($("#alert-for-save"));
+
+                        //open new window to save html
+
+                        window.open("{{URL::action('AnnualPlansController@printAnnualPlan')}}/"+annual_id+'/1', "_blank");
                     }
 
 

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

@@ -1807,6 +1807,8 @@
                         alert.appendTo($("#alert-for-save"));
                     }
 
+                    window.open("{{URL::action('AnnualPlansController@printAnnualReport')}}/"+annual_id+'/1', "_blank");
+
 
 
                 });

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

@@ -33,7 +33,7 @@
                             <th>User who submitted</th>
                             <th>Date Submitted </th>
                             <th>New Version</th>
-                            <th>Download</th>
+                          
 
                         </tr>
                     </thead>
@@ -42,8 +42,8 @@
                             <tr>
                                 <td> {{ $info->academic_year }}</td>
                                 <td> <a
-                                        href="{{ URL::action('AnnualPlansController@downloadPDF', ['print', $info->path_id]) }}">
-                                        {{ basename($info->path_to_pdf) }}
+                                        href="{{ URL::action('AnnualPlansController@findHTML', [ $annual_report_or_plan,$info->path_id]) }}">
+                                        {{ str_replace('.blade.php','',basename($info->path_to_pdf))}}
                                         <span class="glyphicon glyphicon-eye-open"></span>
 
                                 </td>
@@ -56,13 +56,7 @@
                                         <span class="glyphicon glyphicon-ok"></span>
                                     @endif
                                 </td>
-                                <td>
-                                    <a type="button" class="btn btn-primary"
-                                        href="{{ URL::action('AnnualPlansController@downloadPDF', ['download', $info->path_id]) }}">
-                                        Download
-                                        <span class="glyphicon glyphicon-download-alt"></span>
-                                    </a>
-                                </td>
+
 
                             </tr>
                         @endforeach

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

@@ -33,7 +33,7 @@
                             <th>User who submitted</th>
                             <th>Date Submitted </th>
                             <th>New Version</th>
-                            <th>Download</th>
+                           
 
                         </tr>
                     </thead>
@@ -42,8 +42,8 @@
                             <tr>
                                 <td> {{ $info->year_start }} - {{ $info->year_end }}</td>
                                 <td> <a
-                                        href="{{ URL::action('ThreeYearPlanController@downloadPDF', ['print', $info->path_id]) }}">
-                                        {{ basename($info->path_to_pdf) }}
+                                        href="{{ URL::action('ThreeYearPlanController@findHTML', [$info->path_id]) }}">
+                                        {{ str_replace(".blade.php","",basename($info->path_to_pdf)) }}
                                         <span class="glyphicon glyphicon-eye-open"></span>
 
                                 </td>
@@ -56,13 +56,7 @@
                                         <span class="glyphicon glyphicon-ok"></span>
                                     @endif
                                 </td>
-                                <td>
-                                    <a type="button" class="btn btn-primary"
-                                        href="{{ URL::action('ThreeYearPlanController@downloadPDF', ['download', $info->path_id]) }}">
-                                        Download
-                                        <span class="glyphicon glyphicon-download-alt"></span>
-                                    </a>
-                                </td>
+
 
                             </tr>
                         @endforeach

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

@@ -154,9 +154,9 @@ echo '<style type="text/css" media="print">
             @foreach ($outcome->annual_objectives as $index => $objective)
                 <tr>
                     <td>
+                        
                         {{ $alphabet[$index] }}. {{ $objective->text }}
                     </td>
-
                     <td>
                         <ol type="1">
 
@@ -219,7 +219,7 @@ echo '<style type="text/css" media="print">
     </table>
 
     @if (count($outcome->program_transformative_actions) > 0)
-        <li>
+    
             <h2>Program Transformative Actions</h2>
             <hr>
 
@@ -255,7 +255,7 @@ echo '<style type="text/css" media="print">
                 </tbody>
             </table>
             <hr>
-        </li>
+        
     @endif
 @endforeach
 
@@ -290,5 +290,23 @@ echo '</html>';
 ?>
 
 <script type="text/javascript">
+
+@if(!isset($submit))
+
     window.print();
 </script>
+@else
+window.close();
+</script>
+<?php 
+
+  $path = app_path() . '/views/annual_htmls/plan-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . Auth::user()->id . '.blade.php';
+  $ob = ob_get_contents();
+  $ob = str_replace("window.close();", '', $ob);
+  file_put_contents($path, $ob);
+  ob_end_flush();
+
+  
+  ?>
+@endif
+

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

@@ -483,5 +483,23 @@ echo '</html>';
 ?>
 
 <script type="text/javascript">
+
+
+@if(!isset($submit))
+
     window.print();
 </script>
+@else
+window.close();
+</script>
+<?php 
+
+  $path = app_path() . '/views/annual_htmls/report-on-' . date('d-m-Y') . '-for-' . $annualPlan->program->id . '-by-' . Auth::user()->id . '.blade.php';
+  $ob = ob_get_contents();
+  $ob = str_replace("window.close();", '', $ob);
+  file_put_contents($path, $ob);
+  ob_end_flush();
+
+  
+  ?>
+@endif

app/views/three_year_plan_htmls/04-10-2022-for-999-by-5478.blade.php

@@ -0,0 +1,517 @@
+<html><head></head><body id="theDocument"><style type="text/css">
+    body
+    {
+        font-family: "Arial", sans-serif;
+        width:90%;
+        margin: 0 auto;
+    }
+    .header-text
+    {
+        text-align:center;
+        font-weight: bold;
+        margin:0;
+    }
+
+    h1.header-text
+    {
+      margin: 15px auto;
+      width:75%;
+      font-size: 25px;
+    }
+
+    table
+    {
+        border-collapse: collapse;
+        border: 1px solid black;
+        width: 100%;
+        margin: 30px auto;
+        font-size:1.5vw;
+    }
+    td, th
+    {
+        border: 1px solid black;
+        padding: 5px;
+    }
+
+    .activity-name-row
+    {
+      background:black;
+      color:white;
+    }
+
+    .activity-headers-row
+    {
+      background:lightgrey;
+      font-weight:bold;
+    }
+
+    .report-info
+    {
+      margin:5px 0;
+      font-size: 16px;
+    }
+
+    .criterion-field
+    {
+      text-align:left;
+    }
+
+    .score-field, .total, .percentage
+    {
+      text-align:center;
+    }
+
+    .header
+    {
+      margin: 30px 0;
+    }
+
+    .content
+    {
+      font-size: 12px;
+    }
+
+    .logo
+    {
+      position:absolute;
+      right:0;
+      top: 30px;
+      width: 100px;
+    }
+
+    ol{
+      list-style-type:none;
+    }
+
+    @media print{@page {size: landscape}}
+</style><style type="text/css" media="print">
+	  @page { size: landscape; }
+	</style><img class="logo" src="http://localhost:8000/images/logo_uprrp_bw.png" alt="UPRRP Logo">
+
+<div class="header">
+    <p class="header-text">University of Puerto Rico, Río Piedras Campus</p>
+    <p class="header-text">Online Learning Assessment System</p>
+
+    <h1 class="header-text">Three Year Plan for Unassigned from 2019 to
+        2022</h1>
+</div>
+
+
+
+    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2019-2020</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Redactar enunciados aplicando teorías del aprendizaje
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ADMI6590] FUNDAMENTOS EMPRENDERISMO </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2019-2020</h2>
+    <br>
+                  <span>
+            <h3>Content Knowledge, Skills or Dispositions in the academic program learning outcomes</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Redactar enunciados aplicando teorías del aprendizaje
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ADPU6195] FUENTES EXTERNAS DE FINANC</li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INCO4102] COM DE CRISIS </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>First Semester 2020-2021</h2>
+    <br>
+                  <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Esto es un objetivo 1 para prueba 1
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ANAT8528] NEUROFISIOLOGIA</li>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3046] LAB PRINC DE TELEVISION   </li>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                  <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2020-2021</h2>
+    <br>
+                  <span>
+            <h3>Information Literacy</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[ESSI3121] LENG ESPA SEG IDIO:BASI I </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Effective Communication Skills</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3046] LAB PRINC DE TELEVISION   </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>First Semester 2021-2022</h2>
+    <br>
+                  <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIFI4074] CIENC MAT EN ARTE </li>
+                                                                    <li>[CIFI3074] LABORATORIO </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[CIFI3074] MAT EN ARTE Y CONSERVACION</li>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                              <span>
+            <h3>Critical Thinking</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Esto es un objetivo 1 para prueba 1
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[COMU3043] PRINCIPIOS DE TELEVISION  </li>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                    <br>
+    <br>
+    <h2 class='header-text'>Second Semester 2021-2022</h2>
+    <br>
+                  <span>
+            <h3>Research and Creation</h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. Vamos a ver que pasaahora
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[EDUC6140] EXPER PUERTO BILIN,BICUL </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                                            <span>
+            <h3>Logical-mathematical reasoning </h3>
+        </span>
+        <table class="table table-striped table-condensed" style="table-layout: fixed">
+            <thead>
+                <tr>
+
+                    <th>Objectives</th>
+                    <th>Courses</th>
+
+                </tr>
+            </thead>
+            <tbody>
+
+                                    <tr>
+
+                        <td>
+                            1. La habilidad de comunicar lo que desarrolló e investigó.
+                        </td>
+                        <td>
+                            <ol>
+                                                                    <li>[INSI3001] COMUNIC BASICA EN INGL I  </li>
+                                                            </ol>
+                        </td>
+
+                    </tr>
+                
+            </tbody>
+        </table>
+        <br>
+        <br>
+                 
+
+
+</body></html>
+
+
+<script>
+
+  
+    
+  
+
+
+  </script>
+
+

vendor/dompdf/dompdf/include/cellmap.cls.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package dompdf
  * @link    http://dompdf.github.com/
@@ -15,7 +16,8 @@
  * @access private
  * @package dompdf
  */
-class Cellmap {
+class Cellmap
+{
 
   /**
    * Border style weight lookup for collapsed border resolution.
@@ -33,7 +35,7 @@ class Cellmap {
     "double" => 8,
     "hidden" => 9,
     "none"   => 0,
-   );
+  );
 
   /**
    * The table object this cellmap is attached to.
@@ -104,14 +106,14 @@ class Cellmap {
    * @var int
    */
   private $__row;
-  
+
   /**
    * Tells wether the columns' width can be modified
    *
    * @var bool
    */
   private $_columns_locked = false;
-  
+
   /**
    * Tells wether the table has table-layout:fixed
    *
@@ -121,27 +123,30 @@ class Cellmap {
 
   //........................................................................
 
-  function __construct(Table_Frame_Decorator $table) {
+  function __construct(Table_Frame_Decorator $table)
+  {
     $this->_table = $table;
     $this->reset();
   }
-  
-  function __destruct() {
+
+  function __destruct()
+  {
     clear_object($this);
   }
   //........................................................................
 
-  function reset() {
+  function reset()
+  {
     $this->_num_rows = 0;
     $this->_num_cols = 0;
 
     $this->_cells  = array();
     $this->_frames = array();
 
-    if ( !$this->_columns_locked ) {
+    if (!$this->_columns_locked) {
       $this->_columns = array();
     }
-    
+
     $this->_rows = array();
 
     $this->_borders = array();
@@ -151,35 +156,48 @@ class Cellmap {
 
   //........................................................................
 
-  function lock_columns() { 
-    $this->_columns_locked = true; 
+  function lock_columns()
+  {
+    $this->_columns_locked = true;
   }
 
-  function is_columns_locked() {
+  function is_columns_locked()
+  {
     return $this->_columns_locked;
   }
-  
-  function set_layout_fixed($fixed) { 
-    $this->_fixed_layout = $fixed; 
+
+  function set_layout_fixed($fixed)
+  {
+    $this->_fixed_layout = $fixed;
   }
 
-  function is_layout_fixed() {
+  function is_layout_fixed()
+  {
     return $this->_fixed_layout;
   }
-  
-  function get_num_rows() { return $this->_num_rows; }
-  function get_num_cols() { return $this->_num_cols; }
 
-  function &get_columns() {
+  function get_num_rows()
+  {
+    return $this->_num_rows;
+  }
+  function get_num_cols()
+  {
+    return $this->_num_cols;
+  }
+
+  function &get_columns()
+  {
     return $this->_columns;
   }
 
-  function set_columns($columns) {
+  function set_columns($columns)
+  {
     $this->_columns = $columns;
   }
 
-  function &get_column($i) {
-    if ( !isset($this->_columns[$i]) ) {
+  function &get_column($i)
+  {
+    if (!isset($this->_columns[$i])) {
       $this->_columns[$i] = array(
         "x" => 0,
         "min-width" => 0,
@@ -190,104 +208,109 @@ class Cellmap {
         "auto" => true,
       );
     }
-    
+
     return $this->_columns[$i];
   }
 
-  function &get_rows() {
+  function &get_rows()
+  {
     return $this->_rows;
   }
 
-  function &get_row($j) {
-    if ( !isset($this->_rows[$j]) ) {
+  function &get_row($j)
+  {
+    if (!isset($this->_rows[$j])) {
       $this->_rows[$j] = array(
         "y" => 0,
         "first-column" => 0,
         "height" => null,
       );
     }
-    
+
     return $this->_rows[$j];
   }
 
-  function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+  function get_border($i, $j, $h_v, $prop = null)
+  {
+    if (!isset($this->_borders[$i][$j][$h_v])) {
       $this->_borders[$i][$j][$h_v] = array(
         "width" => 0,
         "style" => "solid",
         "color" => "black",
       );
     }
-    
-    if ( isset($prop) ) {
+
+    if (isset($prop)) {
       return $this->_borders[$i][$j][$h_v][$prop];
     }
-    
+
     return $this->_borders[$i][$j][$h_v];
   }
 
-  function get_border_properties($i, $j) {
+  function get_border_properties($i, $j)
+  {
     return array(
-      "top"    => $this->get_border($i,   $j,   "horizontal"), 
-      "right"  => $this->get_border($i,   $j+1, "vertical"),
-      "bottom" => $this->get_border($i+1, $j,   "horizontal"), 
+      "top"    => $this->get_border($i,   $j,   "horizontal"),
+      "right"  => $this->get_border($i,   $j + 1, "vertical"),
+      "bottom" => $this->get_border($i + 1, $j,   "horizontal"),
       "left"   => $this->get_border($i,   $j,   "vertical"),
     );
   }
 
   //........................................................................
 
-  function get_spanned_cells(Frame $frame) {
+  function get_spanned_cells(Frame $frame)
+  {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Exception("Frame not found in cellmap");
     }
 
     return $this->_frames[$key];
-
   }
 
-  function frame_exists_in_cellmap(Frame $frame) {
+  function frame_exists_in_cellmap(Frame $frame)
+  {
     $key = $frame->get_id();
     return isset($this->_frames[$key]);
   }
-  
-  function get_frame_position(Frame $frame) {
+
+  function get_frame_position(Frame $frame)
+  {
     global $_dompdf_warnings;
 
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
-    if ( !isset($this->_columns[$col])) {
+    if (!isset($this->_columns[$col])) {
       $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
       $x = 0;
-    }
-    else {
+    } else {
       $x = $this->_columns[$col]["x"];
     }
 
-    if ( !isset($this->_rows[$row])) {
+    if (!isset($this->_rows[$row])) {
       $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
       $y = 0;
-    }
-    else {
+    } else {
       $y = $this->_rows[$row]["y"];
     }
 
     return array($x, $y, "x" => $x, "y" => $y);
   }
 
-  function get_frame_width(Frame $frame) {
+  function get_frame_width(Frame $frame)
+  {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Exception("Frame not found in cellmap");
     }
 
@@ -296,83 +319,87 @@ class Cellmap {
     foreach ($cols as $i) {
       $w += $this->_columns[$i]["used-width"];
     }
-    
+
     return $w;
   }
 
-  function get_frame_height(Frame $frame) {
+  function get_frame_height(Frame $frame)
+  {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Exception("Frame not found in cellmap");
     }
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+      if (!isset($this->_rows[$i])) {
         throw new Exception("The row #$i could not be found, please file an issue in the tracker with the HTML code");
       }
-      
+
       $h += $this->_rows[$i]["height"];
     }
-    
+
     return $h;
   }
 
 
   //........................................................................
 
-  function set_column_width($j, $width) {
-    if ( $this->_columns_locked ) {
+  function set_column_width($j, $width)
+  {
+    if ($this->_columns_locked) {
       return;
     }
-    
-    $col =& $this->get_column($j);
+
+    $col = &$this->get_column($j);
     $col["used-width"] = $width;
-    $next_col =& $this->get_column($j+1);
+    $next_col = &$this->get_column($j + 1);
     $next_col["x"] = $next_col["x"] + $width;
   }
 
-  function set_row_height($i, $height) {
-    $row =& $this->get_row($i);
-    
-    if ( $row["height"] !== null && $height <= $row["height"] ) {
+  function set_row_height($i, $height)
+  {
+    $row = &$this->get_row($i);
+
+    if ($row["height"] !== null && $height <= $row["height"]) {
       return;
     }
 
     $row["height"] = $height;
-    $next_row =& $this->get_row($i+1);
+    $next_row = &$this->get_row($i + 1);
     $next_row["y"] = $row["y"] + $height;
-
   }
 
   //........................................................................
 
 
-  protected function _resolve_border($i, $j, $h_v, $border_spec) {
+  protected function _resolve_border($i, $j, $h_v, $border_spec)
+  {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];
 
-    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+    if (!isset($this->_borders[$i][$j][$h_v])) {
       $this->_borders[$i][$j][$h_v] = $border_spec;
       return $this->_borders[$i][$j][$h_v]["width"];
     }
-    
+
     $border = &$this->_borders[$i][$j][$h_v];
-    
+
     $o_width = $border["width"];
     $o_style = $border["style"];
 
-    if ( ($n_style === "hidden" ||
-          $n_width  >  $o_width ||
-          $o_style === "none")
+    if (($n_style === "hidden" ||
+        $n_width  >  $o_width ||
+        $o_style === "none")
 
-         or
+      or
 
-         ($o_width == $n_width &&
-          in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) ) {
+      ($o_width == $n_width &&
+        in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
+        self::$_BORDER_STYLE_SCORE[$n_style] > self::$_BORDER_STYLE_SCORE[$o_style])
+    ) {
       $border = $border_spec;
     }
 
@@ -381,25 +408,28 @@ class Cellmap {
 
   //........................................................................
 
-  function add_frame(Frame $frame) {
-    
+  function add_frame(Frame $frame)
+  {
+
     $style = $frame->get_style();
     $display = $style->display;
 
     $collapse = $this->_table->get_style()->border_collapse == "collapse";
 
     // Recursively add the frames within tables, table-row-groups and table-rows
-    if ( $display === "table-row" ||
-         $display === "table" ||
-         $display === "inline-table" ||
-         in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+    if (
+      $display === "table-row" ||
+      $display === "table" ||
+      $display === "inline-table" ||
+      in_array($display, Table_Frame_Decorator::$ROW_GROUPS)
+    ) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child ) {
-        $this->add_frame( $child );
+      foreach ($frame->get_children() as $child) {
+        $this->add_frame($child);
       }
 
-      if ( $display === "table-row" ) {
+      if ($display === "table-row") {
         $this->add_row();
       }
 
@@ -407,21 +437,21 @@ class Cellmap {
       $key = $frame->get_id();
 
       // Row groups always span across the entire table
-      $this->_frames[$key]["columns"] = range(0,max(0,$this->_num_cols-1));
+      $this->_frames[$key]["columns"] = range(0, max(0, $this->_num_cols - 1));
       $this->_frames[$key]["rows"] = range($start_row, max(0, $this->__row - 1));
       $this->_frames[$key]["frame"] = $frame;
 
-      if ( $display !== "table-row" && $collapse ) {
+      if ($display !== "table-row" && $collapse) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
-        for ( $i = 0; $i < $num_rows+1; $i++) {
+        for ($i = 0; $i < $num_rows + 1; $i++) {
           $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
           $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
-        for ( $j = 0; $j < $this->_num_cols; $j++) {
+        for ($j = 0; $j < $this->_num_cols; $j++) {
           $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
           $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
         }
@@ -430,9 +460,9 @@ class Cellmap {
 
       return;
     }
-    
+
     $node = $frame->get_node();
-    
+    /* Este cambio lo hice yo, Gabriel
     // Determine where this cell is going
     $colspan = $node->getAttribute("colspan");
     $rowspan = $node->getAttribute("rowspan");
@@ -445,7 +475,31 @@ class Cellmap {
     if ( !$rowspan ) {
       $rowspan = 1;
       $node->setAttribute("rowspan",1);
+    }*/
+
+    if (method_exists($node, 'getAttribute')) {
+      $colspan = $node->getAttribute("colspan");
+      $rowspan = $node->getAttribute("rowspan");
+    } else {
+      $colspan = false;
+      $rowspan = false;
+    }
+
+
+    if (!$colspan) {
+      $colspan = 1;
+      if (method_exists($node, 'setAttribute')) {
+        $node->setAttribute("colspan", 1);
+      }
+    }
+
+    if (!$rowspan) {
+      $rowspan = 1;
+      if (method_exists($node, 'setAttribute')) {
+        $node->setAttribute("rowspan", 1);
+      }
     }
+
     $key = $frame->get_id();
 
     $bp = $style->get_border_properties();
@@ -456,23 +510,23 @@ class Cellmap {
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) ) {
-       $ac++;
+    while (isset($this->_cells[$this->__row][$ac])) {
+      $ac++;
     }
-    
+
     $this->__col = $ac;
 
     // Rows:
-    for ( $i = 0; $i < $rowspan; $i++ ) {
+    for ($i = 0; $i < $rowspan; $i++) {
       $row = $this->__row + $i;
 
       $this->_frames[$key]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++) {
+      for ($j = 0; $j < $colspan; $j++) {
         $this->_cells[$row][$this->__col + $j] = $frame;
       }
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
@@ -482,11 +536,11 @@ class Cellmap {
     $max_top = $max_bottom = 0;
 
     // Columns:
-    for ( $j = 0; $j < $colspan; $j++ ) {
+    for ($j = 0; $j < $colspan; $j++) {
       $col = $this->__col + $j;
       $this->_frames[$key]["columns"][] = $col;
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
@@ -496,7 +550,7 @@ class Cellmap {
     $this->_frames[$key]["frame"] = $frame;
 
     // Handle seperated border model
-    if ( !$collapse ) {
+    if (!$collapse) {
       list($h, $v) = $this->_table->get_style()->border_spacing;
 
       // Border spacing is effectively a margin between cells
@@ -505,8 +559,7 @@ class Cellmap {
       $style->margin = "$v $h";
 
       // The additional 1/2 width gets added to the table proper
-    }
-    else {
+    } else {
       // Drop the frame's actual border
       $style->border_left_width = $max_left / 2;
       $style->border_right_width = $max_right / 2;
@@ -515,87 +568,84 @@ class Cellmap {
       $style->margin = "none";
     }
 
-    if ( !$this->_columns_locked ) {
+    if (!$this->_columns_locked) {
       // Resolve the frame's width
-      if ( $this->_fixed_layout ) {
+      if ($this->_fixed_layout) {
         list($frame_min, $frame_max) = array(0, 10e-10);
-      }
-      else {
+      } else {
         list($frame_min, $frame_max) = $frame->get_min_max_width();
       }
-  
+
       $width = $style->width;
 
       $val = null;
-      if ( is_percent($width) ) {
+      if (is_percent($width)) {
         $var = "percent";
         $val = (float)rtrim($width, "% ") / $colspan;
-      }
-      else if ( $width !== "auto" ) {
+      } else if ($width !== "auto") {
         $var = "absolute";
         $val = $style->length_in_pt($frame_min) / $colspan;
       }
-      
+
       $min = 0;
       $max = 0;
-      for ( $cs = 0; $cs < $colspan; $cs++ ) {
-  
+      for ($cs = 0; $cs < $colspan; $cs++) {
+
         // Resolve the frame's width(s) with other cells
-        $col =& $this->get_column( $this->__col + $cs );
-  
+        $col = &$this->get_column($this->__col + $cs);
+
         // Note: $var is either 'percent' or 'absolute'.  We compare the
         // requested percentage or absolute values with the existing widths
         // and adjust accordingly.
-        if ( isset($var) && $val > $col[$var] ) {
+        if (isset($var) && $val > $col[$var]) {
           $col[$var] = $val;
           $col["auto"] = false;
         }
-  
+
         $min += $col["min-width"];
         $max += $col["max-width"];
       }
-  
-      if ( $frame_min > $min ) {
+
+      if ($frame_min > $min) {
         // The frame needs more space.  Expand each sub-column
         // FIXME try to avoid putting this dummy value when table-layout:fixed
         $inc = ($this->is_layout_fixed() ? 10e-10 : ($frame_min - $min) / $colspan);
         for ($c = 0; $c < $colspan; $c++) {
-          $col =& $this->get_column($this->__col + $c);
+          $col = &$this->get_column($this->__col + $c);
           $col["min-width"] += $inc;
         }
       }
-  
-      if ( $frame_max > $max ) {
+
+      if ($frame_max > $max) {
         // FIXME try to avoid putting this dummy value when table-layout:fixed
         $inc = ($this->is_layout_fixed() ? 10e-10 : ($frame_max - $max) / $colspan);
         for ($c = 0; $c < $colspan; $c++) {
-          $col =& $this->get_column($this->__col + $c);
+          $col = &$this->get_column($this->__col + $c);
           $col["max-width"] += $inc;
         }
       }
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
+    if ($this->__col > $this->_num_cols)
       $this->_num_cols = $this->__col;
-
   }
 
   //........................................................................
 
-  function add_row() {
+  function add_row()
+  {
 
     $this->__row++;
     $this->_num_rows++;
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) ) {
+    while (isset($this->_cells[$this->__row][$i])) {
       $i++;
     }
 
     $this->__col = $i;
-
   }
 
   //........................................................................
@@ -605,10 +655,11 @@ class Cellmap {
    *
    * @param Frame
    */
-  function remove_row(Frame $row) {
+  function remove_row(Frame $row)
+  {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       return;  // Presumably this row has alredy been removed
     }
 
@@ -618,26 +669,25 @@ class Cellmap {
     $columns = $this->_frames[$key]["columns"];
 
     // Remove all frames from this row
-    foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
-        if ( isset($this->_cells[$r][$c]) ) {
+    foreach ($rows as $r) {
+      foreach ($columns as $c) {
+        if (isset($this->_cells[$r][$c])) {
           $id = $this->_cells[$r][$c]->get_id();
-          
+
           $this->_frames[$id] = null;
           unset($this->_frames[$id]);
-          
+
           $this->_cells[$r][$c] = null;
           unset($this->_cells[$r][$c]);
         }
       }
-      
+
       $this->_rows[$r] = null;
       unset($this->_rows[$r]);
     }
 
     $this->_frames[$key] = null;
     unset($this->_frames[$key]);
-
   }
 
   /**
@@ -645,13 +695,14 @@ class Cellmap {
    *
    * @param Frame $group  The group to remove
    */
-  function remove_row_group(Frame $group) {
+  function remove_row_group(Frame $group)
+  {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       return;  // Presumably this row has alredy been removed
     }
-    
+
     $iter = $group->get_first_child();
     while ($iter) {
       $this->remove_row($iter);
@@ -668,59 +719,59 @@ class Cellmap {
    * @param Frame $group    The group to update
    * @param Frame $last_row The last row in the row group
    */
-  function update_row_group(Frame $group, Frame $last_row) {
+  function update_row_group(Frame $group, Frame $last_row)
+  {
 
     $g_key = $group->get_id();
     $r_key = $last_row->get_id();
 
-    $r_rows = $this->_frames[$r_key]["rows"];
-    $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
-
+    //cambiado por mi
+    $r_rows = $this->_frames[$g_key]["rows"];
+    $this->_frames[$g_key]["rows"] = range($this->_frames[$g_key]["rows"][0], end($r_rows));
   }
 
   //........................................................................
 
-  function assign_x_positions() {
+  function assign_x_positions()
+  {
     // Pre-condition: widths must be resolved and assigned to columns and
     // column[0]["x"] must be set.
 
-    if ( $this->_columns_locked ) {
+    if ($this->_columns_locked) {
       return;
     }
-    
+
     $x = $this->_columns[0]["x"];
-    foreach ( array_keys($this->_columns) as $j ) {
+    foreach (array_keys($this->_columns) as $j) {
       $this->_columns[$j]["x"] = $x;
       $x += $this->_columns[$j]["used-width"];
     }
-
   }
 
-  function assign_frame_heights() {
+  function assign_frame_heights()
+  {
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) ) {
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row])) {
           // The row has been removed because of a page split, so skip it.
           continue;
         }
-        
+
         $h += $this->_rows[$row]["height"];
       }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+      if ($frame instanceof Table_Cell_Frame_Decorator) {
         $frame->set_cell_height($h);
-      }
-      else {
+      } else {
         $frame->get_style()->height = $h;
       }
     }
-
   }
 
   //........................................................................
@@ -728,43 +779,42 @@ class Cellmap {
   /**
    * Re-adjust frame height if the table height is larger than its content
    */
-  function set_frame_heights($table_height, $content_height) {
+  function set_frame_heights($table_height, $content_height)
+  {
 
 
     // Distribute the increased height proportionally amongst each row
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) ) {
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row])) {
           continue;
         }
 
         $h += $this->_rows[$row]["height"];
       }
-      
-      if ( $content_height > 0 ) {
+
+      if ($content_height > 0) {
         $new_height = ($h / $content_height) * $table_height;
-      }
-      else {
+      } else {
         $new_height = 0;
       }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+      if ($frame instanceof Table_Cell_Frame_Decorator) {
         $frame->set_cell_height($new_height);
-      }
-      else {
+      } else {
         $frame->get_style()->height = $new_height;
       }
     }
-
   }
 
   //........................................................................
 
   // Used for debugging:
-  function __toString() {
+  function __toString()
+  {
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
@@ -773,18 +823,20 @@ class Cellmap {
 
     $str .=  "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val ) {
+    foreach ($this->_frames as $key => $val) {
       $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
     }
-    
+
     $str .= pre_r($arr, true);
 
-    if ( php_sapi_name() == "cli" ) {
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
-                                    array("\n",chr(27)."[01;33m", chr(27)."[0m"),
-                                    $str));
+    if (php_sapi_name() == "cli") {
+      $str = strip_tags(str_replace(
+        array("<br/>", "<b>", "</b>"),
+        array("\n", chr(27) . "[01;33m", chr(27) . "[0m"),
+        $str
+      ));
     }
-    
+
     return $str;
   }
-}
+}

vendor/dompdf/dompdf/include/frame_decorator.cls.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package dompdf
  * @link    http://dompdf.github.com/
@@ -12,11 +13,12 @@
  * @access private
  * @package dompdf
  */
-abstract class Frame_Decorator extends Frame {
+abstract class Frame_Decorator extends Frame
+{
   const DEFAULT_COUNTER = "-dompdf-default-counter";
-  
+
   public $_counters = array(); // array([id] => counter_value) (for generated content)
-  
+
   /**
    * The root node of the DOM tree
    *
@@ -44,21 +46,21 @@ abstract class Frame_Decorator extends Frame {
    * @var Frame_Reflower
    */
   protected $_reflower;
-  
+
   /**
    * Reference to the current dompdf instance
    *
    * @var DOMPDF
    */
   protected $_dompdf;
-  
+
   /**
    * First block parent
    * 
    * @var Block_Frame_Decorator
    */
   private $_block_parent;
-  
+
   /**
    * First positionned parent (position: relative | absolute | fixed)
    * 
@@ -72,7 +74,8 @@ abstract class Frame_Decorator extends Frame {
    * @param Frame  $frame  The decoration target
    * @param DOMPDF $dompdf The DOMPDF object
    */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+  function __construct(Frame $frame, DOMPDF $dompdf)
+  {
     $this->_frame = $frame;
     $this->_root = null;
     $this->_dompdf = $dompdf;
@@ -84,23 +87,24 @@ abstract class Frame_Decorator extends Frame {
    *
    * @param bool $recursive if true, call dispose on all children
    */
-  function dispose($recursive = false) {
-    if ( $recursive ) {
-      while ( $child = $this->get_first_child() ) {
+  function dispose($recursive = false)
+  {
+    if ($recursive) {
+      while ($child = $this->get_first_child()) {
         $child->dispose(true);
       }
     }
-    
+
     $this->_root = null;
     unset($this->_root);
-    
+
     $this->_frame->dispose(true);
     $this->_frame = null;
     unset($this->_frame);
-    
+
     $this->_positioner = null;
     unset($this->_positioner);
-    
+
     $this->_reflower = null;
     unset($this->_reflower);
   }
@@ -111,11 +115,12 @@ abstract class Frame_Decorator extends Frame {
    * @param DOMNode $node
    *
    * @return Frame
-   */ 
-  function copy(DOMNode $node) {
+   */
+  function copy(DOMNode $node)
+  {
     $frame = new Frame($node);
     $frame->set_style(clone $this->_frame->get_original_style());
-    
+
     return Frame_Factory::decorate_frame($frame, $this->_dompdf, $this->_root);
   }
 
@@ -124,63 +129,70 @@ abstract class Frame_Decorator extends Frame {
    *
    * @return Frame
    */
-  function deep_copy() {
+  function deep_copy()
+  {
     $frame = new Frame($this->get_node()->cloneNode());
     $frame->set_style(clone $this->_frame->get_original_style());
-    
+
     $deco = Frame_Factory::decorate_frame($frame, $this->_dompdf, $this->_root);
-    
+
     foreach ($this->get_children() as $child) {
       $deco->append_child($child->deep_copy());
     }
-    
+
     return $deco;
   }
-  
+
   /**
    * Delegate calls to decorated frame object
    */
-  function reset() {
+  function reset()
+  {
     $this->_frame->reset();
-    
+
     $this->_counters = array();
-    
+
     // Reset all children
     foreach ($this->get_children() as $child) {
       $child->reset();
     }
   }
-  
+
   // Getters -----------
-  function get_id() {
+  function get_id()
+  {
     return $this->_frame->get_id();
   }
-  
+
   /**
    * @return Frame
    */
-  function get_frame() {
+  function get_frame()
+  {
     return $this->_frame;
   }
-  
+
   /**
    * @return DOMElement|DOMText
    */
-  function get_node() {
+  function get_node()
+  {
     return $this->_frame->get_node();
   }
-  
+
   /**
    * @return Style
    */
-  function get_style() {
+  function get_style()
+  {
     return $this->_frame->get_style();
   }
-  
+
   /**
    * @return Style
    */
-  function get_original_style() {
+  function get_original_style()
+  {
     return $this->_frame->get_original_style();
   }
 
@@ -189,7 +201,8 @@ abstract class Frame_Decorator extends Frame {
    *
    * @return array|float
    */
-  function get_containing_block($i = null) {
+  function get_containing_block($i = null)
+  {
     return $this->_frame->get_containing_block($i);
   }
 
@@ -198,56 +211,64 @@ abstract class Frame_Decorator extends Frame {
    *
    * @return array|float
    */
-  function get_position($i = null) {
+  function get_position($i = null)
+  {
     return $this->_frame->get_position($i);
   }
-  
+
   /**
    * @return DOMPDF
    */
-  function get_dompdf() {
+  function get_dompdf()
+  {
     return $this->_dompdf;
   }
 
   /**
    * @return float
    */
-  function get_margin_height() {
+  function get_margin_height()
+  {
     return $this->_frame->get_margin_height();
   }
 
   /**
    * @return float
    */
-  function get_margin_width() {
+  function get_margin_width()
+  {
     return $this->_frame->get_margin_width();
   }
 
   /**
    * @return array
    */
-  function get_padding_box() {
+  function get_padding_box()
+  {
     return $this->_frame->get_padding_box();
   }
 
   /**
    * @return array
    */
-  function get_border_box() {
+  function get_border_box()
+  {
     return $this->_frame->get_border_box();
   }
 
   /**
    * @param integer $id
    */
-  function set_id($id) {
+  function set_id($id)
+  {
     $this->_frame->set_id($id);
   }
 
   /**
    * @param Style $style
    */
-  function set_style(Style $style) {
+  function set_style(Style $style)
+  {
     $this->_frame->set_style($style);
   }
 
@@ -257,7 +278,8 @@ abstract class Frame_Decorator extends Frame {
    * @param float $w
    * @param float $h
    */
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+  function set_containing_block($x = null, $y = null, $w = null, $h = null)
+  {
     $this->_frame->set_containing_block($x, $y, $w, $h);
   }
 
@@ -265,14 +287,16 @@ abstract class Frame_Decorator extends Frame {
    * @param float $x
    * @param float $y
    */
-  function set_position($x = null, $y = null) {
+  function set_position($x = null, $y = null)
+  {
     $this->_frame->set_position($x, $y);
   }
 
   /**
    * @return string
    */
-  function __toString() {
+  function __toString()
+  {
     return $this->_frame->__toString();
   }
 
@@ -280,11 +304,12 @@ abstract class Frame_Decorator extends Frame {
    * @param Frame $child
    * @param bool  $update_node
    */
-  function prepend_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator ) {
+  function prepend_child(Frame $child, $update_node = true)
+  {
+    while ($child instanceof Frame_Decorator) {
       $child = $child->_frame;
     }
-    
+
     $this->_frame->prepend_child($child, $update_node);
   }
 
@@ -292,8 +317,9 @@ abstract class Frame_Decorator extends Frame {
    * @param Frame $child
    * @param bool  $update_node
    */
-  function append_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator ) {
+  function append_child(Frame $child, $update_node = true)
+  {
+    while ($child instanceof Frame_Decorator) {
       $child = $child->_frame;
     }
 
@@ -305,12 +331,13 @@ abstract class Frame_Decorator extends Frame {
    * @param Frame $ref
    * @param bool  $update_node
    */
-  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator ) {
+  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true)
+  {
+    while ($new_child instanceof Frame_Decorator) {
       $new_child = $new_child->_frame;
     }
 
-    if ( $ref instanceof Frame_Decorator ) {
+    if ($ref instanceof Frame_Decorator) {
       $ref = $ref->_frame;
     }
 
@@ -322,15 +349,16 @@ abstract class Frame_Decorator extends Frame {
    * @param Frame $ref
    * @param bool  $update_node
    */
-  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator ) {
+  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true)
+  {
+    while ($new_child instanceof Frame_Decorator) {
       $new_child = $new_child->_frame;
     }
 
-    while ( $ref instanceof Frame_Decorator ) {
+    while ($ref instanceof Frame_Decorator) {
       $ref = $ref->_frame;
     }
-    
+
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
   }
 
@@ -340,8 +368,9 @@ abstract class Frame_Decorator extends Frame {
    *
    * @return Frame
    */
-  function remove_child(Frame $child, $update_node = true) {
-    while  ( $child instanceof Frame_Decorator ) {
+  function remove_child(Frame $child, $update_node = true)
+  {
+    while ($child instanceof Frame_Decorator) {
       $child = $child->_frame;
     }
 
@@ -351,176 +380,184 @@ abstract class Frame_Decorator extends Frame {
   /**
    * @return Frame_Decorator
    */
-  function get_parent() {
+  function get_parent()
+  {
     $p = $this->_frame->get_parent();
-    if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() ) {
+    if ($p && $deco = $p->get_decorator()) {
+      while ($tmp = $deco->get_decorator()) {
         $deco = $tmp;
       }
-      
+
       return $deco;
-    }
-    else if ( $p ) {
+    } else if ($p) {
       return $p;
     }
-    
+
     return null;
   }
 
   /**
    * @return Frame_Decorator
    */
-  function get_first_child() {
+  function get_first_child()
+  {
     $c = $this->_frame->get_first_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() ) {
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator()) {
         $deco = $tmp;
       }
-      
+
       return $deco;
-    }
-    else if ( $c ) {
+    } else if ($c) {
       return $c;
     }
-    
+
     return null;
   }
 
   /**
    * @return Frame_Decorator
    */
-  function get_last_child() {
+  function get_last_child()
+  {
     $c = $this->_frame->get_last_child();
-    if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() ) {
+    if ($c && $deco = $c->get_decorator()) {
+      while ($tmp = $deco->get_decorator()) {
         $deco = $tmp;
       }
-      
+
       return $deco;
-    }
-    else if ( $c ) {
+    } else if ($c) {
       return $c;
     }
-    
+
     return null;
   }
 
   /**
    * @return Frame_Decorator
    */
-  function get_prev_sibling() {
+  function get_prev_sibling()
+  {
     $s = $this->_frame->get_prev_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() ) {
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator()) {
         $deco = $tmp;
       }
       return $deco;
-    }
-    else if ( $s ) {
+    } else if ($s) {
       return $s;
     }
-    
+
     return null;
   }
-  
+
   /**
    * @return Frame_Decorator
    */
-  function get_next_sibling() {
+  function get_next_sibling()
+  {
     $s = $this->_frame->get_next_sibling();
-    if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() ) {
+    if ($s && $deco = $s->get_decorator()) {
+      while ($tmp = $deco->get_decorator()) {
         $deco = $tmp;
       }
-      
+
       return $deco;
-    }
-    else if ( $s ) {
+    } else if ($s) {
       return $s;
     }
-    
+
     return null;
   }
 
   /**
    * @return FrameTreeList
    */
-  function get_subtree() {
+  function get_subtree()
+  {
     return new FrameTreeList($this);
   }
 
-  function set_positioner(Positioner $posn) {
+  function set_positioner(Positioner $posn)
+  {
     $this->_positioner = $posn;
-    if ( $this->_frame instanceof Frame_Decorator ) {
+    if ($this->_frame instanceof Frame_Decorator) {
       $this->_frame->set_positioner($posn);
     }
   }
 
-  function set_reflower(Frame_Reflower $reflower) {
+  function set_reflower(Frame_Reflower $reflower)
+  {
     $this->_reflower = $reflower;
-    if ( $this->_frame instanceof Frame_Decorator ) {
-      $this->_frame->set_reflower( $reflower );
+    if ($this->_frame instanceof Frame_Decorator) {
+      $this->_frame->set_reflower($reflower);
     }
   }
-  
+
   /**
    * @return Frame_Reflower
    */
-  function get_reflower() {
+  function get_reflower()
+  {
     return $this->_reflower;
   }
 
   /**
    * @param Frame $root
    */
-  function set_root(Frame $root) {
+  function set_root(Frame $root)
+  {
     $this->_root = $root;
-    
-    if ( $this->_frame instanceof Frame_Decorator ) {
+
+    if ($this->_frame instanceof Frame_Decorator) {
       $this->_frame->set_root($root);
     }
   }
-  
+
   /**
    * @return Page_Frame_Decorator
    */
-  function get_root() {
+  function get_root()
+  {
     return $this->_root;
   }
 
   /**
    * @return Block_Frame_Decorator
    */
-  function find_block_parent() {
+  function find_block_parent()
+  {
     // Find our nearest block level parent
     $p = $this->get_parent();
-    
-    while ( $p ) {
-      if ( $p->is_block() ) {
+
+    while ($p) {
+      if ($p->is_block()) {
         break;
       }
-      
+
       $p = $p->get_parent();
     }
 
     return $this->_block_parent = $p;
   }
-  
+
   /**
    * @return Frame_Decorator
    */
-  function find_positionned_parent() {
+  function find_positionned_parent()
+  {
     // Find our nearest relative positionned parent
     $p = $this->get_parent();
-    while ( $p ) {
-      if ( $p->is_positionned() ) {
+    while ($p) {
+      if ($p->is_positionned()) {
         break;
       }
-      
+
       $p = $p->get_parent();
     }
-    
-    if ( !$p ) {
+
+    if (!$p) {
       $p = $this->_root->get_first_child(); // <body>
     }
 
@@ -539,22 +576,24 @@ abstract class Frame_Decorator extends Frame {
    * @throws DOMPDF_Exception
    * @return void
    */
-  function split(Frame $child = null, $force_pagebreak = false) {
-    // decrement any counters that were incremented on the current node, unless that node is the body
+  function split(Frame $child = null, $force_pagebreak = false)
+  {
+
+    // decrement any counters that were incremented on the current node
     $style = $this->_frame->get_style();
-    if ( $this->_frame->get_node()->nodeName !== "body" && $style->counter_increment && ($decrement = $style->counter_increment) !== "none" ) {
+    if ($style->counter_increment && ($decrement = $style->counter_increment) !== "none") {
       $this->decrement_counters($decrement);
     }
-    
-    if ( is_null( $child ) ) {
+
+    if (is_null($child)) {
       // check for counter increment on :before content (always a child of the selected element @link Frame_Reflower::_set_content)
       // this can push the current node to the next page before counter rules have bubbled up (but only if
       // it's been rendered, thus the position check)
-      if ( !$this->is_text_node() && $this->get_node()->hasAttribute("dompdf_before_frame_id") ) {
-        foreach($this->_frame->get_children() as $child) {
-          if ( $this->get_node()->getAttribute("dompdf_before_frame_id") == $child->get_id() && $child->get_position('x') !== NULL ) {
+      if (!$this->is_text_node() && $this->get_node()->hasAttribute("dompdf_before_frame_id")) {
+        foreach ($this->_frame->get_children() as $child) {
+          if ($this->get_node()->getAttribute("dompdf_before_frame_id") == $child->get_id() && $child->get_position('x') !== NULL) {
             $style = $child->get_style();
-            if ( $style->counter_increment && ($decrement = $style->counter_increment) !== "none" ) {
+            if ($style->counter_increment && ($decrement = $style->counter_increment) !== "none") {
               $this->decrement_counters($decrement);
             }
           }
@@ -563,155 +602,155 @@ abstract class Frame_Decorator extends Frame {
       $this->get_parent()->split($this, $force_pagebreak);
       return;
     }
-    
-    if ( $child->get_parent() !== $this ) {
+
+
+    if ($child->get_parent() !== $this) {
       throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
     }
-    
+
+
     $node = $this->_frame->get_node();
-    
-    $split = $this->copy( $node->cloneNode() );
-    $split->reset();
-    $split->get_original_style()->text_indent = 0;
-    $split->_splitted = true;
-    
-    // The body's properties must be kept
-    if ( $node->nodeName !== "body" ) {
-      // Style reset on the first and second parts
-      $style = $this->_frame->get_style();
-      $style->margin_bottom = 0;
-      $style->padding_bottom = 0;
-      $style->border_bottom = 0;
-      
-      // second
-      $orig_style = $split->get_original_style();
-      $orig_style->text_indent = 0;
-      $orig_style->margin_top = 0;
-      $orig_style->padding_top = 0;
-      $orig_style->border_top = 0;
-    }
-    
+
+    $split = $this->copy($node->cloneNode());
+
+
+
     $this->get_parent()->insert_child_after($split, $this);
-    
+
+
     // Add $frame and all following siblings to the new split node
     $iter = $child;
     while ($iter) {
+
       $frame = $iter;
       $iter = $iter->get_next_sibling();
       $frame->reset();
       $split->append_child($frame);
     }
-    
+
+
     $this->get_parent()->split($split, $force_pagebreak);
-    
+
     // If this node resets a counter save the current value to use when rendering on the next page
-    if ( $style->counter_reset && ( $reset = $style->counter_reset ) !== "none" ) {
-      $vars = preg_split( '/\s+/' , trim( $reset ) , 2 );
-      $split->_counters[ '__' . $vars[0] ] = $this->lookup_counter_frame( $vars[0] )->_counters[$vars[0]];
+    if ($style->counter_reset && ($reset = $style->counter_reset) !== "none") {
+      $vars = preg_split('/\s+/', trim($reset), 2);
+      $split->_counters['__' . $vars[0]] = $this->lookup_counter_frame($vars[0])->_counters[$vars[0]];
     }
   }
 
-  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
+
+  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0)
+  {
     $this->get_parent()->_counters[$id] = intval($value);
   }
-  
-  function decrement_counters($counters) {
-    foreach($counters as $id => $increment) {
+
+  function decrement_counters($counters)
+  {
+    foreach ($counters as $id => $increment) {
       $this->increment_counter($id, intval($increment) * -1);
     }
   }
-  
-  function increment_counters($counters) {
-    foreach($counters as $id => $increment) {
+
+
+  function increment_counters($counters)
+  {
+    foreach ($counters as $id => $increment) {
       $this->increment_counter($id, intval($increment));
     }
   }
 
-  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
+  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1)
+  {
     $counter_frame = $this->lookup_counter_frame($id);
 
-    if ( $counter_frame ) {
-      if ( !isset($counter_frame->_counters[$id]) ) {
+    if ($counter_frame) {
+      if (!isset($counter_frame->_counters[$id])) {
         $counter_frame->_counters[$id] = 0;
       }
-      
+
       $counter_frame->_counters[$id] += $increment;
     }
   }
-  
-  function lookup_counter_frame($id = self::DEFAULT_COUNTER) {
+
+  function lookup_counter_frame($id = self::DEFAULT_COUNTER)
+  {
     $f = $this->get_parent();
-    
-    while( $f ) {
-      if( isset($f->_counters[$id]) ) {
+
+    while ($f) {
+      if (isset($f->_counters[$id])) {
         return $f;
       }
       $fp = $f->get_parent();
-      
-      if ( !$fp ) {
+
+      if (!$fp) {
         return $f;
       }
-      
+
       $f = $fp;
     }
   }
 
   // TODO: What version is the best : this one or the one in List_Bullet_Renderer ?
-  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
+  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal")
+  {
     $type = mb_strtolower($type);
-    
-    if ( !isset($this->_counters[$id]) ) {
+
+    if (!isset($this->_counters[$id])) {
       $this->_counters[$id] = 0;
     }
 
     $value = $this->_counters[$id];
-    
+
     switch ($type) {
       default:
       case "decimal":
         return $value;
-  
+
       case "decimal-leading-zero":
         return str_pad($value, 2, "0");
-  
+
       case "lower-roman":
         return dec2roman($value);
-  
+
       case "upper-roman":
         return mb_strtoupper(dec2roman($value));
-  
+
       case "lower-latin":
       case "lower-alpha":
-        return chr( ($value % 26) + ord('a') - 1);
-  
+        return chr(($value % 26) + ord('a') - 1);
+
       case "upper-latin":
       case "upper-alpha":
-        return chr( ($value % 26) + ord('A') - 1);
-  
+        return chr(($value % 26) + ord('A') - 1);
+
       case "lower-greek":
         return unichr($value + 944);
-  
+
       case "upper-greek":
         return unichr($value + 912);
     }
   }
 
-  final function position() {
+  final function position()
+  {
     $this->_positioner->position();
   }
-  
-  final function move($offset_x, $offset_y, $ignore_self = false) {
-    $this->_positioner->move($offset_x, $offset_y, $ignore_self); 
+
+  final function move($offset_x, $offset_y, $ignore_self = false)
+  {
+    $this->_positioner->move($offset_x, $offset_y, $ignore_self);
   }
-  
-  final function reflow(Block_Frame_Decorator $block = null) {
+
+  final function reflow(Block_Frame_Decorator $block = null)
+  {
     // Uncomment this to see the frames before they're laid out, instead of
     // during rendering.
     //echo $this->_frame; flush();
     $this->_reflower->reflow($block);
   }
 
-  final function get_min_max_width() {
+  final function get_min_max_width()
+  {
     return $this->_reflower->get_min_max_width();
   }
-}
+}