Fixes to dashboard functions; missing filter by faculty

app/Course.php

@@ -20,7 +20,7 @@ class Course extends Model
     public $timestamps = false;
 
     public function dept() {
-        return $this->belongsTo(Dept::class);
+        return $this->belongsTo(Department::class);
     }
 
     public function semesters() {

app/Department.php

@@ -7,4 +7,13 @@ use Illuminate\Database\Eloquent\Model;
 class Department extends Model
 {
     public $timestamps = false;
+
+
+    public function courses() {
+        return $this->hasMany(Course::class);
+    }
+
+    public function faculty() {
+        return $this->belongsTo(Faculty::class);
+    }
 }

app/Faculty.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Faculty extends Model
+{
+    public $timestamps = false;
+
+    public function departments() {
+        return $this->hasMany(Department::class);
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -62,10 +62,10 @@ class LoginController extends Controller
         } catch (Exception $e) {
             return redirect('/login');
         }
-        // only allow people with @company.com to login
-        // if(explode("@", $google_user->email)[1] !== 'upr.edu'){
-        //     return redirect()->to('/');
-        // }
+        // only allow people with @upr.edu to login
+        if(explode("@", $google_user->email)[1] !== 'upr.edu'){
+            return redirect()->to('/');
+        }
 
         // check if they're in the database
         $user = \App\User::where('email', $google_user->email)->first();

app/Http/Controllers/CourseController.php

@@ -19,6 +19,8 @@ class CourseController extends Controller
      */
     public function index(Request $request)
     {
+        // if ($request->session()->has('department'))
+        // $courses = Course::whereIn('dept_id')
         return view('courses.index', [
             'courses' => Course::where('dept_id', '=', $request->session()->get('department'))->with('sections:id,course_id,semester_code')->get()->sort('cmpCourseCode'),
             'semesters' => Semester::orderBy('code', 'asc')->get(),

app/Http/Controllers/DashboardController.php

@@ -46,45 +46,38 @@ class DashboardController extends Controller
         $semester = Semester::findOrFail($semester_code);
         $data = (object)['alpha' => $semester->alpha];
         $data->dept = Department::find($request->session()->get('department'));
-        $data->courses = $semester->courses()->where('dept_id', '=', $data->dept->id)->distinct()->get();
-        // dd($data);
-        // $data->loadMissing(['courses.sections' => function ($query) use ($request, $semester_code) {
-        //     $query->where('semester_code', '=', $semester_code);
-        // }, 'courses.sections.professors:id,first_name,last_name', 'courses.sections.schedules']);
-        // return $data->toJson();
-        // $data->courses = $data->courses->sort('cmpCourseCode');
-        // dump($data->courses[0]->sections);
-        // foreach($data->courses as $course) {
-        //     $course->sections = $course->sections;
-        //     foreach($course->sections as $section) {
-        //         $section->professors = $section->professors;
-        //     }
-        // }
-        // dd($data);
-        dd(json_encode($data, JSON_PRETTY_PRINT));
-        // header('Content-Type: application/pdf');
-        // header(`Content-Disposition: attachment; filename="${semester_code}.pdf";`);
-        // return $data->toJson();
-
-        return '<script type="text/javascript">var data='.$data->toJson().';</script><script type="text/javascript" src="/js/createPDF.js"></script>';
+        $data->courses = $semester->courses()->where('dept_id', '=', $data->dept->id)->with([
+            'sections' => function ($query) use ($semester) {
+                $query->where('semester_code', '=', $semester->code);
+            },
+            'sections.schedules',
+            'sections.professors',
+        ])->distinct()->get()->sort('cmpCourseCode')->values();
+        // dump(json_encode($data, JSON_PRETTY_PRINT));
+        return '<script type="text/javascript">var data='.json_encode($data, JSON_UNESCAPED_UNICODE).';</script><script type="text/javascript" src="/js/createPDF.js"></script>';
     }
 
     public function export($semester_code) {
         $semester = Semester::findOrFail($semester_code);
-        $professors = Professor::with(['sections', 'semesters:code,admin_load,investigative_load'])->whereIn('id', function($query) use ($semester_code) {
-            $query->select('professor_id')
-            ->from('professor_semester')
-            ->where('semester_code', '=', $semester_code);
-        })->orWhereIn('id', function($query) use ($semester_code) {
-            $query->select('professor_id')
-            ->from('sections')
-            ->join('professor_section', 'sections.id', '=', 'professor_section.section_id')
-            ->where('semester_code', '=', $semester_code);
-        })->orderBy('last_name')->get();
+        $professors = Professor::with([
+                'sections' => function ($query) use ($semester_code) {
+                    $query->where('semester_code', '=', $semester_code);
+                },
+                'semesters:code,admin_load,investigative_load,other'
+            ])->whereIn('id', function($query) use ($semester_code) {
+                $query->select('professor_id')
+                    ->from('professor_semester')
+                    ->where('semester_code', '=', $semester_code);
+            })->orWhereIn('id', function($query) use ($semester_code) {
+                $query->select('professor_id')
+                    ->from('sections')
+                    ->join('professor_section', 'sections.id', '=', 'professor_section.section_id')
+                    ->where('semester_code', '=', $semester_code);
+            })->orderBy('last_name')->get();
         header('Content-Type: application/csv');
         header(`Content-Disposition: attachment; filename="${semester_code}.csv";`);
         if ($file = fopen('php://output', 'w+')) {
-            fputcsv($file, ['PROFESOR', 'CARGA ACADEMICA', 'CARGA ADMINISTRATIVA', 'CARGA INVESTIGATIVE', 'CARGA TOTAL']);
+            fputcsv($file, ['PROFESOR', 'CARGA ACADEMICA', 'CARGA ADMINISTRATIVA', 'CARGA INVESTIGATIVA', 'OTRAS CARGAS', 'CARGA TOTAL']);
             foreach ($professors as $professor) {
                 $professor->academic_load = $professor->getAcademicLoad($semester);
                 $prof_loads = $professor->semesters->find($semester);
@@ -94,7 +87,8 @@ class DashboardController extends Controller
                     $professor->academic_load,
                     $prof_loads->admin_load ?? 0,
                     $prof_loads->investigative_load ?? 0,
-                    $professor->academic_load + ($prof_loads->admin_load ?? 0) + ($prof_loads->investigative_load ?? 0),
+                    $prof_loads->other ?? 0,
+                    $professor->academic_load + ($prof_loads->admin_load ?? 0) + ($prof_loads->investigative_load ?? 0) + ($prof_loads->other ?? 0),
                 ]);
             }
             fclose($file);
@@ -125,11 +119,11 @@ class DashboardController extends Controller
         $semester = Semester::findOrFail($semester_code);
         // dd($semester->sections);
         $data = $request->validate([
-            'new_semester'  => 'required|unique:semesters,code|regex:/^[a-zA-Z][0-9][123]$/',
-            'new_alpha'     => 'required|unique:semesters,alpha'
+            'new_semester'  => 'required|regex:/^[a-zA-Z][0-9][123]$/',
+            'new_alpha'     => 'nullable'
         ]);
         try {
-            $semester->clone(strtoupper($data['new_semester']), strtoupper($data['new_alpha']));
+            $semester->clone(strtoupper($data['new_semester']), strtoupper($data['new_alpha']), $request->session()->get('department'));
         } catch (Exception $e) {
             echo $e->getMessage();
         }
@@ -137,10 +131,9 @@ class DashboardController extends Controller
     }
 
     /**
-     * TODO: Ability to add non-google users
      */
     public function addUser(Request $request) {
-        $data = $request->validate(['email' => ['required', 'email']]);
+        $data = $request->validate(['email' => ['required', 'email', 'regex:/.+@upr\.edu$/']]);
         User::create($data);
         return redirect()->back();
     }

app/Http/Middleware/SetDept.php

@@ -15,15 +15,25 @@ class SetDept
      */
     public function handle($request, Closure $next)
     {
-        if ($request->has('setdept')) {
+        if ($request->has('f')) {
+            $data = $request->validate(['filter' => 'regex:/[df]/']);
+            $request->session()->put('filter', $data['filter']);
+        }
+        if ($request->has('fclt')) {
+            $data = $request->validate(['setfclt' => 'integer|exists:faculties,id']);
+            $request->session()->put('faculty', $data['setfclt']);
+        }
+        if ($request->has('dept')) {
             $data = $request->validate(['setdept' => 'integer|exists:departments,id']);
             $request->session()->put('department', $data['setdept']);
         }
+        if (!$request->session()->has('filter')) {
+            $request->session()->put('filter', 'd');
+        }
         if (!$request->session()->has('department')) {
-            $default_dept_id = \App\Department::whereNull('name')->first()->id;
+            $default_dept_id = \App\Department::where('name', '=', 'BIOL')->first()->id;
             $request->session()->put('department', $default_dept_id);
         }
-        // dump($request->session()->get('department'));
         return $next($request);
     }
 }

app/Semester.php

@@ -40,34 +40,50 @@ class Semester extends Model
      *
      * @param string $newSemCode
      * @param string $newSemAlpha
+     * @param int $dept_id
      *
      * @return Semester
      */
-    public function clone(string $newSemCode, string $newSemAlpha) {
-        if (Semester::find($newSemCode)) {
-            throw new Exception('A semester with code ' . $newSemCode . ' already exists');
-        }
-        $newSem = Semester::create([
-            'code'  => $newSemCode,
-            'alpha' => $newSemAlpha,
-        ]);
+    public function clone(string $newSemCode, string $newSemAlpha, int $dept_id) {
+        // if (Semester::find($newSemCode)) {
+        //     throw new Exception('A semester with code ' . $newSemCode . ' already exists');
+        // }
+        $semClone = Semester::firstOrCreate(
+            ['code'  => $newSemCode],
+            ['alpha' => $newSemAlpha],
+        );
 
+        $this->loadMissing([
+            'sections' => function ($query) use ($dept_id) {
+                $query->select('sections.id', 'course_id', 'semester_code', 'sections.code', 'student_count', 'sections.syllabus', 'credits', 'quota')
+                    ->join('courses', 'courses.id', '=', 'sections.course_id')
+                    ->where('dept_id', '=', $dept_id);
+            },
+            'sections.professors',
+            'sections.schedules'
+        ]);
         // Copy all sections to new semester
         foreach($this->sections as $section) {
             $sectionClone = $section->replicate();
-            $sectionClone->semester_code = $newSem->code;
-            $sectionClone->save();
+            $sectionClone->semester_code = $semClone->code;
+            $existingSection = Section::where([['semester_code', '=', $sectionClone->semester_code], ['course_id', '=', $sectionClone->course_id], ['code', '=' , $sectionClone->code]])->first();
+            if (!$existingSection) {
+                $sectionClone->save();
 
-            foreach($section->professors as $professor) {
-                $sectionClone->professors()->attach($professor, ['percent' => $professor->pivot->percent]);
-            }
+                foreach($section->professors as $professor) {
+                    $sectionClone->professors()->attach($professor, ['percent' => $professor->pivot->percent]);
+                }
 
-            foreach($section->schedules as $schedule) {
-                $sectionClone->schedules()->save($schedule);
+                foreach($section->schedules as $schedule) {
+                    $scheduleClone = $schedule->replicate();
+                    $scheduleClone->section_id = $sectionClone->id;
+                    $scheduleClone->save();
+                    $sectionClone->schedules()->save($scheduleClone);
+                }
             }
         }
 
-        return $newSem;
+        return $semClone;
     }
 
 }

database/migrations/2019_06_14_162008_create_faculties_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFacultiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('faculties', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('faculties');
+    }
+}

database/migrations/2019_07_07_183013_create_departments_table.php

@@ -14,9 +14,12 @@ class CreateDepartmentsTable extends Migration
     public function up()
     {
         Schema::create('departments', function (Blueprint $table) {
-            $table->unsignedBigInteger('id')->primary();
+            $table->bigIncrements('id');
             $table->string('name')->nullable();
             $table->string('title')->nullable();
+            $table->unsignedBigInteger('faculty_id');
+
+            $table->foreign('faculty_id')->references('id')->on('faculties');
         });
 
         // DB::table('departments')->insert(

resources/js/createPDF.js

@@ -1,41 +1,35 @@
-var fonts = {
-    Roboto: {
-        normal: 'fonts/Roboto-Regular.ttf',
-        bold: 'fonts/Roboto-Medium.ttf',
-        italics: 'fonts/Roboto-Italic.ttf',
-        bolditalics: 'fonts/Roboto-.ttf',
-    }
-};
-
-var pdfMake = require('pdfmake/build/pdfmake.js');
-var pdfFonts = require('pdfmake/build/vfs_fonts.js');
+const pdfMake = require('pdfmake/build/pdfmake.js');
+const pdfFonts = require('pdfmake/build/vfs_fonts.js');
 pdfMake.vfs = pdfFonts.pdfMake.vfs;
 
 function table(course) {
     return {
-        widths: [50, 100, 50, 50],
+        widths: [50, 200, 75, 50, 100],
         headerRows: 2,
         body: [
-            [{text: `${course.code} ${course.title}`, bold: true, colSpan: 4, alignment: 'center'}, {}, {}, {}],
-            ['Seccion', 'Profesor', 'Lugar', 'Horas'],
+            [{text: `${course.code}\n${course.title}`, bold: true, colSpan: 5, alignment: 'center'}, {}, {}, {}, {}],
+            [{text: 'Sección', bold: true}, {text: 'Profesor', bold: true}, {text: 'Lugar', bold: true}, {text: 'Días', bold: true}, {text: 'Horas', bold: true}],
         ].concat( course.sections.map( function(section) {
             var res = [section.code];
-            if (section.hasOwnProperty('professors') && !section.professors.length) {
+            if (section.hasOwnProperty('professors')) {
                 res = res.concat( section.professors.reduce( function (acc, professor) {
-                    return  acc + '\n' + professor.first_name + ' ' + professor.last_name;
-                }));
+                    return  ((acc === '') ? '' : acc + '\n') + professor.first_name + ' ' + professor.last_name;
+                }, ''));
             } else {
                 res = res.concat('');
             }
-            if (section.hasOwnProperty('schedules') && !section.professors.length) {
+            if (section.hasOwnProperty('schedules')) {
+                res = res.concat( section.schedules.reduce( function (acc, schedule) {
+                    return ((acc === '') ? '' : acc + '\n') + schedule.building + ' ' + schedule.room;
+                }, ''));
                 res = res.concat( section.schedules.reduce( function (acc, schedule) {
-                    return acc + '\n' + schedule.building + ' ' + schedule.room;
-                }));
+                    return ((acc === '') ? '' : acc + '\n') + schedule.days;
+                }, ''));
                 res = res.concat( section.schedules.reduce( function (acc, schedule) {
-                    return acc + '\n' + schedule.time_start + '-' + schedule.time_end;
-                }));
+                    return ((acc === '') ? '' : acc + '\n') + schedule.time_start + '-' + schedule.time_end;
+                }, ''));
             } else {
-                res = res.concat(['', '']);
+                res = res.concat(['', '', '']);
             }
             return res;
         }))
@@ -48,10 +42,17 @@ var docDef = {
         {text: 'sujeto a cambios', style: 'header', fontSize: 18},
     ].concat( data.courses.map( function(course) {
         return {
-            style: 'tableStyle',
-            alignment: 'center',
-            table: table(course)
-        }
+            columns: [
+                { width: '*', text: ''}, // Aligns table to center
+                {
+                    style: 'tableStyle',
+                    alignment: 'center',
+                    width: 'auto',
+                    table: table(course)
+                },
+                { width: '*', text: ''}  // Aligns table to center
+            ],
+        };
     })),
     styles: {
         header: {
@@ -60,12 +61,34 @@ var docDef = {
             alignment: 'center',
         },
         tableStyle: {
-            margin: [50,10,0,15]
+            margin: [0,20,0,20]
         },
+    },
+    pageBreakBefore: function(currentNode, followingNodesOnPage, nodesOnNextPage, previousNodesOnPage) {
+        var pageInnerHeight = currentNode.startPosition.pageInnerHeight;
+        var top = (currentNode.startPosition.top) ? currentNode.startPosition.top : 0;
+        var nodeHeight = 0; // Distance from top of table to top of next table
+        if (followingNodesOnPage && followingNodesOnPage.length) {
+            var nextTableNodeIndex = followingNodesOnPage.findIndex( function(n) { return n.table; })
+            if (nextTableNodeIndex !== -1 && nextTableNodeIndex < followingNodesOnPage.length) {
+                nodeHeight = followingNodesOnPage[nextTableNodeIndex].startPosition.top - top;
+            }
+        }
+        // if (currentNode.table) {
+        //     console.log(currentNode);
+        //     console.log(currentNode.pageNumbers)
+        //     console.log(currentNode.table.body[0][0].text);
+        //     console.log('t ' + top);
+        //     console.log('nh ' + nodeHeight);
+        //     console.log('pih ' + pageInnerHeight);
+        //     console.log((top + nodeHeight > pageInnerHeight));
+        // }
+        return (currentNode.table && (top + nodeHeight > pageInnerHeight))
+            || currentNode.startPosition.verticalRatio >= 0.90;
     }
 
 };
 
-console.log(docDef);
-pdfMake.createPdf(docDef).download();
+// console.log(docDef);
+pdfMake.createPdf(docDef).download(data.alpha + '.pdf', function () { window.location.replace('/dashboard')});
 // window.location.replace("/dashboard");

resources/js/dashboard.js

@@ -3,10 +3,6 @@ import {MDCSelect} from '@material/select';
 import {MDCTextField} from '@material/textfield';
 import {MDCTextFieldHelperText} from '@material/textfield/helper-text';
 
-// const dialog = new MDCDialog(document.querySelector('.mdc-dialog'));
-// const semCloneSelect = new MDCSelect(document.querySelector('.mdc-select#sem-clone-select'));
-// const textfield = new MDCTextField(document.querySelector('.mdc-text-field'));
-
 $(document).ready( function() {
     $('#modal-semester').on('show.bs.modal', function (event) {
         var form = $(this).find('#modal-semester-form');
@@ -36,8 +32,6 @@ $(document).ready( function() {
 
         console.log($(this));
         const semCloneSelect = new MDCSelect($(this).find('#sem-clone-select')[0]);
-        // console.log(textfields);
-        // const t1 = new MDCTextField(document.querySelector('.mdc-text-field'));
 
         form.attr('method', 'GET');
         form.removeAttr('action');

resources/sass/app.scss

@@ -182,3 +182,6 @@ h6 {
 button {
     @include mdc-typography(button)
 }
+p {
+    @include mdc-typography(body1)
+}

resources/views/dashboard.blade.php

@@ -27,66 +27,66 @@
         @endif
         <div class="mdc-layout-grid__inner">
             {{-- <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2-desktop"></div> --}}
-            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-4">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
                 <a data-toggle="modal" data-target="#modal-semester" data-action="export" data-title="Escoge un semestre">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-csv" class="mdc-card__media mdc-card__media--square"></div>
                             <hr>
                             <div>
-                                <h3>Generar informe de cargas</h3>
+                                <p>Informe de Cargas</p>
                             </div>
                         </div>
                     </div>
                 </a>
             </div>
-            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-4">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
                 <a data-toggle="modal" data-target="#modal-semester" data-action="schedule" data-title="Escoge un semestre">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-schedule" class="mdc-card__media mdc-card__media--square"></div>
                             <hr>
                             <div>
-                                <h3>Generar horario de semestre</h3>
+                                <p>Horario de Semestre</p>
                             </div>
                         </div>
                     </div>
                 </a>
             </div>
-            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-4">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
                 <a data-toggle="modal" data-target="#modal-user-add">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-schedule" class="mdc-card__media mdc-card__media--square"></div>
                             <hr>
                             <div>
-                                <h3>Anadir usuario</h3>
+                                <p>Añadir Usuario</p>
                             </div>
                         </div>
                     </div>
                 </a>
             </div>
-            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-4">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
                 <a data-toggle="modal" data-target="#modal-semester-clone" data-action="clone" data-title="Escoge un semestre">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-clone" class="mdc-card__media mdc-card__media--square"></div>
                             <hr>
                             <div>
-                                <h3>Copiar un semestre</h3>
+                                <p>Copiar un Semestre</p>
                             </div>
                         </div>
                     </div>
                 </a>
             </div>
-            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-4">
-                <a href="{{ route('exportCourses') }}">
+            <div class="mdc-layout-grid__cell mdc-layout-grid__cell--span-2">
+                <a href="{{ route('exportCourses') }}" style="text-decoration: none; color: inherit;">
                     <div class="mdc-card">
                         <div class="mdc-card__primary-action" tabindex="0">
                             <div id="dash-button-schedule" class="mdc-card__media mdc-card__media--square"></div>
                             <hr>
                             <div>
-                                <h3>Generar informe de cursos</h3>
+                                <p>Informe de Cursos</p>
                             </div>
                         </div>
                     </div>

resources/views/layouts/app.blade.php

@@ -50,8 +50,11 @@
                             {{ $department->title ?: $department->name ?? 'Departamento' }} <span class="caret"></span>
                         </a>
                         <div class="dropdown-menu">
-                            @foreach (App\Department::whereNotNull('name')->orderBy('title')->get() as $dept)
-                                <a class="dropdown-item mdc-typography--body1" href="{{ url()->current() }}?setdept={{ $dept->id }}">{{ $dept->title ?: $dept->name }}</a>
+                            @foreach (App\Faculty::orderBy('name')->get() as $faculty)
+                                <a class="dropdown-item mdc-typography--body1" href="{{ url()->current() }}?setfac={{ $faculty->id }}">{{ $faculty->name }}</a>
+                                @foreach ($faculty->departments as $dept)
+                                    <a class="dropdown-item mdc-typography--body2" href="{{ url()->current() }}?setdept={{ $dept->id }}" style="padding-left:4em;">{{ $dept->title ?: $dept->name }}</a>
+                                @endforeach
                             @endforeach
                         </div>
                     </li>

routes/web.php

@@ -30,9 +30,9 @@ Route::resource('section', 'SectionController')->only([
 Route::get('/dashboard', 'DashboardController@index')->name('dashboard');
 Route::post('/dashboard/schedule/{semester}', 'DashboardController@schedule')->name('schedule');
 Route::post('/dashboard/export/{semester}', 'DashboardController@export')->name('export');
-Route::post('/dashboard/export-courses', 'DashboardController@exportCourses')->name('exportCourses');
 Route::post('/dashboard/clone/{semester}', 'DashboardController@cloneSemester')->name('cloneSemester');
 Route::post('/dashboard/add-user', 'DashboardController@addUser')->name('addUser');
+Route::get('/dashboard/export-courses', 'DashboardController@exportCourses')->name('exportCourses');
 
 Route::get('/login', 'Auth\LoginController@redirectToProvider')->name('login');
 Route::get('/callback', 'Auth\LoginController@handleProviderCallback')->name('callback');