diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41a..264b222 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -94,7 +94,6 @@ http://schemas.android.com/apk/res/android - ANDROID_ATTRIBUTE_ORDER
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 53794c2..ccb5fee 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -59,7 +59,7 @@ class rolesController extends Controller ]); $brugerPermissions = new Collection(); - if (!$request->value === null) { + if ($request->value !== null) { foreach ($request->value as $valuee) { $brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", $valuee)->first()); } diff --git a/skolehjem/resources/views/admin/roles/create.blade.php b/skolehjem/resources/views/admin/roles/create.blade.php index 037d309..c078dd4 100644 --- a/skolehjem/resources/views/admin/roles/create.blade.php +++ b/skolehjem/resources/views/admin/roles/create.blade.php @@ -301,8 +301,7 @@ }); }) - //User hide permissions - + // hide permissions $('#konto').hide(); $('#admin').hide(); diff --git a/skolehjem/resources/views/admin/roles/edit.blade.php b/skolehjem/resources/views/admin/roles/edit.blade.php index 777f39e..114334b 100644 --- a/skolehjem/resources/views/admin/roles/edit.blade.php +++ b/skolehjem/resources/views/admin/roles/edit.blade.php @@ -10,6 +10,23 @@ @endsection @section("content") +

Rediger Rolle:

$role]) }}"> @csrf @@ -19,6 +36,209 @@ + + +
+ + +
+ + +
+ Her kan alle basale rettigheder for appens forbrugere slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KontoBeskrivelseCreateReadDelete
Konto

Egen bruger

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

FeedbackEmpty
+
+ + + +
+ Her kan alle rettigheder for administrationssiden slås til eller fra. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SideBeskrivelseCreateReadUpdateDeleteFuld Kontrol
Admin Panel

Adgang til admin panelet

Brugere

Empty

Roller

Empty

Nyheder

Empty

Menuplan

Empty

Aktiviteter

Empty

Lokation

Empty

Vaskemaskiner

Empty

ReservationerEmpty
Kontakter

Empty

Vejledning

Empty

Feedback

Empty

+
+ +
@endsection @@ -82,5 +302,39 @@ } }); }) + + + // hide permissions + $('#konto').hide(); + $('#admin').hide(); + + + //Show konto settings + $("#kontoButton").click(function(){ + var value = $('#kontoButton').text(); + if(value === 'Rediger konto rettigheder'){ + $('#konto').slideDown('slow'); + $('#kontoButton').html('Luk konto rettigheder') + }else{ + $('#konto').slideUp('slow'); + $('#kontoButton').html('Rediger konto rettigheder') + } + }); + + + //Show admin permissions + $("#adminButton").click(function(){ + var value = $('#adminButton').text(); + if(value === 'Rediger admin rettigheder'){ + $('#admin').slideDown('slow'); + $('#adminButton').html('Luk admin rettigheder') + }else{ + $('#admin').slideUp('slow'); + $('#adminButton').html('Rediger admin rettigheder') + } + }); + + + @endsection