+
=> {
+ const fetch_employees = useCallback(async (): Promise => {
const res = await fetch('/api/v2/get_employees', {
method: 'GET',
headers: {
@@ -41,28 +29,39 @@ export default function Table({ employees }: { employees: Employee[] }) {
return res.json() as Promise;
}, []);
- useEffect(() => {
- const fetchAndUpdateEmployees = async () => {
- const updatedEmployees = await fetchEmployees();
- setEmployeeData(updatedEmployees);
- };
-
- fetchAndUpdateEmployees()
- .catch((error) => {
- console.error('Error fetching employees:', error);
- });
-
- const intervalId = setInterval(() => {
- (async () => {
- await fetchAndUpdateEmployees();
- })()
- .catch((error) => {
- console.error('Error fetching employees:', error);
+ const update_status = async () => {
+ if (!session) {
+ alert("You must be signed in to update status.");
+ return;
+ }
+ // If no employee is selected and status is not empty
+ if (selectedIds.length === 0 && employeeStatus.trim() !== '') {
+ const cur_user = employees.find(employee => employee.name === session.user?.name);
+ if (cur_user) {
+ await fetch('/api/v2/update_status', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${process.env.API_KEY}`
+ },
+ body: JSON.stringify({ employeeIds: [cur_user.id], newStatus: employeeStatus }),
+ });
+ }
+ } else if (employeeStatus.trim() !== '') {
+ await fetch('/api/v2/update_status', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${process.env.API_KEY}`
+ },
+ body: JSON.stringify({ employeeIds: selectedIds, newStatus: employeeStatus }),
});
- }, 10000); // Poll every 10 seconds
-
- return () => clearInterval(intervalId); // Clear interval on component unmount
- }, [fetchEmployees]);
+ }
+ const updatedEmployees = await fetch_employees();
+ setEmployeeData(updatedEmployees);
+ setSelectedIds([]);
+ setStatus('');
+ };
const handleCheckboxChange = (id: number) => {
setSelectedIds((prevSelected) =>
@@ -82,59 +81,18 @@ export default function Table({ employees }: { employees: Employee[] }) {
}
};
- useEffect(() => {
- if (selectedIds.length === employeeData.length && employeeData.length > 0) {
- setSelectAll(true);
- } else {
- setSelectAll(false);
- }
- }, [selectedIds, employeeData]);
-
const handleStatusChange = (e: React.ChangeEvent) => {
setStatus(e.target.value);
};
-const handleSubmit = async () => {
- if (!session) {
- alert("You must be signed in to update status.");
- return;
- }
- // If no employee is selected and status is not empty
- if (selectedIds.length === 0 && employeeStatus.trim() !== '') {
- const cur_user = employees.find(employee => employee.name === session.user?.name);
- if (cur_user) {
- await fetch('/api/v2/update_status', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': `Bearer ${process.env.API_KEY}`
- },
- body: JSON.stringify({ employeeIds: [cur_user.id], newStatus: employeeStatus }),
- });
- }
- } else if (employeeStatus.trim() !== '') {
- await fetch('/api/v2/update_status', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': `Bearer ${process.env.API_KEY}`
- },
- body: JSON.stringify({ employeeIds: selectedIds, newStatus: employeeStatus }),
- });
- }
- // Optionally refresh data on the client-side after update
- const updatedEmployees = await fetchEmployees();
- setEmployeeData(updatedEmployees);
- setSelectedIds([]);
- setStatus('');
-};
-
- const handleKeyPress = async (e: React.KeyboardEvent) => {
+ const handleKeyDown = async (e: React.KeyboardEvent) => {
if (e.key === 'Enter') {
- await handleSubmit();
+ await update_status();
+ // if key is i then focus text input
}
};
+ // Format time for display
const formatTime = (timestamp: Date) => {
const date = new Date(timestamp);
const time = date.toLocaleTimeString('en-US', {
@@ -145,64 +103,121 @@ const handleSubmit = async () => {
const month = date.toLocaleString('default', { month: 'long' });
return `${time} - ${month} ${day}`;
};
+
+ // Loading bar while we wait for auth
+ useEffect(() => {
+ if (status !== "loading") {
+ setLoading(false);
+ }
+ }, [status]);
+
+ // Refresh employee data if needed after state updates
+ useEffect(() => {
+ setEmployeeData(employees);
+ }, [employees]);
+
+ // Fetch employees from the server every 10 seconds
+ useEffect(() => {
+ const fetchAndUpdateEmployees = async () => {
+ const updatedEmployees = await fetch_employees();
+ setEmployeeData(updatedEmployees);
+ };
+ fetchAndUpdateEmployees()
+ .catch((error) => {
+ console.error('Error fetching employees:', error);
+ });
+ const intervalId = setInterval(() => {
+ (async () => {
+ await fetchAndUpdateEmployees();
+ })()
+ .catch((error) => {
+ console.error('Error fetching employees:', error);
+ });
+ }, 10000); // Poll every 10 seconds
+
+ return () => clearInterval(intervalId); // Clear interval on component unmount
+ }, [fetch_employees]);
+
+ // Handle checkbox changes
+ useEffect(() => {
+ if (selectedIds.length === employeeData.length && employeeData.length > 0) {
+ setSelectAll(true);
+ } else {
+ setSelectAll(false);
+ }
+ }, [selectedIds, employeeData]);
+
if (loading) return
- );
+ );
+ }
}
diff --git a/src/server/functions.ts b/src/server/functions.ts
index 8ed40b2..df494e1 100644
--- a/src/server/functions.ts
+++ b/src/server/functions.ts
@@ -2,37 +2,29 @@ import "server-only";
import { db } from "~/server/db";
import { sql } from "drizzle-orm";
-// Function to Get Employees
export const getEmployees = async () => {
return await db.query.users.findMany({
orderBy: (model, { asc }) => asc(model.id),
});
};
-// Uncomment this and change updatedAt below if using localhost and you want correct time.
-// I dont know why it is like this.
-//const convertToUTC = (date: Date) => {
- //return new Date(date.setHours(date.getUTCHours())+ 5);
-//};
-
-// Function to Update Employee Status using Raw SQL
-export const updateEmployeeStatus = async (employeeIds: string[], newStatus: string) => {
+// Update Employee Status uses Raw SQL because Drizzle ORM doesn't support
+// update with MySQL
+export const updateEmployeeStatus =
+ async (employeeIds: string[], newStatus: string) => {
try {
// Convert array of ids to a format suitable for SQL query (comma-separated string)
const idList = employeeIds.map(id => parseInt(id, 10));
- //const updatedAt = convertToUTC(new Date());
- const updatedAt = new Date(); // Do not change for PROD! It acts different on PROD
-
- // Prepare the query using drizzle-orm's template-like syntax for escaping variables
+ let updatedAt = new Date();
+ // Not sure why but localhost is off by 5 hours
+ if (process.env.NODE_ENV === 'development')
+ updatedAt = new Date(updatedAt.setHours(updatedAt.getUTCHours())+ 5);
const query = sql`
UPDATE users
SET status = ${newStatus}, updatedAt = ${updatedAt}
WHERE id IN ${idList}
`;
-
- // Execute the query
await db.execute(query);
-
return { success: true };
} catch (error) {
console.error("Error updating employee status:", error);
@@ -40,15 +32,32 @@ export const updateEmployeeStatus = async (employeeIds: string[], newStatus: str
}
};
-// Legacy Functions for Legacy API for iOS App
+// Function to Update Employee Status by Name using Raw SQL
+export const updateEmployeeStatusByName =
+ async (technicians:{ name: string, status: string }[]) => {
+ try {
+ for (const technician of technicians) {
+ const { name, status } = technician;
+ const query = sql`
+ UPDATE users
+ SET status = ${status}, updatedAt = ${new Date()}
+ WHERE name = ${name}
+ `;
+ await db.execute(query);
+ }
+ return { success: true };
+ } catch (error) {
+ console.error("Error updating employee status by name:", error);
+ throw new Error("Failed to update status by name");
+ }
+};
-// Type definitions
+// Type definitions for Paginated History API
interface HistoryEntry {
name: string;
status: string;
time: Date;
}
-
interface PaginatedHistory {
data: HistoryEntry[];
meta: {
@@ -59,25 +68,9 @@ interface PaginatedHistory {
}
}
-export const legacyGetEmployees = async () => {
- const employees = await db.query.users.findMany({
- orderBy: (model, { asc }) => asc(model.id),
- });
- if (employees.length === 0) {
- return [];
- }
- for (const employee of employees) {
- const date = new Date(employee.updatedAt);
- employee.updatedAt = date;
- }
- return employees;
-};
-
-// Function to Get History Data with Pagination using Raw SQL
-export const legacyGetHistory = async (page: number, perPage: number): Promise+ font-bold pl-2 md:pl-12 text-transparent bg-clip-text"> Tech Tracker
-
-
-
+
- | - - | -Name | -Status | -Updated At | -||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
+ else {
+ return (
+
+
-
-
+
+
+ {employeeData.map((employee) => (
+
+ handleCheckboxChange(employee.id)}
+ />
+ |
+
+ {employee.name}
+ |
+
+ {employee.status}
+ |
+
+ {formatTime(employee.updatedAt)}
+ |
+ |
+
+
+
({ name: row.name, status: row.status, time: new Date(row.updatedAt), })); - return { data: formattedResults, meta: { @@ -121,25 +109,3 @@ export const legacyGetHistory = async (page: number, perPage: number): Promise
{ - try { - // Prepare and execute the queries for each technician - for (const technician of technicians) { - const { name, status } = technician; - const utcdate: Date = new Date(); - const query = sql` - UPDATE users - SET status = ${status}, updatedAt = ${utcdate} - WHERE name = ${name} - `; - - await db.execute(query); - } - - return { success: true }; - } catch (error) { - console.error("Error updating employee status by name:", error); - throw new Error("Failed to update status by name"); - } -};