Merge branch 'master' of http://gitlab.informatika.org/INAgakure/templatePPL2

app/Http/routes.php

@@ -11,11 +11,6 @@
 |
 */
 
-Route::get('/', function () {
-    return view('welcome');
-});
-
-
 Route::group(['middleware' => 'web'], function () {
     Route::auth();
 

app/Permission.php → app/Role.php

@@ -4,10 +4,10 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Permission extends Model
+class Role extends Model
 {
     public function users()
     {
-        return $this->hasMany('App\User')->withTimestamps();
+        return $this->hasMany('App\User', 'role_id');
     }
 }

app/Schedule.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Schedule extends Model
+{
+    public function users()
+    {
+        return $this->belongsTo('App\User');
+    }
+
+    public function tps()
+    {
+        return $this->belongsTo('App\Tps');
+    }
+}

app/Tps.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Tps extends Model
+{
+    public function schedule()
+    {
+        return $this->hasMany('App\Schedule', 'id_tps');
+    }
+}

app/User.php

@@ -24,8 +24,13 @@ class User extends Authenticatable
         'password', 'remember_token',
     ];
 
-    public function permissions()
+    public function roles()
     {
-        return $this->belongsToMany('App\Permission')->withTimestamps();
+        return $this->belongsTo('App\Role');
+    }
+
+    public function schedule()
+    {
+        return $this->hasMany('App\Schedule', 'id_user');
     }
 }

database/migrations/2016_03_31_095953_create_users_table.php

@@ -18,6 +18,7 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('email')->unique();
             $table->string('password');
+            $table->integer('role_id')->unsigned();
             $table->rememberToken();
             $table->timestamps();
         }); 

database/migrations/2016_03_31_092434_create_permissions_table.php → database/migrations/2016_04_01_092434_create_roles_table.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreatePermissionsTable extends Migration 
+class CreateRolesTable extends Migration 
 {
     /**
      * Run the migrations.
@@ -12,11 +12,10 @@ class CreatePermissionsTable extends Migration
      */
     public function up()
     {
-        Schema::create('permissions', function(Blueprint $table)
+        Schema::create('roles', function(Blueprint $table)
         {
             $table->increments('id');
             $table->string('name');
-            $table->string('slug')->unique();
             $table->text('description')->nullable();
             $table->timestamps();
         });
@@ -29,6 +28,6 @@ class CreatePermissionsTable extends Migration
      */
     public function down()
     {
-        Schema::drop('permissions');
+        Schema::drop('roles');
     }
 }
\ No newline at end of file

database/migrations/2016_03_31_092544_create_permission_user_table.php → database/migrations/2016_04_02_171120_create_tps_table.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreatePermissionUserTable extends Migration 
+class CreateTpsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -12,13 +12,14 @@ class CreatePermissionUserTable extends Migration
      */
     public function up()
     {
-        Schema::create('permission_user', function(Blueprint $table)
+        Schema::create('tps', function(Blueprint $table)
         {
             $table->increments('id');
-            $table->integer('permission_id');
-            $table->integer('user_id');
+            $table->integer('capacity_now');
+            $table->integer('capacity_full');
+            $table->integer('manager_id')->unsigned();
             $table->timestamps();
-        });
+        }); 
     }
 
     /**
@@ -28,7 +29,6 @@ class CreatePermissionUserTable extends Migration
      */
     public function down()
     {
-        Schema::drop('permission_user');
+        Schema::drop('tps');
     }
-
-}
+}
\ No newline at end of file

database/migrations/2016_04_02_172129_create_schedule_table.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateScheduleTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('schedule', function(Blueprint $table)
+        {
+            $table->increments('id');
+            $table->integer('id_tps')->unsigned();
+            $table->integer('id_user')->unsigned();
+            $table->timestamp('time');
+            $table->timestamps();
+        }); 
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('schedule');
+    }
+}