diff --git a/databases/mobility.ts b/databases/mobility.ts deleted file mode 100644 index 9bb1400..0000000 --- a/databases/mobility.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { DB } from "https://deno.land/x/sqlite/mod.ts"; - -export default function insertIntoMobility( - data: Array<{ firstName: string; lastName: string; email: string }>, - promoName: string -) { - try { - const db = new DB("databases/data/mobility.db"); - - db.execute(` - CREATE TABLE IF NOT EXISTS students ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - firstName TEXT NOT NULL, - lastName TEXT NOT NULL, - email TEXT NOT NULL, - promotion TEXT NOT NULL - ); - `); - - const insertQuery = "INSERT INTO students (firstName, lastName, email, promotion) VALUES (?, ?, ?, ?)"; - for (const student of data) { - db.query(insertQuery, [student.firstName, student.lastName, student.email, promoName]); - } - - console.log(`Data for promotion ${promoName} inserted successfully.`); - - db.close(); - } catch (error) { - console.error("Error inserting data into mobility database:", error); - } -} diff --git a/fresh.gen.ts b/fresh.gen.ts index f04adda..0c4ae9b 100644 --- a/fresh.gen.ts +++ b/fresh.gen.ts @@ -3,6 +3,7 @@ // This file is automatically updated during development when running `dev.ts`. import * as $_apps_layout from "./routes/(apps)/_layout.tsx"; +import * as $_apps_mobility_api_insert_students from "./routes/(apps)/mobility/api/insert_students.ts"; import * as $_apps_mobility_index from "./routes/(apps)/mobility/index.tsx"; import * as $_apps_mobility_partials_admin_mobility from "./routes/(apps)/mobility/partials/(admin)/mobility.tsx"; import * as $_apps_mobility_partials_index from "./routes/(apps)/mobility/partials/index.tsx"; @@ -23,17 +24,13 @@ import * as $login from "./routes/login.tsx"; import * as $logout from "./routes/logout.tsx"; import * as $_islands_AppNavigator from "./routes/(_islands)/AppNavigator.tsx"; import * as $_islands_Navbar from "./routes/(_islands)/Navbar.tsx"; -import * as $_apps_mobility_islands_ConsultMobility from "./routes/(apps)/mobility/(_islands)/ConsultMobility.tsx"; -import * as $_apps_mobility_islands_ConsultStudents from "./routes/(apps)/mobility/(_islands)/ConsultStudents.tsx"; -import * as $_apps_mobility_islands_EditMobility from "./routes/(apps)/mobility/(_islands)/EditMobility.tsx"; -import * as $_apps_mobility_islands_EditStudents from "./routes/(apps)/mobility/(_islands)/EditStudents.tsx"; -import * as $_apps_mobility_islands_ImportFile from "./routes/(apps)/mobility/(_islands)/ImportFile.tsx"; -import * as $_apps_mobility_islands_UploadStudents from "./routes/(apps)/mobility/(_islands)/UploadStudents.tsx"; import type { Manifest } from "$fresh/server.ts"; const manifest = { routes: { "./routes/(apps)/_layout.tsx": $_apps_layout, + "./routes/(apps)/mobility/api/insert_students.ts": + $_apps_mobility_api_insert_students, "./routes/(apps)/mobility/index.tsx": $_apps_mobility_index, "./routes/(apps)/mobility/partials/(admin)/mobility.tsx": $_apps_mobility_partials_admin_mobility, @@ -62,18 +59,6 @@ const manifest = { islands: { "./routes/(_islands)/AppNavigator.tsx": $_islands_AppNavigator, "./routes/(_islands)/Navbar.tsx": $_islands_Navbar, - "./routes/(apps)/mobility/(_islands)/ConsultMobility.tsx": - $_apps_mobility_islands_ConsultMobility, - "./routes/(apps)/mobility/(_islands)/ConsultStudents.tsx": - $_apps_mobility_islands_ConsultStudents, - "./routes/(apps)/mobility/(_islands)/EditMobility.tsx": - $_apps_mobility_islands_EditMobility, - "./routes/(apps)/mobility/(_islands)/EditStudents.tsx": - $_apps_mobility_islands_EditStudents, - "./routes/(apps)/mobility/(_islands)/ImportFile.tsx": - $_apps_mobility_islands_ImportFile, - "./routes/(apps)/mobility/(_islands)/UploadStudents.tsx": - $_apps_mobility_islands_UploadStudents, }, baseUrl: import.meta.url, } satisfies Manifest; diff --git a/routes/(apps)/mobility/(_islands)/ConsultMobility.tsx b/routes/(apps)/mobility/(_components)/ConsultMobility.tsx similarity index 100% rename from routes/(apps)/mobility/(_islands)/ConsultMobility.tsx rename to routes/(apps)/mobility/(_components)/ConsultMobility.tsx diff --git a/routes/(apps)/mobility/(_islands)/ConsultStudents.tsx b/routes/(apps)/mobility/(_components)/ConsultStudents.tsx similarity index 100% rename from routes/(apps)/mobility/(_islands)/ConsultStudents.tsx rename to routes/(apps)/mobility/(_components)/ConsultStudents.tsx diff --git a/routes/(apps)/mobility/(_islands)/EditMobility.tsx b/routes/(apps)/mobility/(_components)/EditMobility.tsx similarity index 100% rename from routes/(apps)/mobility/(_islands)/EditMobility.tsx rename to routes/(apps)/mobility/(_components)/EditMobility.tsx diff --git a/routes/(apps)/mobility/(_islands)/EditStudents.tsx b/routes/(apps)/mobility/(_components)/EditStudents.tsx similarity index 100% rename from routes/(apps)/mobility/(_islands)/EditStudents.tsx rename to routes/(apps)/mobility/(_components)/EditStudents.tsx diff --git a/routes/(apps)/mobility/(_islands)/ImportFile.tsx b/routes/(apps)/mobility/(_components)/ImportFile.tsx similarity index 100% rename from routes/(apps)/mobility/(_islands)/ImportFile.tsx rename to routes/(apps)/mobility/(_components)/ImportFile.tsx diff --git a/routes/(apps)/mobility/(_components)/UploadStudents.tsx b/routes/(apps)/mobility/(_components)/UploadStudents.tsx new file mode 100644 index 0000000..9044f57 --- /dev/null +++ b/routes/(apps)/mobility/(_components)/UploadStudents.tsx @@ -0,0 +1,33 @@ +// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.3/package/types/index.d.ts" +import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs"; +import { useSignal } from "@preact/signals"; +import handleUpload from "../api/insert_students.ts"; + +export default function UploadStudents() { + const statusMessage = useSignal(""); + const fileData = useSignal(null); + + const handleFileChange = (event: Event) => { + const input = event.target as HTMLInputElement; + if (input.files && input.files.length > 0) { + fileData.value = input.files[0]; + statusMessage.value = "File selected: " + input.files[0].name; + } else { + fileData.value = null; + statusMessage.value = "No file selected"; + } + }; + + const confirmUpload = () => { + statusMessage.value = handleUpload(fileData.value); + }; + + return ( +
+

