Trying to fix DB mobility
This commit is contained in:
+3
-6
@@ -3,9 +3,9 @@
|
|||||||
// This file is automatically updated during development when running `dev.ts`.
|
// This file is automatically updated during development when running `dev.ts`.
|
||||||
|
|
||||||
import * as $_apps_layout from "./routes/(apps)/_layout.tsx";
|
import * as $_apps_layout from "./routes/(apps)/_layout.tsx";
|
||||||
|
import * as $_apps_mobility_api_insert_mobility from "./routes/(apps)/mobility/api/insert_mobility.ts";
|
||||||
import * as $_apps_mobility_index from "./routes/(apps)/mobility/index.tsx";
|
import * as $_apps_mobility_index from "./routes/(apps)/mobility/index.tsx";
|
||||||
import * as $_apps_mobility_partials_admin_edit_mobility from "./routes/(apps)/mobility/partials/(admin)/edit_mobility.tsx";
|
import * as $_apps_mobility_partials_admin_edit_mobility from "./routes/(apps)/mobility/partials/(admin)/edit_mobility.tsx";
|
||||||
import * as $_apps_mobility_partials_admin_consult_students_test from "./routes/(apps)/mobility/partials/(admin)/consult_students_test.tsx";
|
|
||||||
import * as $_apps_mobility_partials_index from "./routes/(apps)/mobility/partials/index.tsx";
|
import * as $_apps_mobility_partials_index from "./routes/(apps)/mobility/partials/index.tsx";
|
||||||
import * as $_apps_mobility_partials_overview from "./routes/(apps)/mobility/partials/overview.tsx";
|
import * as $_apps_mobility_partials_overview from "./routes/(apps)/mobility/partials/overview.tsx";
|
||||||
import * as $_apps_notes_index from "./routes/(apps)/notes/index.tsx";
|
import * as $_apps_notes_index from "./routes/(apps)/notes/index.tsx";
|
||||||
@@ -30,7 +30,6 @@ import * as $logout from "./routes/logout.tsx";
|
|||||||
import * as $_islands_AppNavigator from "./routes/(_islands)/AppNavigator.tsx";
|
import * as $_islands_AppNavigator from "./routes/(_islands)/AppNavigator.tsx";
|
||||||
import * as $_islands_Navbar from "./routes/(_islands)/Navbar.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_ConsultMobility from "./routes/(apps)/mobility/(_islands)/ConsultMobility.tsx";
|
||||||
import * as $_apps_mobility_islands_ConsultStudents_test from "./routes/(apps)/mobility/(_islands)/ConsultStudents_test.tsx";
|
|
||||||
import * as $_apps_mobility_islands_EditMobility from "./routes/(apps)/mobility/(_islands)/EditMobility.tsx";
|
import * as $_apps_mobility_islands_EditMobility from "./routes/(apps)/mobility/(_islands)/EditMobility.tsx";
|
||||||
import * as $_apps_mobility_islands_ImportFile from "./routes/(apps)/mobility/(_islands)/ImportFile.tsx";
|
import * as $_apps_mobility_islands_ImportFile from "./routes/(apps)/mobility/(_islands)/ImportFile.tsx";
|
||||||
import * as $_apps_students_islands_ConsultStudents from "./routes/(apps)/students/(_islands)/ConsultStudents.tsx";
|
import * as $_apps_students_islands_ConsultStudents from "./routes/(apps)/students/(_islands)/ConsultStudents.tsx";
|
||||||
@@ -41,11 +40,11 @@ import type { Manifest } from "$fresh/server.ts";
|
|||||||
const manifest = {
|
const manifest = {
|
||||||
routes: {
|
routes: {
|
||||||
"./routes/(apps)/_layout.tsx": $_apps_layout,
|
"./routes/(apps)/_layout.tsx": $_apps_layout,
|
||||||
|
"./routes/(apps)/mobility/api/insert_mobility.ts":
|
||||||
|
$_apps_mobility_api_insert_mobility,
|
||||||
"./routes/(apps)/mobility/index.tsx": $_apps_mobility_index,
|
"./routes/(apps)/mobility/index.tsx": $_apps_mobility_index,
|
||||||
"./routes/(apps)/mobility/partials/(admin)/edit_mobility.tsx":
|
"./routes/(apps)/mobility/partials/(admin)/edit_mobility.tsx":
|
||||||
$_apps_mobility_partials_admin_edit_mobility,
|
$_apps_mobility_partials_admin_edit_mobility,
|
||||||
"./routes/(apps)/mobility/partials/(admin)/consult_students_test.tsx":
|
|
||||||
$_apps_mobility_partials_admin_consult_students_test,
|
|
||||||
"./routes/(apps)/mobility/partials/index.tsx":
|
"./routes/(apps)/mobility/partials/index.tsx":
|
||||||
$_apps_mobility_partials_index,
|
$_apps_mobility_partials_index,
|
||||||
"./routes/(apps)/mobility/partials/overview.tsx":
|
"./routes/(apps)/mobility/partials/overview.tsx":
|
||||||
@@ -82,8 +81,6 @@ const manifest = {
|
|||||||
"./routes/(_islands)/Navbar.tsx": $_islands_Navbar,
|
"./routes/(_islands)/Navbar.tsx": $_islands_Navbar,
|
||||||
"./routes/(apps)/mobility/(_islands)/ConsultMobility.tsx":
|
"./routes/(apps)/mobility/(_islands)/ConsultMobility.tsx":
|
||||||
$_apps_mobility_islands_ConsultMobility,
|
$_apps_mobility_islands_ConsultMobility,
|
||||||
"./routes/(apps)/mobility/(_islands)/ConsultStudents_test.tsx":
|
|
||||||
$_apps_mobility_islands_ConsultStudents_test,
|
|
||||||
"./routes/(apps)/mobility/(_islands)/EditMobility.tsx":
|
"./routes/(apps)/mobility/(_islands)/EditMobility.tsx":
|
||||||
$_apps_mobility_islands_EditMobility,
|
$_apps_mobility_islands_EditMobility,
|
||||||
"./routes/(apps)/mobility/(_islands)/ImportFile.tsx":
|
"./routes/(apps)/mobility/(_islands)/ImportFile.tsx":
|
||||||
|
|||||||
@@ -24,16 +24,20 @@ export default function ConsultMobility() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
|
console.log("ConsultMobility: Fetching data from API...");
|
||||||
try {
|
try {
|
||||||
const response = await fetch("/mobility/api/insert_mobility");
|
const response = await fetch("/mobility/api/insert_mobility");
|
||||||
|
console.log("ConsultMobility: API response status:", response.status);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`Error fetching data: ${response.statusText}`);
|
throw new Error(`Error fetching data: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
|
console.log("ConsultMobility: Data fetched successfully:", result);
|
||||||
setData(result);
|
setData(result);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Error fetching mobility data:", err);
|
console.error("ConsultMobility: Error fetching data:", err);
|
||||||
setError("Failed to load mobility data. Please try again later.");
|
setError("Failed to load mobility data. Please try again later.");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -47,7 +51,7 @@ export default function ConsultMobility() {
|
|||||||
{error && <p className="error">{error}</p>}
|
{error && <p className="error">{error}</p>}
|
||||||
{data?.promotions.map((promo) => (
|
{data?.promotions.map((promo) => (
|
||||||
<div key={promo.id}>
|
<div key={promo.id}>
|
||||||
<h3>Promotion: {promo.id}</h3>
|
<h3>Promotion: {promo.name}</h3>
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -18,44 +18,48 @@ export default function EditMobility() {
|
|||||||
const [isSaving, setIsSaving] = useState(false);
|
const [isSaving, setIsSaving] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
async function fetchMobilityData() {
|
const fetchMobilityData = async () => {
|
||||||
const response = await fetch("/mobility/api/insert_mobility");
|
console.log("EditMobility: Fetching mobility data...");
|
||||||
const data = await response.json();
|
try {
|
||||||
setMobilityData(data.mobilities || []);
|
const response = await fetch("/mobility/api/insert_mobility");
|
||||||
}
|
console.log("EditMobility: API response status:", response.status);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Error fetching data: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
console.log("EditMobility: Data fetched successfully:", data);
|
||||||
|
setMobilityData(data.mobilities || []);
|
||||||
|
} catch (err) {
|
||||||
|
console.error("EditMobility: Error fetching data:", err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
fetchMobilityData();
|
fetchMobilityData();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const handleChange = (
|
|
||||||
id: number,
|
|
||||||
field: keyof MobilityData,
|
|
||||||
value: string | number | null,
|
|
||||||
) => {
|
|
||||||
setMobilityData((prev) =>
|
|
||||||
prev.map((entry) =>
|
|
||||||
entry.id === id ? { ...entry, [field]: value } : entry,
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSave = async () => {
|
const handleSave = async () => {
|
||||||
|
console.log("EditMobility: Saving data...");
|
||||||
setIsSaving(true);
|
setIsSaving(true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch("/mobility/api/insert_mobility", {
|
const response = await fetch("/mobility/api/insert_mobility", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ data: mobilityData }),
|
body: JSON.stringify({ data: mobilityData }),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log("EditMobility: Save response status:", response.status);
|
||||||
|
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
|
console.log("EditMobility: Data saved successfully.");
|
||||||
alert("Data saved successfully!");
|
alert("Data saved successfully!");
|
||||||
} else {
|
} else {
|
||||||
alert("Failed to save data.");
|
throw new Error(`Failed to save data: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error saving data:", error);
|
console.error("EditMobility: Error saving data:", error);
|
||||||
alert("An error occurred while saving data.");
|
alert("An error occurred while saving data.");
|
||||||
} finally {
|
} finally {
|
||||||
setIsSaving(false);
|
setIsSaving(false);
|
||||||
@@ -87,7 +91,13 @@ export default function EditMobility() {
|
|||||||
type="date"
|
type="date"
|
||||||
value={mobility.startDate || ""}
|
value={mobility.startDate || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(mobility.id, "startDate", e.target.value)
|
setMobilityData((prev) =>
|
||||||
|
prev.map((entry) =>
|
||||||
|
entry.id === mobility.id
|
||||||
|
? { ...entry, startDate: e.target.value }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
@@ -96,7 +106,13 @@ export default function EditMobility() {
|
|||||||
type="date"
|
type="date"
|
||||||
value={mobility.endDate || ""}
|
value={mobility.endDate || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(mobility.id, "endDate", e.target.value)
|
setMobilityData((prev) =>
|
||||||
|
prev.map((entry) =>
|
||||||
|
entry.id === mobility.id
|
||||||
|
? { ...entry, endDate: e.target.value }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
@@ -105,10 +121,12 @@ export default function EditMobility() {
|
|||||||
type="number"
|
type="number"
|
||||||
value={mobility.weeksCount || ""}
|
value={mobility.weeksCount || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(
|
setMobilityData((prev) =>
|
||||||
mobility.id,
|
prev.map((entry) =>
|
||||||
"weeksCount",
|
entry.id === mobility.id
|
||||||
Number(e.target.value) || null,
|
? { ...entry, weeksCount: Number(e.target.value) || null }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -118,7 +136,13 @@ export default function EditMobility() {
|
|||||||
type="text"
|
type="text"
|
||||||
value={mobility.destinationCountry || ""}
|
value={mobility.destinationCountry || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(mobility.id, "destinationCountry", e.target.value)
|
setMobilityData((prev) =>
|
||||||
|
prev.map((entry) =>
|
||||||
|
entry.id === mobility.id
|
||||||
|
? { ...entry, destinationCountry: e.target.value }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
@@ -127,7 +151,13 @@ export default function EditMobility() {
|
|||||||
type="text"
|
type="text"
|
||||||
value={mobility.destinationName || ""}
|
value={mobility.destinationName || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(mobility.id, "destinationName", e.target.value)
|
setMobilityData((prev) =>
|
||||||
|
prev.map((entry) =>
|
||||||
|
entry.id === mobility.id
|
||||||
|
? { ...entry, destinationName: e.target.value }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
@@ -135,7 +165,13 @@ export default function EditMobility() {
|
|||||||
<select
|
<select
|
||||||
value={mobility.mobilityStatus}
|
value={mobility.mobilityStatus}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleChange(mobility.id, "mobilityStatus", e.target.value)
|
setMobilityData((prev) =>
|
||||||
|
prev.map((entry) =>
|
||||||
|
entry.id === mobility.id
|
||||||
|
? { ...entry, mobilityStatus: e.target.value }
|
||||||
|
: entry
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<option value="N/A">N/A</option>
|
<option value="N/A">N/A</option>
|
||||||
|
|||||||
@@ -4,8 +4,12 @@ import { Database } from "@db/sqlite";
|
|||||||
export const handler: Handlers = {
|
export const handler: Handlers = {
|
||||||
async GET() {
|
async GET() {
|
||||||
try {
|
try {
|
||||||
|
console.log("Connecting to mobility database...");
|
||||||
const connection = new Database("databases/data/mobility.db", { create: false });
|
const connection = new Database("databases/data/mobility.db", { create: false });
|
||||||
|
|
||||||
|
console.log("Connected to student database.");
|
||||||
|
connection.run("ATTACH DATABASE 'databases/data/students.db' AS students");
|
||||||
|
|
||||||
const mobilities = connection.prepare(
|
const mobilities = connection.prepare(
|
||||||
`SELECT
|
`SELECT
|
||||||
mobility.id,
|
mobility.id,
|
||||||
@@ -19,18 +23,11 @@ export const handler: Handlers = {
|
|||||||
mobility.destinationName,
|
mobility.destinationName,
|
||||||
mobility.mobilityStatus
|
mobility.mobilityStatus
|
||||||
FROM mobility
|
FROM mobility
|
||||||
LEFT JOIN students ON mobility.studentId = students.userId`
|
LEFT JOIN students.students ON mobility.studentId = students.userId`
|
||||||
).all();
|
).all();
|
||||||
|
|
||||||
connection.close();
|
connection.close();
|
||||||
|
return new Response(JSON.stringify({ mobilities }), { status: 200, headers: { "Content-Type": "application/json" } });
|
||||||
return new Response(
|
|
||||||
JSON.stringify({ mobilities }),
|
|
||||||
{
|
|
||||||
status: 200,
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error fetching mobility data:", error);
|
console.error("Error fetching mobility data:", error);
|
||||||
return new Response("Failed to fetch data", { status: 500 });
|
return new Response("Failed to fetch data", { status: 500 });
|
||||||
@@ -38,7 +35,7 @@ export const handler: Handlers = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async POST(request) {
|
async POST(request) {
|
||||||
console.log("API /mobility/api/insert_mobility called");
|
console.log("API /mobility/api/insert_mobility POST called");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const body = await request.json();
|
const body = await request.json();
|
||||||
|
|||||||
Reference in New Issue
Block a user