From 0ea0e94af74d500ba397dbe42669cbfc7c64c030 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Thu, 5 Dec 2024 12:01:34 +0100
Subject: [PATCH] feat: workshop 2

---
 backend/ebios_rm/serializers.py               |   2 +-
 backend/ebios_rm/views.py                     |   4 +
 frontend/messages/en.json                     |   9 +-
 .../src/lib/components/Forms/ModelForm.svelte |   3 +
 .../Forms/ModelForm/RoToForm.svelte           |  93 +++++++++++++++
 frontend/src/lib/utils/crud.ts                |  18 +++
 frontend/src/lib/utils/schemas.ts             |  16 ++-
 frontend/src/lib/utils/table.ts               |  18 +++
 frontend/src/lib/utils/types.ts               |   3 +-
 .../[model=urlmodel]/+page.server.ts          |   9 +-
 .../[id=uuid]/+page.server.ts                 |   5 +-
 .../ebios-rm/[id=uuid]/+page.svelte           |  18 ++-
 .../workshop-two/ro-to/+page.server.ts        | 107 ++++++++++++++++++
 .../[id=uuid]/workshop-two/ro-to/+page.svelte |  67 +++++++++++
 14 files changed, 361 insertions(+), 11 deletions(-)
 create mode 100644 frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts
 create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte

diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
index 15da633fc..62ab8aa03 100644
--- a/backend/ebios_rm/serializers.py
+++ b/backend/ebios_rm/serializers.py
@@ -92,7 +92,7 @@ class RoToReadSerializer(BaseModelSerializer):
     str = serializers.CharField(source="__str__")
     ebios_rm_study = FieldsRelatedField()
     folder = FieldsRelatedField()
-    feared_events = FieldsRelatedField(many=True)
+    feared_events = FieldsRelatedField(["folder", "id"], many=True)
 
     class Meta:
         model = RoTo
diff --git a/backend/ebios_rm/views.py b/backend/ebios_rm/views.py
index af0360603..8fcaf6ce9 100644
--- a/backend/ebios_rm/views.py
+++ b/backend/ebios_rm/views.py
@@ -77,6 +77,10 @@ def gravity(self, request, pk):
 class RoToViewSet(BaseModelViewSet):
     model = RoTo
 
+    filterset_fields = [
+        "ebios_rm_study",
+    ]
+
     @action(detail=False, name="Get risk origin choices", url_path="risk-origin")
     def risk_origin(self, request):
         return Response(dict(RoTo.RiskOrigin.choices))
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 11b1f8bf3..707f7435e 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -384,7 +384,7 @@
 	"exportDatabase": "Export database",
 	"upload": "Upload",
 	"add": "Add",
-	"undefined": "--",
+	"undefined": "undefined",
 	"production": "Production",
 	"design": "Design",
 	"development": "Development",
@@ -937,5 +937,10 @@
 	"fearedEvent": "Feared event",
 	"fearedEvents": "Feared events",
 	"isSelected": "Is selected",
-	"ebiosRM": "Ebios RM"
+	"ebiosRM": "Ebios RM",
+	"riskOrigin": "Risk origin",
+	"targetObjective": "Target objective",
+	"motivation": "Motivation",
+	"resources": "Resources",
+	"pertinence": "Pertinence"
 }
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 7f30a2a71..3866c9d84 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -28,6 +28,7 @@
 	import GeneralSettingsForm from './ModelForm/GeneralSettingForm.svelte';
 	import EbiosRmForm from './ModelForm/EbiosRmForm.svelte';
 	import FearedEventForm from './ModelForm/FearedEventForm.svelte';
+	import RoToForm from './ModelForm/RoToForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -261,6 +262,8 @@
 		<EbiosRmForm {form} {model} {cacheLocks} {formDataCache} {context} />
 	{:else if URLModel === 'feared-events'}
 		<FearedEventForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
