Skip to content
Snippets Groups Projects
Commit 4c5ac9b6 authored by Rafi Zereselasie (raz070)'s avatar Rafi Zereselasie (raz070)
Browse files

Now supports position data. Made the made changes to some cases and methods to...

Now supports position data. Made the made changes to some cases and methods to make distinctions between employees trained positions and positions in general.
parent 27ee9e34
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@ package com.example.scheduler_server;
import java.io.*;
import java.net.*;
import java.util.Locale;
/*
Name: UserThread
......@@ -50,6 +51,8 @@ public class UserThread extends Thread {
sendMessage(serverMessage);
serverMessage = dbQuery.timeOff.allTimeOff();
sendMessage(serverMessage);
serverMessage = dbQuery.positions.allPositions();
sendMessage(serverMessage);
do {
clientMessage = reader.readLine();
......@@ -104,7 +107,8 @@ public class UserThread extends Thread {
break;
case "addShift":
try {
String newShift = dbQuery.schedule.addShift(Integer.parseInt(args[1]), args[2], Integer.parseInt(args[3]), Integer.parseInt(args[4]));
String newShift = dbQuery.schedule.addShift(Integer.parseInt(args[1]), args[2],
Integer.parseInt(args[3]), Integer.parseInt(args[4]), args[5]);
if (!newShift.isEmpty()){
server.broadcast("addShift/" + newShift);
}
......@@ -182,21 +186,54 @@ public class UserThread extends Thread {
}
break;
case "addPosition":
try {
String newPosition = dbQuery.positions.addPosition(args[1], Integer.parseInt(args[2]));
if (!newPosition.isEmpty()) {
server.broadcast("addPosition/" + newPosition);
}
} catch (NumberFormatException exception) {
System.out.println("Error: Formatting exception while setting time off approval");
exception.printStackTrace();
}
break;
case "editPosition":
try {
String editedPosition = dbQuery.positions.editPosition(args[1], Float.parseFloat(args[2]));
if (!editedPosition.isEmpty()) {
server.broadcast("addPosition/" + editedPosition);
}
} catch (NumberFormatException exception) {
System.out.println("Error: Formatting exception while setting time off approval");
exception.printStackTrace();
}
break;
case "removePosition":
try {
dbQuery.staff.removePositionALLEmployee(args[1]);
dbQuery.positions.removePosition(args[1]);
server.broadcast("removePositionAllEmployees/" + args[1].toLowerCase(Locale.ROOT));
server.broadcast("removePosition/" + args[1].toLowerCase(Locale.ROOT));
} catch (NumberFormatException exception) {
System.out.println("Error: Formatting exception while setting time off approval");
exception.printStackTrace();
}
break;
case "addEmployeePosition":
try {
String addedPosition = dbQuery.staff.addPosition(Integer.parseInt(args[1]), args[2]);
if (!addedPosition.isEmpty()) {
server.broadcast("addPosition/" + addedPosition);
server.broadcast("addEmployeePosition/" + addedPosition);
}
} catch (NumberFormatException exception) {
System.out.println("Error: Formatting exception while setting time off approval");
exception.printStackTrace();
}
break;
case "removePosition":
case "removeEmployeePosition":
try {
String removedPosition = dbQuery.staff.removePosition(Integer.parseInt(args[1]), args[2]);
if (!removedPosition.isEmpty()) {
server.broadcast("removePosition/" + removedPosition);
server.broadcast("removeEmployeePosition/" + removedPosition);
}
} catch (NumberFormatException exception) {
System.out.println("Error: Formatting exception while setting time off approval");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment