Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo

packages/database/prisma/json/MissionVehicleLog.ts

@@ -1,6 +1,17 @@
 import { Station } from "../../generated/client";
 import { PublicUser } from "./User";
 
+export interface MissionVehicleLog {
+	type: "vehicle-log";
+	auto: true;
+	timeStamp: string;
+	data: {
+		vehicleName: string;
+		oldStatus: string;
+		newStatus: string;
+	};
+}
+
 export interface MissionStationLog {
 	type: "station-log";
 	auto: true;
@@ -62,4 +73,5 @@ export type MissionLog =
 	| MissionMessageLog
 	| MissionSdsLog
 	| MissionAlertLog
-	| MissionCompletedLog;
+	| MissionCompletedLog
+	| MissionVehicleLog;

packages/database/prisma/json/OSMway.ts

@@ -1,4 +1,5 @@
 export interface OSMWay {
+	isSelected: boolean;
 	wayID: number;
 	tags: Record<string, string>;
 	nodes: {

packages/database/prisma/json/SocketEvents.ts

@@ -1,6 +1,7 @@
 import { Mission } from "../../generated/client";
+import { PublicUser } from "./User";
 
-interface ValidationFailed {
+export interface ValidationFailed {
 	type: "hpg-validation";
 	status: "failed";
 	message: string;
@@ -9,7 +10,7 @@ interface ValidationFailed {
 	};
 }
 
-interface ValidationSuccess {
+export interface ValidationSuccess {
 	type: "hpg-validation";
 	status: "success";
 	message: string;
@@ -18,4 +19,13 @@ interface ValidationSuccess {
 	};
 }
 
-export type NotificationPayload = ValidationFailed | ValidationSuccess;
+export interface AdminMessage {
+	type: "admin-message";
+	status: "kick" | "ban";
+	message: string;
+	data?: {
+		admin: PublicUser;
+	};
+}
+
+export type NotificationPayload = ValidationFailed | ValidationSuccess | AdminMessage;

packages/database/prisma/json/User.ts

@@ -8,6 +8,13 @@ export interface PublicUser {
 	fullName: string;
 }
 
+export const DISCORD_ROLES = {
+	ONLINE_DISPATCHER: "1287399540390891571", // Replace with actual role ID
+	ONLINE_PILOT: "1287399540390891571", // Replace with actual role ID
+	DISPATCHER: "1081247459994501222",
+	PILOT: "1081247405304975390",
+};
+
 export const getPublicUser = (
 	user: User,
 	options = {

packages/database/prisma/schema/event.prisma

@@ -22,7 +22,6 @@ model Participant {
     finisherMoodleCurseCompleted Boolean  @default(false)
     attended                     Boolean  @default(false)
     appointmentCancelled         Boolean  @default(false)
-    completetionWorkflowFinished Boolean  @default(false)
     eventAppointmentId           Int?
     enscriptionDate              DateTime @default(now())
 

packages/database/prisma/schema/user.prisma

@@ -15,6 +15,7 @@ enum PERMISSION {
     ADMIN_STATION
     ADMIN_KEYWORD
     ADMIN_MESSAGE
+    ADMIN_KICK
     AUDIO
     PILOT
     DISPO
@@ -35,6 +36,7 @@ model User {
     settingsMicDevice    String? @map(name: "settings_mic_device")
     settingsMicVolume    Float?  @map(name: "settings_mic_volume")
     settingsDmeVolume    Float?  @map(name: "settings_dme_volume")
+    settingsRadioVolume  Float?  @map(name: "settings_funk_volume")
     settingsHideLastname Boolean @default(false) @map(name: "settings_hide_lastname")
 
     // email Verification: