Skip to content

Commit

Permalink
Unfinished table
Browse files Browse the repository at this point in the history
  • Loading branch information
Lama64 committed Jul 22, 2024
1 parent 38e9e74 commit 1df704d
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 3 deletions.
6 changes: 4 additions & 2 deletions web/src/lib/elements/ui/dataTable/data-table.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@
let tableData: Writable<DataItem[]> = writable([]);
export let columnNames;
export let keys;
export let totalElements: Writable<number> = writable(0);
let totalElements: Writable<number> = writable(0);
export let loadPage: (
index: number,
toSort: string,
filter: string,
additionalId?: string,
) => Promise<{
data: DataItem[];
totalElements: number;
}>;
export let deleteEntry: (id: string) => Promise<void>;
export let additionalId: string = '';
const table = createTable(tableData, {
page: addPagination({ serverSide: true, serverItemCount: totalElements, initialPageSize: 10 }), //TODO: change page size, 10 only for testing
Expand Down Expand Up @@ -140,7 +142,7 @@
let sortKey: SortKey = $sortKeys[0];
let sortString;
sortString = sortKey ? `${sortKey.id},${sortKey.order}` : '';
let result = await loadPage($pageIndex, sortString, $filterValue);
let result = await loadPage($pageIndex, sortString, $filterValue, additionalId);
tableData.set(result.data);
totalElements.set(result.totalElements);
}
Expand Down
56 changes: 55 additions & 1 deletion web/src/routes/admin/constraints/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
<script lang="ts">
import ConstraintSignatureComp from '$lib/components/ui/constraintSignature/constraint-signature.svelte';
import DataTable from '$lib/elements/ui/dataTable/data-table.svelte';
import DataTable, { type DataItem } from '$lib/elements/ui/dataTable/data-table.svelte';
import {
type ConstraintParameter,
type ConstraintSignature,
DefaultType,
getConstraintInstances,
getConstraintSignatures,
getTeachers,
type GradeResponseDto,
type Pageable,
ParameterType,
type Subject,
type Tag,
type Teacher,
} from '$lib/sdk/fetch-client';
import { error } from '@sveltejs/kit';
const constraintParameters: ConstraintParameter[] = [
{
Expand Down Expand Up @@ -94,13 +97,64 @@
constraints: await getConstraintSignatures({ page: 0, size: 50 }).then(({ content }) => content),
};
};
async function getInstancesPage(pageIndex: number, toSort: string, filter: string, constraintSignatureId?: string) {
let pageable: Pageable = { page: pageIndex, size: 5, sort: [toSort] };
if (!constraintSignatureId) {
throw error(400, { message: 'Could not fetch page' });
}
try {
console.log('test');
let result = await getConstraintInstances(constraintSignatureId, pageable, { argument: filter });
let dataItems: DataItem[] = result.content
? result.content.map((instance) => {
let item: DataItem = { id: instance.id };
for (let i = 0; i < instance.arguments.length; i++) {
item[`name${i}`] = String(instance.arguments[i].value);
}
return item;
})
: [];
return {
data: dataItems,
totalElements: Number(result.totalElements),
};
} catch {
error(400, { message: 'Could not fetch page' });
}
}
function createKeys(constraint: ConstraintSignature) {
let parameterNames = Array.from({ length: constraint.parameters.length }, (_, i) => `name${i}`);
console.log(['id'].concat(parameterNames));
return ['id'].concat(parameterNames);
}
function createColumnNames(constraint: ConstraintSignature) {
return constraint.parameters.map((parameter) => parameter.parameterName);
}
async function deleteInstance(id: string) {
try {
await deleteInstance(id);
} catch {
error(400, { message: `could not delete room with id ${id}` });
}
}
</script>

{#await getConstraints() then { constraints }}
{#await getResources() then { teachers, grades, subjects, constraintSignature }}
{#each constraints || [] as constraint}
{console.log(constraint)}
<ConstraintSignatureComp {teachers} {grades} {subjects} constraintSignature={constraint} />
<DataTable
columnNames={createColumnNames(constraint)}
keys={createKeys(constraint)}
loadPage={getInstancesPage}
deleteEntry={deleteInstance}
additionalId={constraint.name}
/>
{/each}
{/await}
{/await}

0 comments on commit 1df704d

Please sign in to comment.