+	{:else if URLModel === 'ro-to'}
+		<RoToForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{/if}
 	<div class="flex flex-row justify-between space-x-4">
 		{#if closeModal}
diff --git a/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte b/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte
new file mode 100644
index 000000000..cdbc7544e
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/RoToForm.svelte
@@ -0,0 +1,93 @@
+<script lang="ts">
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import type { ModelInfo, CacheLock } from '$lib/utils/types';
+	import TextField from '$lib/components/Forms/TextField.svelte';
+	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
+	import AutocompleteSelect from '$lib/components/Forms/AutocompleteSelect.svelte';
+	import Select from '$lib/components/Forms/Select.svelte';
+	import * as m from '$paraglide/messages.js';
+	import { getOptions } from '$lib/utils/crud';
+	import TextArea from '../TextArea.svelte';
+	import NumberField from '../NumberField.svelte';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['ebios_rm_study'] })}
+	field="ebios_rm_study"
+	cacheLock={cacheLocks['ebios_rm_study']}
+	bind:cachedValue={formDataCache['ebios_rm_study']}
+	label={m.ebiosRmStudy()}
+	hidden={initialData.ebios_rm_study}
+/>
+<AutocompleteSelect
+	multiple
+	{form}
+	options={getOptions({
+		objects: model.foreignKeys['feared_events'],
+		extra_fields: [['folder', 'str']],
+		label: 'auto'
+	})}
+	field="feared_events"
+	label={m.fearedEvents()}
+/>
+<Select
+	{form}
+	options={model.selectOptions['risk-origin']}
+	field="risk_origin"
+	label={m.riskOrigin()}
+	cacheLock={cacheLocks['risk_origin']}
+	bind:cachedValue={formDataCache['risk_origin']}
+/>
+<TextField
+	{form}
+	field="target_objective"
+	label={m.targetObjective()}
+	cacheLock={cacheLocks['target_objective']}
+	bind:cachedValue={formDataCache['target_objective']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['motivation']}
+	field="motivation"
+	label={m.motivation()}
+	cacheLock={cacheLocks['motivation']}
+	bind:cachedValue={formDataCache['motivation']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['resources']}
+	field="resources"
+	label={m.resources()}
+	cacheLock={cacheLocks['resources']}
+	bind:cachedValue={formDataCache['resources']}
+/>
+<Select
+	{form}
+	options={model.selectOptions['pertinence']}
+	field="pertinence"
+	label={m.pertinence()}
+	cacheLock={cacheLocks['pertinence']}
+	bind:cachedValue={formDataCache['pertinence']}
+/>
+<NumberField
+	{form}
+	field="activity"
+	label={m.activity()}
+	cacheLock={cacheLocks['activity']}
+	bind:cachedValue={formDataCache['activity']}
+/>
+<Checkbox {form} field="is_selected" label={m.isSelected()} />
+<TextArea
+	{form}
+	field="justification"
+	label={m.justification()}
+	cacheLock={cacheLocks['justification']}
+	bind:cachedValue={formDataCache['justification']}
+/>
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 49f30e7ab..fd8a9eb65 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -623,6 +623,24 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'qualifications', urlModel: 'qualifications' }
 		],
 		selectFields: [{ field: 'gravity', valueType: 'number', detail: true }]
+	},
+	'ro-to': {
+		endpointUrl: 'ebios-rm/ro-to',
+		name: 'roto',
+		localName: 'roto',
+		localNamePlural: 'roto',
+		verboseName: 'Ro to',
+		verboseNamePlural: 'Ro to',
+		foreignKeyFields: [
+			{ field: 'ebios_rm_study', urlModel: 'ebios-rm' },
+			{ field: 'feared_events', urlModel: 'feared-events' }
+		],
+		selectFields: [
+			{ field: 'risk-origin' },
+			{ field: 'motivation' },
+			{ field: 'resources' },
+			{ field: 'pertinence' }
+		]
 	}
 };
 
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 413d7c45c..8551da21a 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -413,6 +413,19 @@ export const fearedEventsSchema = z.object({
 	qualifications: z.string().optional().array().optional()
 });
 
