Merge pull request #239 from hpi-sam/238-generate-personnel-names

generate personnel name
hpi-sam · Jun 10, 2024 · ed37496 · ed37496
2 parents 41c37b0 + 88f3b09
commit ed37496
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/backend/dps_training_k/game/consumers/trainer_consumer.py b/backend/dps_training_k/game/consumers/trainer_consumer.py
@@ -105,6 +105,7 @@ def __init__(self, *args, **kwargs):
             self.TrainerIncomingMessageTypes.PERSONNEL_ADD: (
                 self.handle_add_personnel,
                 "areaId",
+                "personnelName"
             ),
             self.TrainerIncomingMessageTypes.PERSONNEL_DELETE: (
                 self.handle_delete_personnel,
@@ -325,10 +326,10 @@ def handle_update_patient(self, _, patient_frontend_id, code):
             patient.static_information = new_patient_information
             patient.save(update_fields=["static_information"])
 
-    def handle_add_personnel(self, _, areaId):
+    def handle_add_personnel(self, _, areaId, personnel_name):
         try:
             area = Area.objects.get(id=areaId)
-            Personnel.create_personnel(area=area, name="Personal")
+            Personnel.create_personnel(area=area, name=personnel_name)
         except Area.DoesNotExist:
             self.send_failure(
                 f"No area found with the id '{areaId}'",

diff --git a/frontend/src/components/screensTrainer/pagesResourceCreation/PagePersonnel.vue b/frontend/src/components/screensTrainer/pagesResourceCreation/PagePersonnel.vue
@@ -7,6 +7,7 @@
 	import IconButton from '@/components/widgets/IconButton.vue'
 	import {svg} from "@/assets/Svg"
 	import RenamePopup from '@/components/widgets/RenamePopup.vue'
+	import { generateName } from '@/utils'
 
 	const props = defineProps({
 		currentArea: {
@@ -36,7 +37,7 @@
 	}
 
 	function addPersonnel() {
-		socketTrainer.personnelAdd(props.currentArea)
+		socketTrainer.personnelAdd(props.currentArea, generateName())
 	}
 
 	function deletePersonnel() {

diff --git a/frontend/src/sockets/SocketTrainer.ts b/frontend/src/sockets/SocketTrainer.ts
@@ -182,10 +182,11 @@ class SocketTrainer {
 		}))
 	}
 
-	personnelAdd(areaId: number) {
+	personnelAdd(areaId: number, personnelName: string) {
 		this.#sendMessage(JSON.stringify({
 			'messageType': 'personnel-add',
-			'areaId': areaId
+			'areaId': areaId,
+			'personnelName': personnelName
 		}))
 	}