Upload Students

+ + +

{statusMessage.value}

+
+ ); +} diff --git a/routes/(apps)/mobility/(_islands)/UploadStudents.tsx b/routes/(apps)/mobility/(_islands)/UploadStudents.tsx deleted file mode 100644 index 8f562f0..0000000 --- a/routes/(apps)/mobility/(_islands)/UploadStudents.tsx +++ /dev/null @@ -1,78 +0,0 @@ -// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.3/package/types/index.d.ts" -import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs"; -import { useSignal } from "@preact/signals"; -import insertIntoMobility from "../../../../databases/mobility.ts"; - -export default function UploadStudents() { - const statusMessage = useSignal(""); - const fileData = useSignal(null); - - const handleFileChange = (event: Event) => { - const input = event.target as HTMLInputElement; - if (input.files && input.files.length > 0) { - fileData.value = input.files[0]; - statusMessage.value = "File selected: " + input.files[0].name; - } else { - fileData.value = null; - statusMessage.value = "No file selected"; - } - }; - - const handleUpload = () => { - if (!fileData.value) { - statusMessage.value = "Please select a file before confirming upload."; - return; - } - - try { - const reader = new FileReader(); - reader.onload = async (e) => { - try { - const arrayBuffer = e.target?.result as ArrayBuffer; - const workbook = XLSX.read(arrayBuffer, { type: "array" }); - - for (const sheetName of workbook.SheetNames) { - const sheet = workbook.Sheets[sheetName]; - const data = XLSX.utils.sheet_to_json(sheet, { - header: ["firstName", "lastName", "email"], - range: 1, // Ignorer les en-têtes - }); - - console.log(`Data from sheet ${sheetName}:`, data); - await insertIntoMobility( - data as Array< - { firstName: string; lastName: string; email: string } - >, - sheetName, - ); - } - - statusMessage.value = "File uploaded and data inserted successfully!"; - } catch (error) { - console.error("Error reading or inserting file:", error); - statusMessage.value = - "Error processing the file. Please check its format."; - } - }; - - reader.onerror = (e) => { - console.error("FileReader error:", e); - statusMessage.value = "Error reading the file."; - }; - - reader.readAsArrayBuffer(fileData.value); - } catch (error) { - console.error("Error uploading file:", error); - statusMessage.value = "An unexpected error occurred during upload."; - } - }; - - return ( -
-

Upload Students

- - -

{statusMessage.value}

-
- ); -} diff --git a/routes/(apps)/mobility/api/insert_students.ts b/routes/(apps)/mobility/api/insert_students.ts new file mode 100644 index 0000000..b3ef625 --- /dev/null +++ b/routes/(apps)/mobility/api/insert_students.ts @@ -0,0 +1,69 @@ +// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.3/package/types/index.d.ts" +import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs"; +import { Database } from "@db/sqlite"; + +export default function handleUpload(file: File | null): string { + if (!file) { + return "Please select a file before confirming upload."; + } + + try { + const reader = new FileReader(); + let statusMessage = ""; + + reader.onload = async (e) => { + try { + const arrayBuffer = e.target?.result as ArrayBuffer; + const workbook = XLSX.read(arrayBuffer, { type: "array" }); + + const db = new Database("databases/data/mobility.db"); + + db.execute(` + CREATE TABLE IF NOT EXISTS students ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + firstName TEXT NOT NULL, + lastName TEXT NOT NULL, + email TEXT NOT NULL, + promotion TEXT NOT NULL + ); + `); + + for (const sheetName of workbook.SheetNames) { + const sheet = workbook.Sheets[sheetName]; + const data = XLSX.utils.sheet_to_json(sheet, { + header: ["firstName", "lastName", "email"], + range: 1, // Ignorer les en-têtes + }); + + const insertQuery = + "INSERT INTO students (firstName, lastName, email, promotion) VALUES (?, ?, ?, ?)"; + for (const student of data) { + db.query(insertQuery, [ + student.firstName, + student.lastName, + student.email, + sheetName, + ]); + } + } + + db.close(); + statusMessage = "Data uploaded and inserted successfully!"; + } catch (error) { + console.error("Error reading or inserting file:", error); + statusMessage = "Error processing the file. Please check its format."; + } + }; + + reader.onerror = (e) => { + console.error("FileReader error:", e); + statusMessage = "Error reading the file."; + }; + + reader.readAsArrayBuffer(file); + return statusMessage; + } catch (error) { + console.error("Error uploading file:", error); + return "An unexpected error occurred during upload."; + } +} diff --git a/routes/(apps)/mobility/partials/students.tsx b/routes/(apps)/mobility/partials/students.tsx index 5878f81..89c55cf 100644 --- a/routes/(apps)/mobility/partials/students.tsx +++ b/routes/(apps)/mobility/partials/students.tsx @@ -1,5 +1,5 @@ import { RouteConfig } from "$fresh/server.ts"; -import UploadStudents from "../(_islands)/UploadStudents.tsx"; +import UploadStudents from "../(_components)/UploadStudents.tsx"; //import ConsultStudents from "../(_islands)/ConsultStudents.tsx"; //import EditStudents from "../(_islands)/EditStudents.tsx";