From 7b20459210483bb22e0cff39eb499a22b25e9806 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 22 Jul 2021 11:35:59 +0200
Subject: [PATCH] zusatz

---
 .DS_Store                              | Bin 6148 -> 6148 bytes
 lib/Service/GroupPermissionService.php |   4 ++--
 src/components/Group.vue               |  18 +++++++++++-------
 src/components/Navigation.vue          |   5 +++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 24734140aa1b39bdf68506eaad2fa9871ad3defb..cf38135edbe027009c6bfce5304f9e70c5fde44f 100644
GIT binary patch
delta 94
zcmZoMXffDe%E<gZVb)|GMj4UZd>5CboctsP1_q8P-!=NG-48oLB~q|T@E2ql1}Ep|
Z765fH2s;UEzQ}0CHnD+kGdss$egKT-9S{Hj

delta 94
zcmZoMXffDe%E;`y?!aUoMj4UZd>5CboctsP1_q8QsdLi*Ob$CjB~q|T@E2ql1}Ep|
Z765fH2z?INe38+NZDIr8W_FIh`~YKB9U=e#

diff --git a/lib/Service/GroupPermissionService.php b/lib/Service/GroupPermissionService.php
index 7bddff7..a13a413 100644
--- a/lib/Service/GroupPermissionService.php
+++ b/lib/Service/GroupPermissionService.php
@@ -27,7 +27,7 @@ class GroupPermissionService {
         }
     }
 
-    //Find an Agency
+    //Find a permission
     public function find(int $id) {
         try {
             return $this->mapper->find($id);
@@ -36,7 +36,7 @@ class GroupPermissionService {
         }
     }
 
-    //Create an Agency
+    //Create a Permission
     public function create(string $gid, string $permission = "") {
         $grouppermission = new GroupPermission();
         $grouppermission->setGid($gid);
diff --git a/src/components/Group.vue b/src/components/Group.vue
index 5af717b..4e9538c 100644
--- a/src/components/Group.vue
+++ b/src/components/Group.vue
@@ -13,6 +13,13 @@
 				size="sm"
 				variant=""
 				@click="delGroup(group.gid)">
+				<b-icon icon="pencil-fill" aria-hidden="true" />
+			</b-button>
+			<b-button v-if="!group.isDefault"
+				style="float: right;"
+				size="sm"
+				variant="danger"
+				@click="delGroup(group.gid)">
 				<b-icon icon="trash-fill" aria-hidden="true" />
 			</b-button>
 		</b-card-header>
@@ -21,10 +28,8 @@
 			role="tabpanel">
 			<b-card-body>
 				<Permission :groupid="group.gid" />
-				The GroupId is {{ group.gid }} <br>
-				<span v-if="group.isDefault">Ist default</span>
-				<span v-else>Nicht default</span>
 				<hr>
+				Gruppenmitglieder
 				<Multiselect v-if="!group.isMainGroup"
 					v-model="value"
 					:options="formattedContributors"
@@ -32,7 +37,7 @@
 					placeholder="Mitarbeiter hinzufügen"
 					track-by="user"
 					:multiple="true"
-					style="width: 350px"
+					style="width: 450px"
 					@input="updateContributorsValue()">
 					<template #singleLabel="{ option }">
 						<ListItemIcon v-bind="option"
@@ -121,9 +126,8 @@ export default {
 			this.$root.$emit('bv::toggle::collapse', this.groupDefId + ele)
 		},
 		async delGroupFinal(id) {
-			const r = await axios.get(generateUrl('/apps/agency/delagencygroup/' + this.group.gid))
-			console.log(r)
-			// TODO: Hier eine Mitteilung einbauen, damit der User weiß, was abging
+			await axios.get(generateUrl('/apps/agency/delagencygroup/' + this.group.gid))
+			// TODO: Notification "A Group was deleted!"
 			this.$emit('updateGroupData')
 		},
 		delGroup(id) {
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index f155ea3..721667b 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -13,9 +13,10 @@
 			<AppNavigationItem to="/groupmanagement"
 				title="Gruppen"
 				icon="icon-group" />
-			<AppNavigationItem to=""
+			<!-- TODO: Module später zum programmieren usw. -->
+			<!--<AppNavigationItem to=""
 				title="Module"
-				icon="" />
+				icon="" />-->
 			<AppNavigationItem to="/testing"
 				title="Tests"
 				icon="icon-category-customization" />