add perankingan

app/Http/Controllers/HasilPerhitunganController.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Http\Controllers;
 
 use App\Models\Alternatif;

database/migrations/2014_10_12_000000_create_users_table.php

@@ -18,7 +18,7 @@ class CreateUsersTable extends Migration
             $table->string('name');
             $table->string('username')->unique();
             $table->string('password');
-            $table->enum('roles', ['admin', 'penguji'])->default('penguji');
+            $table->enum('roles', ['admin', 'penilai'])->default('penilai');
             $table->timestamps();
         });
     }

database/seeders/UsersSeeder.php

@@ -22,10 +22,10 @@ class UsersSeeder extends Seeder
                 'roles' => 'admin',
             ],
             [
-                'name' => 'Penguji 1',
+                'name' => 'penilai 1',
-                'username' => 'penguji1',
+                'username' => 'penilai1',
-                'password' => bcrypt('penguji01'),
+                'password' => bcrypt('penilai01'),
-                'roles' => 'penguji',
+                'roles' => 'penilai',
             ],
         ];
 

resources/views/pages/penilaian/form.blade.php

@@ -77,6 +77,7 @@
         </div>
     </form>
 </div>
+<<<<<<< HEAD
 
 <script>
     function goBack() {
@@ -84,4 +85,6 @@
     }
 </script>
 
+=======
+>>>>>>> afe2ff37056cbc2ba48d0f5e5a38a8407f5789d8
 @endsection

resources/views/pages/penilaian/index.blade.php

@@ -71,6 +71,7 @@
         $('#dataTable').DataTable();
     });
 
+<<<<<<< HEAD
     function deletePenilaian(kodeAlternatif, periode) {
         Swal.fire({
             title: 'Apakah Anda yakin?',
@@ -111,4 +112,8 @@
 <script src="{{ url('sbAdmin/vendor/datatables/jquery.dataTables.min.js') }}"></script>
 <script src="{{ url('sbAdmin/vendor/datatables/dataTables.bootstrap4.min.js') }}"></script>
 
+=======
+    <!-- Page level custom scripts -->
+    <script src="{{ url('sbAdmin/js/demo/datatables-demo.js') }}"></script>
+>>>>>>> afe2ff37056cbc2ba48d0f5e5a38a8407f5789d8
 @endpush