Floor {data.slug}
- {mqttMessage} - +
+
+
+ Statistics
+
+
+
+
+
+
+ {selectedSensorConfig.label}
+
+
+
+
+ {/if}
+
+
+
diff --git a/src/routes/(app)/[slug]/stats/+server.ts b/src/routes/(app)/[slug]/stats/+server.ts
new file mode 100644
index 0000000..fc68394
--- /dev/null
+++ b/src/routes/(app)/[slug]/stats/+server.ts
@@ -0,0 +1,28 @@
+import { db } from "$lib/server/db";
+import * as table from "$lib/server/db/schema"
+
+export const GET = async () => {
+ // Get all sensor data (like the original working version)
+ const rawData = await db.select({
+ altitude: table.sensorData.altitude,
+ humidity: table.sensorData.humidity,
+ pressure: table.sensorData.pressure,
+ temperature: table.sensorData.temperature,
+ date: table.sensorData.time,
+ }).from(table.sensorData);
+
+ // Scale pressure values to be in a similar range as other sensors
+ // Divide by 1000 to convert from Pa to kPa (more reasonable scale)
+ const data = rawData.map(item => ({
+ ...item,
+ pressure: Math.round((item.pressure / 1000) * 10) / 10 // Convert to kPa with 1 decimal place
+ }));
+
+ console.log(`Returning ${data.length} data points`);
+
+ return new Response(JSON.stringify(data), {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ });
+}
diff --git a/src/routes/(app)/settings/+page.server.js b/src/routes/(app)/settings/+page.server.js
index 365a6b8..1939028 100644
--- a/src/routes/(app)/settings/+page.server.js
+++ b/src/routes/(app)/settings/+page.server.js
@@ -1,10 +1,35 @@
import { db } from "$lib/server/db";
import * as table from "$lib/server/db/schema";
+import { getCurrentDevices } from "$lib/server/mqtt-devices.js";
import { fail } from "@sveltejs/kit";
import { eq } from "drizzle-orm";
export const load = async (event) => {
- return {};
+ // Fetch all available floors
+ const floors = await db
+ .select({ floor: table.floors.floor })
+ .from(table.floors)
+ .orderBy(table.floors.floor);
+
+ // Get real connected devices from MQTT
+ let devices = getCurrentDevices();
+
+ // If no real devices, provide fallback mock devices
+ if (devices.length === 0) {
+ devices = [
+ {
+ id: "no-devices",
+ name: "No ESP8266 devices connected",
+ type: "esp8266",
+ status: "offline",
+ },
+ ];
+ }
+
+ return {
+ floors: floors.map((f) => f.floor),
+ devices: devices,
+ };
};
export const actions = {
@@ -41,4 +66,52 @@ export const actions = {
await db.delete(table.floors).where(eq(table.floors.floor, n));
},
+ savefloor: async (event) => {
+ const formData = await event.request.formData();
+ const floorNumber = formData.get("floorNumber");
+ const floorPlanImage = formData.get("floorPlanImage");
+ const devices = formData.get("devices");
+
+ const n = Number(floorNumber);
+ if (isNaN(n)) return fail(400, { message: "Invalid floor number!" });
+
+ if (!floorPlanImage || !devices) {
+ return fail(400, { message: "Missing floor plan or device configuration!" });
+ }
+
+ try {
+ const deviceData = JSON.parse(devices);
+ deviceData.forEach(async (dev) => {
+ await db.insert(table.sensors).values({ id: dev.id, user: event.locals.session.userId });
+ });
+
+ // Check if floor exists
+ const exists = await db
+ .select({ floor: table.floors.floor })
+ .from(table.floors)
+ .where(eq(table.floors.floor, n));
+
+ if (exists.length === 0) {
+ return fail(400, { message: `Floor ${n} does not exist! Please create it first.` });
+ }
+
+ // Update floor with configuration
+ // Note: In a real implementation, you would store this data properly
+ // For now, we'll just update the url field as a JSON string
+ const floorConfig = {
+ image: floorPlanImage,
+ devices: deviceData,
+ };
+
+ await db
+ .update(table.floors)
+ .set({ url: JSON.stringify(floorConfig) })
+ .where(eq(table.floors.floor, n));
+
+ return { success: true, message: `Floor ${n} configuration saved successfully!` };
+ } catch (error) {
+ console.error("Error saving floor configuration:", error);
+ return fail(500, { message: "Failed to save floor configuration!" });
+ }
+ },
};
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte
index 173578d..9b57069 100644
--- a/src/routes/(app)/settings/+page.svelte
+++ b/src/routes/(app)/settings/+page.svelte
@@ -1,5 +1,6 @@
Floor {data.slug}
+ + {#if data.hasConfig && data.floorConfig} + +
+ {#if data.floorConfig.image}
+
+ {:else}
+
+
+ 
+
+ {#if data.floorConfig.devices}
+ {#each data.floorConfig.devices as device}
+
+
+
+
+ {/each}
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/if}
+ MQTT Status: {mqttMessage}
+
+ {mqttMessage}
+
+
+ {/if}
+
+ Statistics for floor {data.slug}
+ Showing total data for the last 3 months
+
+
+
+
+ {#snippet child({ props })}
+
+ {/snippet}
+
+
+
+ {#each sensorOptions as sensor}
+
+ {sensor.label}
+
+ {/each}
+
+
+
+
+
+
+ {selectedLabel}
+
+
+ Last 3 months
+ Last 30 days
+ Last 7 days
+
+
+
+
+
+
+ {#if isLoading}
+
+
+ {:else if hasError}
+
+
+
+ Loading statistics...
+
+
+ {:else if chartData.length === 0}
+
+
+ Error loading statistics
+Please try again later
+
+
+ {:else}
+
+
+ No data available
++ Statistics will appear once sensor data is collected +
+
+ {#if filteredData.length > 0}
+
+
+
+
+
+
+
+
+ Latest
+
+ {filteredData[filteredData.length - 1]?.[selectedSensor]?.toFixed(1)}
+ {#if selectedSensor === "temperature"}°C
+ {:else if selectedSensor === "humidity"}%
+ {:else if selectedSensor === "pressure"}kPa
+ {:else if selectedSensor === "altitude"}m
+ {/if}
+
+
+
+ Average
+
+ {(
+ filteredData.reduce((sum, item) => sum + item[selectedSensor], 0) /
+ filteredData.length
+ ).toFixed(1)}
+ {#if selectedSensor === "temperature"}°C
+ {:else if selectedSensor === "humidity"}%
+ {:else if selectedSensor === "pressure"}kPa
+ {:else if selectedSensor === "altitude"}m
+ {/if}
+
+
+
+ Range
+
+ {Math.min(...filteredData.map((d) => d[selectedSensor])).toFixed(1)} - {Math.max(
+ ...filteredData.map((d) => d[selectedSensor]),
+ ).toFixed(1)}
+ {#if selectedSensor === "temperature"}°C
+ {:else if selectedSensor === "humidity"}%
+ {:else if selectedSensor === "pressure"}kPa
+ {:else if selectedSensor === "altitude"}m
+ {/if}
+
+
+
+
+
+
+ Data from {filteredData[0]?.date?.toLocaleDateString()} to {filteredData[
+ filteredData.length - 1
+ ]?.date?.toLocaleDateString()}
+
+ {:else}
+
+
+ {/if}
+
+
+ No data available
++ No data found for the selected time period +
+