+export const roToSchema = z.object({
+	ebios_rm_study: z.string(),
+	feared_events: z.string().uuid().array(),
+	risk_origin: z.string(),
+	target_objective: z.string(),
+	motivation: z.string().optional(),
+	ressources: z.string().optional(),
+	pertinence: z.string().optional(),
+	activity: z.number().optional().default(0),
+	is_selected: z.boolean().optional().default(false),
+	justification: z.string().optional()
+});
+
 const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	folders: FolderSchema,
 	projects: ProjectSchema,
@@ -439,7 +452,8 @@ const SCHEMA_MAP: Record<string, AnyZodObject> = {
 	vulnerabilities: vulnerabilitySchema,
 	'filtering-labels': FilteringLabelSchema,
 	'ebios-rm': ebiosRMSchema,
-	'feared-events': fearedEventsSchema
+	'feared-events': fearedEventsSchema,
+	'ro-to': roToSchema
 };
 
 export const modelSchema = (model: string) => {
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index a02b1c270..07e8f9bc3 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -555,5 +555,23 @@ export const listViewFields: ListViewFieldsConfig = {
 	'feared-events': {
 		head: ['selected', 'assets', 'fearedEvent', 'qualifications', 'gravity'],
 		body: ['is_selected', 'assets', 'description', 'qualifications', 'gravity']
+	},
+	'ro-to': {
+		head: [
+			'isSelected',
+			'riskOrigin',
+			'targetObjective',
+			'motivation',
+			'fearedEvents',
+			'pertinence'
+		],
+		body: [
+			'is_selected',
+			'risk_origin',
+			'target_objective',
+			'motivation',
+			'feared_events',
+			'pertinence'
+		]
 	}
 };
diff --git a/frontend/src/lib/utils/types.ts b/frontend/src/lib/utils/types.ts
index 14c7c0356..0e1dde450 100644
--- a/frontend/src/lib/utils/types.ts
+++ b/frontend/src/lib/utils/types.ts
@@ -52,7 +52,8 @@ export const URL_MODEL = [
 	'representatives',
 	'vulnerabilities',
 	'filtering-labels',
-	'feared-events'
+	'feared-events',
+	'ro-to'
 	// 'ebios-rm',
 ] as const;
 
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
index fe10f5bf2..2b5f03185 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/+page.server.ts
@@ -27,7 +27,10 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	for (const keyField of foreignKeyFields) {
 		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
-		const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+		const keyModel = getModelInfo(keyField.urlModel);
+		const url = keyModel.endpointUrl
+			? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+			: `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
 		const response = await fetch(url);
 		if (response.ok) {
 			foreignKeys[keyField.field] = await response.json().then((data) => data.results);
@@ -42,7 +45,9 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
 
 	for (const selectField of selectFields) {
 		if (selectField.detail) continue;
-		const url = `${BASE_API_URL}/${params.model}/${selectField.field}/`;
+		const url = model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/${selectField.field}/`
+			: `${BASE_API_URL}/${params.model}/${selectField.field}/`;
 		const response = await fetch(url);
 		if (response.ok) {
 			selectOptions[selectField.field] = await response.json().then((data) =>
diff --git a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
index 699a98520..a1d709195 100644
--- a/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/[model=urlmodel]/[id=uuid]/+page.server.ts
@@ -26,8 +26,11 @@ export const load: PageServerLoad = async (event) => {
 	if (modelInfo.foreignKeyFields) {
 		await Promise.all(
 			modelInfo.foreignKeyFields.map(async (keyField) => {
+				const keyModel = getModelInfo(keyField.urlModel);
 				const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
-				const url = `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
+				const url = keyModel.endpointUrl
+					? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+					: `${BASE_API_URL}/${keyField.urlModel}/${queryParams}`;
 				const response = await event.fetch(url);
 				if (response.ok) {
 					foreignKeys[keyField.field] = await response.json().then((data) => data.results);
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
index 21df4f60f..4929466a5 100644
--- a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/+page.svelte
@@ -34,9 +34,21 @@
 			}
 		],
 		ws2: [
-			{ title: safeTranslate(m.ebiosWs2_1()), status: 'to_do', href: '#' },
-			{ title: safeTranslate(m.ebiosWs2_2()), status: 'to_do', href: '#' },
-			{ title: safeTranslate(m.ebiosWs2_3()), status: 'to_do', href: '#' }
+			{
+				title: safeTranslate(m.ebiosWs2_1()),
+				status: 'to_do',
+				href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+			},
+			{
+				title: safeTranslate(m.ebiosWs2_2()),
+				status: 'to_do',
+				href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+			},
+			{
+				title: safeTranslate(m.ebiosWs2_3()),
+				status: 'to_do',
+				href: `${$page.url.pathname}/workshop-two/ro-to?next=${$page.url.pathname}`
+			}
 		],
 		ws3: [
 			{ title: safeTranslate(m.ebiosWs3_1()), status: 'to_do', href: '#' },
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts
new file mode 100644
index 000000000..ba8529259
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.server.ts
@@ -0,0 +1,107 @@
+import { defaultDeleteFormAction, defaultWriteFormAction } from '$lib/utils/actions';
+import { BASE_API_URL } from '$lib/utils/constants';
+import {
+	getModelInfo,
+	urlParamModelForeignKeyFields,
+	urlParamModelSelectFields
+} from '$lib/utils/crud';
+import { modelSchema } from '$lib/utils/schemas';
+import type { ModelInfo, urlModel } from '$lib/utils/types';
+import { type Actions } from '@sveltejs/kit';
+import { superValidate } from 'sveltekit-superforms';
+import { zod } from 'sveltekit-superforms/adapters';
+import { z } from 'zod';
+import type { PageServerLoad } from './$types';
+import { listViewFields } from '$lib/utils/table';
+import { tableSourceMapper, type TableSource } from '@skeletonlabs/skeleton';
+
+export const load: PageServerLoad = async ({ params, fetch }) => {
+	const schema = z.object({ id: z.string().uuid() });
+	const deleteForm = await superValidate(zod(schema));
+	const URLModel = 'ro-to';
+	const createSchema = modelSchema(URLModel);
+	const initialData = {
+		ebios_rm_study: params.id
+	};
+	const createForm = await superValidate(initialData, zod(createSchema), { errors: false });
+	const model: ModelInfo = getModelInfo(URLModel);
+	const foreignKeyFields = urlParamModelForeignKeyFields(URLModel);
+	const selectFields = urlParamModelSelectFields(URLModel);
+
+	const foreignKeys: Record<string, any> = {};
+
+	for (const keyField of foreignKeyFields) {
+		const keyModel = getModelInfo(keyField.urlModel);
+		const queryParams = keyField.urlParams ? `?${keyField.urlParams}` : '';
+		const url = keyModel.endpointUrl
+			? `${BASE_API_URL}/${keyModel.endpointUrl}/${queryParams}`
+			: `${BASE_API_URL}/${keyModel.urlModel}/${queryParams}`;
+		const response = await fetch(url);
+		if (response.ok) {
+			foreignKeys[keyField.field] = await response.json().then((data) => data.results);
+		} else {
+			console.error(`Failed to fetch data for ${keyField.field}: ${response.statusText}`);
+		}
+	}
+
+	model['foreignKeys'] = foreignKeys;
+
+	const selectOptions: Record<string, any> = {};
+
+	for (const selectField of selectFields) {
+		if (selectField.detail) continue;
+		const url = model.endpointUrl
+			? `${BASE_API_URL}/${model.endpointUrl}/${selectField.field}/`
+			: `${BASE_API_URL}/${model.urlModel}/${selectField.field}/`;
+		const response = await fetch(url);
+		if (response.ok) {
+			selectOptions[selectField.field] = await response.json().then((data) =>
+				Object.entries(data).map(([key, value]) => ({
+					label: value,
+					value: key
+				}))
+			);
+		} else {
+			console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
+		}
+	}
+
+	model['selectOptions'] = selectOptions;
+
+	const endpoint = `${BASE_API_URL}/${model.endpointUrl}?ebios_rm_study=${params.id}`;
+	const res = await fetch(endpoint);
+	const data = await res.json().then((res) => res.results);
+
+	const bodyData = tableSourceMapper(data, listViewFields[URLModel as urlModel].body);
+
+	const headData: Record<string, string> = listViewFields[URLModel as urlModel].body.reduce(
+		(obj, key, index) => {
+			obj[key] = listViewFields[URLModel as urlModel].head[index];
+			return obj;
+		},
+		{}
+	);
+
+	const table: TableSource = {
+		head: headData,
+		body: bodyData,
+		meta: data // metaData
+	};
+
+	return { createForm, deleteForm, model, URLModel, table };
+};
+
+export const actions: Actions = {
+	create: async (event) => {
+		// const redirectToWrittenObject = Boolean(event.params.model === 'entity-assessments');
+		return defaultWriteFormAction({
+			event,
+			urlModel: 'ro-to',
+			action: 'create'
+			// redirectToWrittenObject: redirectToWrittenObject
+		});
+	},
+	delete: async (event) => {
+		return defaultDeleteFormAction({ event, urlModel: 'ro-to' });
+	}
+};
diff --git a/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte
new file mode 100644
index 000000000..08ebedae8
--- /dev/null
+++ b/frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-two/ro-to/+page.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
+	import type { PageData } from './$types';
+	import { safeTranslate } from '$lib/utils/i18n';
+	import type { ModalComponent, ModalSettings, ModalStore } from '@skeletonlabs/skeleton';
+	import { getModalStore } from '@skeletonlabs/skeleton';
+	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
+	import { checkConstraints } from '$lib/utils/crud';
+	import * as m from '$paraglide/messages.js';
+
+	const modalStore: ModalStore = getModalStore();
+
+	export let data: PageData;
+
+	const URLModel = data.URLModel;
+
+	function modalCreateForm(): void {
+		let modalComponent: ModalComponent = {
+			ref: CreateModal,
+			props: {
+				form: data.createForm,
+				model: data.model
+			}
+		};
+		let modal: ModalSettings = {
+			type: 'component',
+			component: modalComponent,
+			// Data
+			title: safeTranslate('add-' + data.model.localName)
+		};
+		if (
+			checkConstraints(
+				data.createForm.constraints,
+				Object.fromEntries(
+					Object.entries(data.model.foreignKeys).filter(([key]) => key !== 'risk_matrix')
+				)
+			).length > 0
+		) {
+			modalComponent = {
+				ref: MissingConstraintsModal
+			};
+			modal = {
+				type: 'component',
+				component: modalComponent,
+				title: m.warning(),
+				body: safeTranslate('add-' + data.model.localName).toLowerCase(),
+				value: checkConstraints(data.createForm.constraints, data.model.foreignKeys)
+			};
+		}
+		modalStore.trigger(modal);
+	}
+</script>
+
+<ModelTable source={data.table} deleteForm={data.deleteForm} {URLModel}>
+	<div slot="addButton">
+		<span class="inline-flex overflow-hidden rounded-md border bg-white shadow-sm">
+			<button
+				class="inline-block border-e p-3 btn-mini-primary w-12 focus:relative"
+				data-testid="add-button"
+				title={safeTranslate('add-' + data.model.localName)}
+				on:click={modalCreateForm}
+				><i class="fa-solid fa-file-circle-plus"></i>
+			</button>
+		</span>
+	</div>
+</ModelTable>