From c0ad0826d0ee511d619939000c4b91290d8efc0a Mon Sep 17 00:00:00 2001
From: Kacper Donat <kadet1090@gmail.com>
Date: Mon, 11 Jan 2021 23:03:25 +0100
Subject: [PATCH] Reporting api stuff

---
 src/api/dto/edition.ts                        | 85 ++++++++++++++++++-
 src/api/dto/internship-registration.ts        | 53 +++++++++---
 src/api/index.ts                              |  4 +-
 src/api/report.ts                             |  8 ++
 src/components/fileinfo.tsx                   |  2 +-
 src/data/common.ts                            |  6 ++
 src/data/edition.ts                           |  2 +
 src/data/report.ts                            | 10 +--
 src/forms/report.tsx                          | 29 ++++---
 src/management/api/field.ts                   | 14 +++
 src/management/api/index.ts                   |  4 +-
 src/management/edition/internship/list.tsx    |  6 +-
 src/management/edition/ipp/list.tsx           |  2 +-
 src/management/edition/manage.tsx             |  3 -
 src/management/main.tsx                       |  6 +-
 .../{edition => }/report/fields/edit.tsx      |  2 +-
 .../{edition => }/report/fields/form.tsx      |  6 +-
 .../{edition => }/report/fields/list.tsx      | 71 ++++++++++++----
 src/management/routing.tsx                    |  4 +-
 src/pages/main.tsx                            | 21 ++++-
 src/pages/steps/plan.tsx                      |  5 +-
 src/provider/dummy/report.ts                  | 21 +++--
 src/state/actions/plan.ts                     |  1 +
 src/state/actions/report.ts                   |  6 ++
 src/state/reducer/plan.ts                     |  1 +
 src/state/reducer/report.ts                   |  3 +
 26 files changed, 295 insertions(+), 80 deletions(-)
 create mode 100644 src/api/report.ts
 create mode 100644 src/management/api/field.ts
 rename src/management/{edition => }/report/fields/edit.tsx (98%)
 rename src/management/{edition => }/report/fields/form.tsx (95%)
 rename src/management/{edition => }/report/fields/list.tsx (54%)

diff --git a/src/api/dto/edition.ts b/src/api/dto/edition.ts
index ece5a0f..cb0cebd 100644
--- a/src/api/dto/edition.ts
+++ b/src/api/dto/edition.ts
@@ -5,6 +5,7 @@ import { Edition } from "@/data/edition";
 import moment from "moment-timezone";
 import { Subset } from "@/helpers";
 import { InternshipTypeDTO, internshipTypeDtoTransformer } from "@/api/dto/type";
+import { ReportFieldDefinition, ReportFieldType } from "@/data/report";
 
 export interface ProgramEntryDTO extends Identifiable {
     description: string;
@@ -18,6 +19,7 @@ export interface EditionDTO extends Identifiable {
     course: CourseDTO,
     availableSubjects: ProgramEntryDTO[],
     availableInternshipTypes: InternshipTypeDTO[],
+    reportSchema: FieldDefinitionDTO[],
 }
 
 export interface EditionTeaserDTO extends Identifiable {
@@ -26,6 +28,83 @@ export interface EditionTeaserDTO extends Identifiable {
     courseName: string,
 }
 
+export enum FieldDefinitionDTOType {
+    LongText = "LongText",
+    ShortText = "ShortText",
+    Select = "Select",
+    Radial = "Radial",
+    Checkbox = "Checkbox",
+}
+
+export const fieldDefinitionDtoTypeTransformer: Transformer<FieldDefinitionDTOType, ReportFieldType> = {
+    transform(dto: FieldDefinitionDTOType, context?: unknown) {
+        switch (dto) {
+            case FieldDefinitionDTOType.LongText:
+                return "long-text"
+            case FieldDefinitionDTOType.ShortText:
+                return "short-text";
+            case FieldDefinitionDTOType.Select:
+                return "select";
+            case FieldDefinitionDTOType.Radial:
+                return "radio";
+            case FieldDefinitionDTOType.Checkbox:
+                return "checkbox";
+        }
+    },
+    reverseTransform(type: ReportFieldType, context?: unknown) {
+        switch (type) {
+            case "short-text":
+                return FieldDefinitionDTOType.ShortText;
+            case "long-text":
+                return FieldDefinitionDTOType.LongText;
+            case "checkbox":
+                return FieldDefinitionDTOType.Checkbox;
+            case "radio":
+                return FieldDefinitionDTOType.Radial;
+            case "select":
+                return FieldDefinitionDTOType.Select;
+        }
+    }
+}
+
+export interface FieldDefinitionDTO extends Identifiable {
+    label: string;
+    labelEng: string;
+    description: string;
+    descriptionEng: string;
+    fieldType: FieldDefinitionDTOType;
+    choices: string[];
+}
+
+export const fieldDefinitionDtoTransformer: Transformer<FieldDefinitionDTO, ReportFieldDefinition> = {
+    transform(dto: FieldDefinitionDTO, context?: unknown): ReportFieldDefinition {
+        return {
+            ...dto,
+            choices: (dto.choices || []).map(choice => JSON.parse(choice)),
+            description: {
+                pl: dto.description,
+                en: dto.descriptionEng,
+            },
+            label: {
+                pl: dto.label,
+                en: dto.labelEng,
+            },
+            type: fieldDefinitionDtoTypeTransformer.transform(dto.fieldType),
+        }
+    },
+    reverseTransform(subject: ReportFieldDefinition, context?: unknown): FieldDefinitionDTO {
+        return {
+            ...subject,
+            choices: "choices" in subject && subject.choices.map(choice => JSON.stringify(choice)) || [],
+            description: subject.description.pl,
+            descriptionEng: subject.description.en,
+            fieldType: fieldDefinitionDtoTypeTransformer.reverseTransform(subject.type),
+            label: subject.label.pl,
+            labelEng: subject.label.en,
+        }
+    }
+}
+
 export const editionTeaserDtoTransformer: OneWayTransformer<EditionTeaserDTO, Subset<Edition>> = {
     transform(subject: EditionTeaserDTO, context?: undefined): Subset<Edition> {
         return subject && {
@@ -48,7 +127,8 @@ export const editionDtoTransformer: Transformer<EditionDTO, Edition> = {
             course: courseDtoTransformer.reverseTransform(subject.course),
             reportingStart: subject.reportingStart.toISOString(),
             availableSubjects: subject.program.map(entry => programEntryDtoTransformer.reverseTransform(entry)),
-            availableInternshipTypes: subject.types.map(entry => internshipTypeDtoTransformer.reverseTransform(entry))
+            availableInternshipTypes: subject.types.map(entry => internshipTypeDtoTransformer.reverseTransform(entry)),
+            reportSchema: subject.schema.map(entry => fieldDefinitionDtoTransformer.reverseTransform(entry)),
         };
     },
     transform(subject: EditionDTO, context: undefined): Edition {
@@ -63,7 +143,8 @@ export const editionDtoTransformer: Transformer<EditionDTO, Edition> = {
             reportingStart: moment(subject.reportingStart),
             reportingEnd: moment(subject.reportingStart).add(1, 'month'),
             program: (subject.availableSubjects || []).map(entry => programEntryDtoTransformer.transform(entry)),
-            types: (subject.availableInternshipTypes || []).map(entry => internshipTypeDtoTransformer.transform(entry))
+            types: (subject.availableInternshipTypes || []).map(entry => internshipTypeDtoTransformer.transform(entry)),
+            schema: (subject.reportSchema || []).map(entry => fieldDefinitionDtoTransformer.transform(entry)),
         };
     }
 }
diff --git a/src/api/dto/internship-registration.ts b/src/api/dto/internship-registration.ts
index b3310dc..829f308 100644
--- a/src/api/dto/internship-registration.ts
+++ b/src/api/dto/internship-registration.ts
@@ -1,4 +1,4 @@
-import { Address, Company, Identifiable, Internship, Mentor, Office, Student } from "@/data";
+import { Address, Company, Identifiable, Internship, Mentor, Office, Stateful } from "@/data";
 import { momentSerializationTransformer, OneWayTransformer, Transformer } from "@/serialization";
 import { Nullable } from "@/helpers";
 import { MentorDTO, mentorDtoTransformer } from "@/api/dto/mentor";
@@ -9,6 +9,12 @@ import { UploadType } from "@/api/upload";
 import { ProgramEntryDTO, programEntryDtoTransformer } from "@/api/dto/edition";
 import { StudentDTO } from "@/api/dto/student";
 import { SubmissionStatus } from "@/state/reducer/submission";
+import { Report } from "@/data/report";
+
+export interface StatefulDTO {
+    state: SubmissionState;
+    changeStateComment: string;
+}
 
 export enum SubmissionState {
     Draft = "Draft",
@@ -47,6 +53,21 @@ export const submissionStateDtoTransformer: Transformer<SubmissionState, Submiss
     }
 }
 
+export const statefulDtoTransformer: Transformer<StatefulDTO, Stateful> = {
+    reverseTransform(subject: Stateful, context: undefined): StatefulDTO {
+        return {
+            changeStateComment: subject.comment,
+            state: submissionStateDtoTransformer.reverseTransform(subject.state, context),
+        };
+    },
+    transform(subject: StatefulDTO, context: undefined): Stateful {
+        return {
+            comment: subject.changeStateComment,
+            state: submissionStateDtoTransformer.transform(subject.state),
+        }
+    }
+}
+
 export interface NewBranchOffice extends Address {
 }
 
@@ -71,30 +92,30 @@ export interface InternshipRegistrationUpdate {
     subjects: string[],
 }
 
-export interface InternshipRegistrationDTO extends Identifiable {
+export interface InternshipRegistrationDTO extends Identifiable, StatefulDTO {
     start: string;
     end: string;
     type: InternshipTypeDTO,
-    state: SubmissionState,
     mentor: MentorDTO,
     company: Company,
     branchAddress: Office,
     declaredHours: number,
     subjects: { subject: ProgramEntryDTO }[],
     submissionDate: string,
-    changeStateComment: string;
 }
 
-export interface InternshipDocument extends Identifiable {
+export interface InternshipDocument extends Identifiable, Stateful {
     description: null,
     type: UploadType,
-    state: SubmissionStatus,
 }
 
-export interface InternshipDocumentDTO extends Identifiable {
-    description: null,
-    type: UploadType,
-    state: SubmissionState,
+export interface InternshipDocumentDTO extends Identifiable, StatefulDTO {
+    description: null;
+    type: UploadType;
+}
+
+export interface InternshipReportDTO extends StatefulDTO, Identifiable {
+    value: string;
 }
 
 const reference = (subject: Identifiable | null): Identifiable | null => subject && { id: subject.id };
@@ -103,6 +124,16 @@ export interface InternshipInfoDTO extends Identifiable {
     internshipRegistration: InternshipRegistrationDTO;
     documentation: InternshipDocumentDTO[],
     student: StudentDTO,
+    report: InternshipReportDTO,
+}
+
+export const internshipReportDtoTransformer: OneWayTransformer<InternshipReportDTO, Report> = {
+    transform(subject: InternshipReportDTO, context?: unknown): Report {
+        return {
+            fields: JSON.parse(subject.value),
+            ...statefulDtoTransformer.transform(subject),
+        }
+    }
 }
 
 export const internshipRegistrationUpdateTransformer: OneWayTransformer<Nullable<Internship>, Nullable<InternshipRegistrationUpdate>> = {
@@ -151,7 +182,7 @@ export const internshipDocumentDtoTransformer: OneWayTransformer<InternshipDocum
     transform(dto: InternshipDocumentDTO, context?: unknown): InternshipDocument {
         return {
             ...dto,
-            state: submissionStateDtoTransformer.transform(dto.state),
+            ...statefulDtoTransformer.transform(dto),
         }
     }
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index 930d924..4d8e029 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -11,6 +11,7 @@ import * as type from "./type";
 import * as companies from "./companies";
 import * as internship from "./internship";
 import * as upload from "./upload";
+import * as report from "./report";
 
 export const axios = Axios.create({
     baseURL: process.env.API_BASE_URL || `https://${window.location.hostname}/api/`,
@@ -41,7 +42,8 @@ const api = {
     type,
     companies,
     internship,
-    upload
+    upload,
+    report,
 }
 
 export default api;
diff --git a/src/api/report.ts b/src/api/report.ts
new file mode 100644
index 0000000..aaed0b3
--- /dev/null
+++ b/src/api/report.ts
@@ -0,0 +1,8 @@
+import { Report, ReportFieldValues } from "@/data/report";
+import { axios } from "@/api/index";
+
+const REPORT_SAVE_ENDPOINT = "/internship/report"
+
+export async function save(report: Report) {
+    await axios.post(REPORT_SAVE_ENDPOINT, report.fields);
+}
diff --git a/src/components/fileinfo.tsx b/src/components/fileinfo.tsx
index 6989f91..39cca67 100644
--- a/src/components/fileinfo.tsx
+++ b/src/components/fileinfo.tsx
@@ -75,7 +75,7 @@ export const FileInfo = ({ document, ...props }: FileInfoProps) => {
         <Async async={ fileinfo }>
             { fileinfo => <div className={ classes.grid }>
                 <div className={ classes.iconColumn }>
-                    <FileIcon mime={ fileinfo.mime } className={ classes.icon } />
+                    <FileIcon mime={ fileinfo.mime || "" } className={ classes.icon } />
                 </div>
                 <aside className={ classes.asideColumn }>
                     <Typography variant="h5" className={ classes.header }>{ fileinfo.filename }</Typography>
diff --git a/src/data/common.ts b/src/data/common.ts
index da78cf8..835b040 100644
--- a/src/data/common.ts
+++ b/src/data/common.ts
@@ -1,3 +1,5 @@
+import { SubmissionStatus } from "@/state/reducer/submission";
+
 export type Identifier = string;
 
 export interface Identifiable {
@@ -8,3 +10,7 @@ export type Multilingual<T> = {
     pl: T,
     en: T
 }
+export interface Stateful {
+    comment: string;
+    state: SubmissionStatus;
+}
diff --git a/src/data/edition.ts b/src/data/edition.ts
index 84f3ee7..c3ce5fa 100644
--- a/src/data/edition.ts
+++ b/src/data/edition.ts
@@ -2,6 +2,7 @@ import { Moment } from "moment-timezone";
 import { Course } from "@/data/course";
 import { Identifiable } from "@/data/common";
 import { InternshipProgramEntry, InternshipType } from "@/data/internship";
+import { ReportSchema } from "@/data/report";
 
 export type Edition = {
     course: Course;
@@ -14,6 +15,7 @@ export type Edition = {
     maximumInternshipHours?: number;
     program: InternshipProgramEntry[];
     types: InternshipType[];
+    schema: ReportSchema;
 } & Identifiable
 
 export type Deadlines = {
diff --git a/src/data/report.ts b/src/data/report.ts
index a5eeafc..03760d0 100644
--- a/src/data/report.ts
+++ b/src/data/report.ts
@@ -1,11 +1,10 @@
-import { Multilingual } from "@/data/common";
+import { Identifiable, Multilingual, Stateful } from "@/data/common";
 
 interface PredefinedChoices {
     choices: Multilingual<string>[];
 }
 
-export interface BaseFieldDefinition {
-    name: string;
+export interface BaseFieldDefinition extends Identifiable {
     description: Multilingual<string>;
     label: Multilingual<string>;
 }
@@ -32,10 +31,11 @@ export type ReportFieldDefinition = TextFieldDefinition | MultiChoiceFieldDefini
 export type ReportFieldValue = TextFieldValue | MultiChoiceValue | SingleChoiceValue;
 export type ReportFieldValues = { [field: string]: ReportFieldValue };
 export type ReportSchema = ReportFieldDefinition[];
+export type ReportFieldType = ReportFieldDefinition['type'];
 
-export interface Report {
+export interface Report extends Stateful {
     fields: ReportFieldValues;
 }
 
-export const reportFieldTypes = ["short-text", "long-text", "checkbox", "radio", "select"];
+export const reportFieldTypes: ReportFieldType[] = ["short-text", "long-text", "checkbox", "radio", "select"];
 
diff --git a/src/forms/report.tsx b/src/forms/report.tsx
index dfb08f7..f6307a9 100644
--- a/src/forms/report.tsx
+++ b/src/forms/report.tsx
@@ -23,11 +23,14 @@ import { TextField as TextFieldFormik } from "formik-material-ui";
 import { Field, Form, Formik, useFormik, useFormikContext } from "formik";
 import { Multilingual } from "@/data";
 import { Transformer } from "@/serialization";
+import api from "@/api";
 
 export type ReportFieldProps<TField = ReportFieldDefinition> = {
     field: TField;
 }
 
+export const name = ({ id }: ReportFieldDefinition) => `field_${id}`;
+
 export const CustomField = ({ field, ...props }: ReportFieldProps) => {
     switch (field.type) {
         case "short-text":
@@ -43,9 +46,10 @@ export const CustomField = ({ field, ...props }: ReportFieldProps) => {
 
 CustomField.Text = ({ field }: ReportFieldProps) => {
     return <>
-        <Field label={ field.label.pl } name={ field.name }
+        <Field label={ field.label.pl } name={ name(field) }
                fullWidth
-               rows={ field.type == "long-text" ? 4 : 1 } multiline={ field.type == "long-text" }
+               rows={ field.type == "long-text" ? 4 : 1 }
+               multiline={ field.type == "long-text" }
                component={ TextFieldFormik }
         />
         <Typography variant="caption" color="textSecondary" dangerouslySetInnerHTML={{ __html: field.description.pl }}/>
@@ -54,14 +58,14 @@ CustomField.Text = ({ field }: ReportFieldProps) => {
 
 CustomField.Select = ({ field }: ReportFieldProps<SingleChoiceFieldDefinition>) => {
     const { t } = useTranslation();
-    const id = `custom-field-${field.name}`;
+    const id = `custom-field-${field.id}`;
     const { values, setFieldValue } = useFormikContext<any>();
 
-    const value = values[field.name];
+    const value = values[name(field)];
 
     return <FormControl variant="outlined">
         <InputLabel htmlFor={id}>{ field.label.pl }</InputLabel>
-        <Select label={ field.label.pl } name={ field.name } id={id} value={ value } onChange={ ({ target }) => setFieldValue(field.name, target.value, false) }>
+        <Select label={ field.label.pl } name={ name(field) } id={id} value={ value } onChange={ ({ target }) => setFieldValue(name(field), target.value, false) }>
             { field.choices.map(choice => <MenuItem value={ choice as any }>{ choice.pl }</MenuItem>) }
         </Select>
         <Typography variant="caption" color="textSecondary" dangerouslySetInnerHTML={{ __html: field.description.pl }}/>
@@ -72,17 +76,17 @@ CustomField.Choice = ({ field }: ReportFieldProps<SingleChoiceFieldDefinition |
     const { t } = useTranslation();
     const { values, setFieldValue } = useFormikContext<any>();
 
-    const value = values[field.name];
+    const value = values[name(field)];
 
     const isSelected = field.type == 'radio'
         ? (checked: Multilingual<string>) => value == checked
         : (checked: Multilingual<string>) => (value || []).includes(checked)
 
     const handleChange = field.type == 'radio'
-        ? (choice: Multilingual<string>) => () => setFieldValue(field.name, choice, false)
+        ? (choice: Multilingual<string>) => () => setFieldValue(name(field), choice, false)
         : (choice: Multilingual<string>) => () => {
             const current = value || [];
-            setFieldValue(field.name, !current.includes(choice) ? [ ...current, choice ] : current.filter((c: Multilingual<string>) => c != choice), false);
+            setFieldValue(name(field), !current.includes(choice) ? [ ...current, choice ] : current.filter((c: Multilingual<string>) => c != choice), false);
         }
 
     const Component = field.type == 'radio' ? Radio : Checkbox;
@@ -101,7 +105,7 @@ CustomField.Choice = ({ field }: ReportFieldProps<SingleChoiceFieldDefinition |
 
 export type ReportFormValues = ReportFieldValues;
 
-const reportToFormValuesTransformer: Transformer<Report, ReportFormValues, { report: Report }> = {
+const reportFormValuesTransformer: Transformer<Report, ReportFormValues, { report: Report }> = {
     reverseTransform(subject: ReportFormValues, context: { report: Report }): Report {
         return { ...context.report, fields: subject };
     },
@@ -115,9 +119,12 @@ export default function ReportForm() {
     const schema = sampleReportSchema;
     const { t } = useTranslation();
 
-    const handleSubmit = async () => {};
+    const handleSubmit = async (values: ReportFormValues) => {
+        const result = reportFormValuesTransformer.reverseTransform(values);
+        await api.report.save(result);
+    };
 
-    return <Formik initialValues={ reportToFormValuesTransformer.transform(report) } onSubmit={ handleSubmit }>
+    return <Formik initialValues={ reportFormValuesTransformer.transform(report) } onSubmit={ handleSubmit }>
         { ({ submitForm }) => <Form>
             <Grid container>
                 <Grid item xs={12}>
diff --git a/src/management/api/field.ts b/src/management/api/field.ts
new file mode 100644
index 0000000..e4b2c20
--- /dev/null
+++ b/src/management/api/field.ts
@@ -0,0 +1,14 @@
+import { ReportFieldDefinition } from "@/data/report";
+import { axios } from "@/api";
+import { FieldDefinitionDTO, fieldDefinitionDtoTransformer } from "@/api/dto/edition";
+
+const REPORT_FIELD_INDEX_ENDPOINT = "/management/report/fields"
+
+export async function all(): Promise<ReportFieldDefinition[]> {
+    const result = await axios.get<FieldDefinitionDTO[]>(REPORT_FIELD_INDEX_ENDPOINT);
+    return (result.data || []).map(field => fieldDefinitionDtoTransformer.transform(field));
+}
+
+export async function save(field: ReportFieldDefinition) {
+    await axios.post(REPORT_FIELD_INDEX_ENDPOINT, fieldDefinitionDtoTransformer.reverseTransform(field));
+}
diff --git a/src/management/api/index.ts b/src/management/api/index.ts
index 6376c1a..c75b0a0 100644
--- a/src/management/api/index.ts
+++ b/src/management/api/index.ts
@@ -4,6 +4,7 @@ import * as type from "./type"
 import * as course from "./course"
 import * as internship from "./internship"
 import * as document from "./document"
+import * as field from "./field"
 
 export const api = {
     edition,
@@ -11,7 +12,8 @@ export const api = {
     type,
     course,
     internship,
-    document
+    document,
+    field
 }
 
 export default api;
diff --git a/src/management/edition/internship/list.tsx b/src/management/edition/internship/list.tsx
index f8cd8ea..f62287d 100644
--- a/src/management/edition/internship/list.tsx
+++ b/src/management/edition/internship/list.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { useAsync, useAsyncState } from "@/hooks";
 import { useSpacing } from "@/styles";
 import api from "@/management/api";
-import { Box, Button, Container, IconButton, Typography } from "@material-ui/core";
+import { Box, Button, Container, IconButton, Tooltip, Typography } from "@material-ui/core";
 import MaterialTable, { Column } from "material-table";
 import { actionsColumn } from "@/management/common/helpers";
 import { FileFind, Refresh, StickerCheckOutline, StickerRemoveOutline } from "mdi-material-ui";
@@ -46,7 +46,7 @@ export const InternshipManagement = ({ edition }: EditionManagementProps) => {
         }
 
         return <>
-            <IconButton onClick={ () => setOpen(true) }><StickerCheckOutline /></IconButton>
+            <Tooltip title={ t("translation:accept") as any }><IconButton onClick={ () => setOpen(true) }><StickerCheckOutline /></IconButton></Tooltip>
             { createPortal(
                 <AcceptSubmissionDialog onAccept={ handleSubmissionAccept } label="internship" open={ open } onClose={ () => setOpen(false) }/>,
                 document.getElementById("modals") as Element,
@@ -64,7 +64,7 @@ export const InternshipManagement = ({ edition }: EditionManagementProps) => {
         }
 
         return <>
-            <IconButton onClick={ () => setOpen(true) }><StickerRemoveOutline /></IconButton>
+            <Tooltip title={ t("translation:discard") as any }><IconButton onClick={ () => setOpen(true) }><StickerRemoveOutline /></IconButton></Tooltip>
             { createPortal(
                 <DiscardSubmissionDialog onDiscard={ handleSubmissionDiscard } label="internship" open={ open } onClose={ () => setOpen(false) }/>,
                 document.getElementById("modals") as Element,
diff --git a/src/management/edition/ipp/list.tsx b/src/management/edition/ipp/list.tsx
index 218c36e..fccfa55 100644
--- a/src/management/edition/ipp/list.tsx
+++ b/src/management/edition/ipp/list.tsx
@@ -105,7 +105,7 @@ export const PlanManagement = ({ edition }: EditionManagementProps) => {
         },
         {
             title: t("internship.column.status"),
-            render: summary => <StateLabel state={ summary.ipp?.state } />
+            render: summary => <StateLabel state={ summary.ipp?.state || null } />
         },
         actionsColumn(internship => <>
             { canAccept(internship.ipp) && <AcceptAction internship={ internship } /> }
diff --git a/src/management/edition/manage.tsx b/src/management/edition/manage.tsx
index 218e715..7814f14 100644
--- a/src/management/edition/manage.tsx
+++ b/src/management/edition/manage.tsx
@@ -47,9 +47,6 @@ export const EditionManagement = ({ edition }: EditionManagementProps) => {
             <Paper elevation={ 2 }>
                 <Typography className={ classes.header }>{ t("edition.manage.internships") }</Typography>
                 <Management.Menu>
-                    <ManagementLink icon={ <AccountMultiple/> } route={ route("management:edition_report_form", { edition: edition.id || "" }) }>
-                        { t("management:edition.students.title") }
-                    </ManagementLink>
                     <ManagementLink icon={ <BriefcaseAccount/> } route={ route("management:edition_internships", { edition: edition.id || "" }) }>
                         { t("management:edition.internships.title") }
                     </ManagementLink>
diff --git a/src/management/main.tsx b/src/management/main.tsx
index 73b8dcb..ecfd164 100644
--- a/src/management/main.tsx
+++ b/src/management/main.tsx
@@ -4,8 +4,7 @@ import React from "react";
 import { Link as RouterLink } from "react-router-dom";
 import { route } from "@/routing";
 import { useTranslation } from "react-i18next";
-import { CalendarClock, FileCertificateOutline, FileDocumentMultipleOutline } from "mdi-material-ui";
-
+import { CalendarClock, FileCertificateOutline, FileDocumentMultipleOutline, FormatPageBreak } from "mdi-material-ui";
 
 export const ManagementLink = ({ icon, route, children }: ManagementLinkProps) =>
     <ListItem button component={ RouterLink } to={ route }>
@@ -47,6 +46,9 @@ export const ManagementIndex = () => {
                     <ManagementLink icon={ <FileCertificateOutline /> } route={ route("management:types") }>
                         { t("management:type.index.title") }
                     </ManagementLink>
+                    <ManagementLink icon={ <FormatPageBreak/> } route={ route("management:report_fields") }>
+                        { t("management:edition.report-fields.title") }
+                    </ManagementLink>
                     <ManagementLink icon={ <FileDocumentMultipleOutline /> } route={ route("management:static_pages") }>
                         { t("management:page.index.title") }
                     </ManagementLink>
diff --git a/src/management/edition/report/fields/edit.tsx b/src/management/report/fields/edit.tsx
similarity index 98%
rename from src/management/edition/report/fields/edit.tsx
rename to src/management/report/fields/edit.tsx
index 0ced08d..995160b 100644
--- a/src/management/edition/report/fields/edit.tsx
+++ b/src/management/report/fields/edit.tsx
@@ -7,7 +7,7 @@ import { Form, Formik } from "formik";
 import { Actions } from "@/components";
 import { Save } from "@material-ui/icons";
 import { Cancel } from "mdi-material-ui";
-import { FieldDefinitionForm, FieldDefinitionFormValues, fieldFormValuesTransformer, initialFieldFormValues } from "@/management/edition/report/fields/form";
+import { FieldDefinitionForm, FieldDefinitionFormValues, fieldFormValuesTransformer, initialFieldFormValues } from "@/management/report/fields/form";
 
 export type EditFieldDialogProps = {
     onSave?: (field: ReportFieldDefinition) => void;
diff --git a/src/management/edition/report/fields/form.tsx b/src/management/report/fields/form.tsx
similarity index 95%
rename from src/management/edition/report/fields/form.tsx
rename to src/management/report/fields/form.tsx
index 2c720df..2b8e826 100644
--- a/src/management/edition/report/fields/form.tsx
+++ b/src/management/report/fields/form.tsx
@@ -11,14 +11,13 @@ import { Multilingual } from "@/data";
 import { Actions } from "@/components";
 import { Add } from "@material-ui/icons";
 import { TrashCan } from "mdi-material-ui";
-import { FieldPreview } from "@/management/edition/report/fields/list";
+import { FieldPreview } from "@/management/report/fields/list";
 import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 
 export type FieldDefinitionFormValues = ReportFieldDefinition | { type: string };
 
 export const initialFieldFormValues: FieldDefinitionFormValues = {
     type: "short-text",
-    name: "",
     description: {
         pl: "",
         en: "",
@@ -58,7 +57,6 @@ export function FieldDefinitionForm() {
     const classes = useStyles();
 
     return <div className={ spacing.vertical }>
-        <Field label={ t("report-field.field.name") } name="name" fullWidth component={ TextFieldFormik }/>
         <FormControl variant="outlined">
             <InputLabel htmlFor="report-field-type">{ t("report-field.field.type") }</InputLabel>
             <Field
@@ -81,7 +79,7 @@ export function FieldDefinitionForm() {
             <Typography variant="subtitle2">{ t("report-field.field.choices") }</Typography>
             <FieldArray name="choices" render={ helper => <>
                 { values.choices.map((value: Multilingual<string>, index: number) => <Card>
-                    <CardHeader subheader={ t("report-field.field.choice", { index }) } action={ <>
+                    <CardHeader subheader={ t("report-field.field.choice", { index: index + 1 }) } action={ <>
                         <IconButton onClick={ () => helper.remove(index) }>
                             <TrashCan />
                         </IconButton>
diff --git a/src/management/edition/report/fields/list.tsx b/src/management/report/fields/list.tsx
similarity index 54%
rename from src/management/edition/report/fields/list.tsx
rename to src/management/report/fields/list.tsx
index 4a02b2e..69b6a97 100644
--- a/src/management/edition/report/fields/list.tsx
+++ b/src/management/report/fields/list.tsx
@@ -1,20 +1,24 @@
-import React, { useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { Page } from "@/pages/base";
 import { Management } from "@/management/main";
-import { Box, Container, IconButton, Tooltip, Typography } from "@material-ui/core";
+import { Box, Button, Container, IconButton, Tooltip, Typography } from "@material-ui/core";
 import { useTranslation } from "react-i18next";
-import { sampleReportSchema } from "@/provider/dummy/report";
 import MaterialTable, { Column } from "material-table";
 import { actionsColumn, fieldComparator, multilingualStringComparator } from "@/management/common/helpers";
 import { MultilingualCell } from "@/management/common/MultilangualCell";
 import { ReportFieldDefinition } from "@/data/report";
 import { Formik } from "formik";
 import { CustomField } from "@/forms/report";
-import { Edit } from "@material-ui/icons";
+import { Add, Edit } from "@material-ui/icons";
 import { createPortal } from "react-dom";
 import { createDeleteAction } from "@/management/common/DeleteResourceAction";
-import { EditFieldDefinitionDialog } from "@/management/edition/report/fields/edit";
-import { EditionManagement } from "../../manage";
+import { EditFieldDefinitionDialog } from "@/management/report/fields/edit";
+import api from "@/management/api";
+import { useAsync, useAsyncState } from "@/hooks";
+import { Async } from "@/components/async";
+import { Actions } from "@/components";
+import { Refresh } from "mdi-material-ui";
+import { useSpacing } from "@/styles";
 
 const title = "edition.report-fields.title";
 
@@ -24,17 +28,42 @@ export const FieldPreview = ({ field }: { field: ReportFieldDefinition }) => {
     </Formik>
 }
 
-export const EditionReportFields = () => {
+export const ReportFields = () => {
     const { t } = useTranslation("management");
-    const schema = sampleReportSchema;
+    const [fields, setFieldsPromise] = useAsyncState<ReportFieldDefinition[]>();
+
+    const updateFieldList = () => {
+        setFieldsPromise(api.field.all());
+    }
+
+    useEffect(updateFieldList, []);
 
     const handleFieldDeletion = () => {}
 
+    const CreateFieldAction = () => {
+        const [ open, setOpen ] = useState<boolean>(false);
+
+        const handleFieldCreation = async (value: ReportFieldDefinition) => {
+            await api.field.save(value);
+            setOpen(false);
+        }
+
+        return <>
+            <Button variant="contained" color="primary" startIcon={ <Add /> } onClick={ () => setOpen(true) }>{ t("create") }</Button>
+            { open && createPortal(
+                <EditFieldDefinitionDialog open={ open } onSave={ handleFieldCreation } onClose={ () => setOpen(false) }/>,
+                document.getElementById("modals") as Element
+            ) }
+        </>
+    }
+
     const DeleteFieldAction  = createDeleteAction<ReportFieldDefinition>({ label: field => field.label.pl, onDelete: handleFieldDeletion })
     const EditFieldAction = ({ field }: { field: ReportFieldDefinition }) => {
         const [ open, setOpen ] = useState<boolean>(false);
 
         const handleFieldSave = async (field: ReportFieldDefinition) => {
+            await api.field.save(field);
+            setOpen(false);
         }
 
         return <>
@@ -66,20 +95,28 @@ export const EditionReportFields = () => {
         </>),
     ]
 
+    const spacing = useSpacing(2);
+
     return <Page>
         <Page.Header maxWidth="lg">
-            <EditionManagement.Breadcrumbs>
+            <Management.Breadcrumbs>
                 <Typography color="textPrimary">{ t(title) }</Typography>
-            </EditionManagement.Breadcrumbs>
+            </Management.Breadcrumbs>
             <Page.Title>{ t(title) }</Page.Title>
         </Page.Header>
-        <Container maxWidth="lg">
-            <MaterialTable
-                columns={ columns }
-                data={ schema }
-                title={ t(title) }
-                detailPanel={ field => <Box p={3}><FieldPreview field={ field } /></Box> }
-            />
+        <Container maxWidth="lg" className={ spacing.vertical }>
+            <Actions>
+                <CreateFieldAction />
+                <Button onClick={ updateFieldList } startIcon={ <Refresh /> }>{ t("refresh") }</Button>
+            </Actions>
+            <Async async={ fields }>
+                { fields => <MaterialTable
+                    columns={ columns }
+                    data={ fields }
+                    title={ t(title) }
+                    detailPanel={ field => <Box p={3}><FieldPreview field={ field } /></Box> }
+                /> }
+            </Async>
         </Container>
     </Page>
 }
diff --git a/src/management/routing.tsx b/src/management/routing.tsx
index ca9f9dc..863fe7b 100644
--- a/src/management/routing.tsx
+++ b/src/management/routing.tsx
@@ -6,17 +6,16 @@ import { ManagementIndex } from "@/management/main";
 import StaticPageManagement from "@/management/page/list";
 import { InternshipTypeManagement } from "@/management/type/list";
 import { EditionRouter, EditionManagement } from "@/management/edition/manage";
-import { EditionReportFields } from "@/management/edition/report/fields/list";
 import { EditionSettings } from "@/management/edition/settings";
 import { InternshipManagement } from "@/management/edition/internship/list";
 import { InternshipDetails } from "@/management/edition/internship/details";
 import { PlanManagement } from "@/management/edition/ipp/list";
+import { ReportFields } from "@/management/report/fields/list";
 
 export const managementRoutes: Route[] = ([
     { name: "index", path: "/", content: ManagementIndex, exact: true },
 
     { name: "edition_router", path: "/editions/:edition", content: EditionRouter },
-    { name: "edition_report_form", path: "/editions/:edition/report", content: EditionReportFields, tags: ["edition"] },
     { name: "edition_settings", path: "/editions/:edition/settings", content: EditionSettings, tags: ["edition"] },
     { name: "edition_manage", path: "/editions/:edition", content: EditionManagement, tags: ["edition"], exact: true },
     { name: "edition_internship", path: "/editions/:edition/internships/:internship", content: InternshipDetails, tags: ["edition"] },
@@ -24,6 +23,7 @@ export const managementRoutes: Route[] = ([
     { name: "edition_ipp_index", path: "/editions/:edition/ipp", content: PlanManagement, tags: ["edition"] },
     { name: "editions", path: "/editions", content: EditionsManagement },
 
+    { name: "report_fields", path: "/fields", content: ReportFields },
     { name: "types", path: "/types", content: InternshipTypeManagement },
     { name: "static_pages", path: "/static-pages", content: StaticPageManagement }
 ] as Route[]).map(
diff --git a/src/pages/main.tsx b/src/pages/main.tsx
index b899967..a88404c 100644
--- a/src/pages/main.tsx
+++ b/src/pages/main.tsx
@@ -14,8 +14,8 @@ import { InsuranceState } from "@/state/reducer/insurance";
 import { InsuranceStep } from "@/pages/steps/insurance";
 import { StudentStep } from "@/pages/steps/student";
 import api from "@/api";
-import { AppDispatch, InternshipPlanActions, InternshipProposalActions, useDispatch } from "@/state/actions";
-import { internshipRegistrationDtoTransformer } from "@/api/dto/internship-registration";
+import { AppDispatch, InternshipPlanActions, InternshipProposalActions, InternshipReportActions, useDispatch } from "@/state/actions";
+import { internshipDocumentDtoTransformer, internshipRegistrationDtoTransformer, internshipReportDtoTransformer } from "@/api/dto/internship-registration";
 import { UploadType } from "@/api/upload";
 import { ReportStep } from "@/pages/steps/report";
 
@@ -30,18 +30,33 @@ export const updateInternshipInfo = async (dispatch: AppDispatch) => {
     })
 
     const plan = internship.documentation.find(doc => doc.type === UploadType.Ipp);
+    const report = internship.report;
 
     if (plan) {
         dispatch({
             type: InternshipPlanActions.Receive,
-            document: plan,
+            document: internshipDocumentDtoTransformer.transform(plan),
             state: plan.state,
+            comment: plan.changeStateComment,
         })
     } else {
         dispatch({
             type: InternshipPlanActions.Reset,
         })
     }
+
+    if (report) {
+        dispatch({
+            type: InternshipReportActions.Receive,
+            report: internshipReportDtoTransformer.transform(report),
+            state: report.state,
+            comment: report.changeStateComment,
+        })
+    } else {
+        dispatch({
+            type: InternshipReportActions.Reset,
+        })
+    }
 }
 
 export const MainPage = () => {
diff --git a/src/pages/steps/plan.tsx b/src/pages/steps/plan.tsx
index 6fce397..a98537a 100644
--- a/src/pages/steps/plan.tsx
+++ b/src/pages/steps/plan.tsx
@@ -3,7 +3,7 @@ import { AppState } from "@/state/reducer";
 import { getSubmissionStatus, SubmissionState, SubmissionStatus } from "@/state/reducer/submission";
 import { useTranslation } from "react-i18next";
 import { Box, Button, ButtonProps, StepProps } from "@material-ui/core";
-import { FileDownloadOutline, FileUploadOutline } from "mdi-material-ui/index";
+import { FileUploadOutline } from "mdi-material-ui/index";
 import { route } from "@/routing";
 import { Link as RouterLink, useHistory } from "react-router-dom";
 import { Actions, Step } from "@/components";
@@ -15,7 +15,6 @@ import { useDeadlines } from "@/hooks";
 import { InternshipDocument } from "@/api/dto/internship-registration";
 import { FileInfo } from "@/components/fileinfo";
 import { useSpacing } from "@/styles";
-import { AcceptanceActions } from "@/components/acceptance-action";
 import { InternshipPlanActions, useDispatch } from "@/state/actions";
 
 const PlanActions = () => {
@@ -76,7 +75,7 @@ export const PlanComment = (props: HTMLProps<HTMLDivElement>) => {
 
     return comment ? <Alert severity={ declined ? "error" : "warning" } { ...props as any }>
         <AlertTitle>{ t('comments') }</AlertTitle>
-        { comment }
+        <div dangerouslySetInnerHTML={{ __html: comment }} />
     </Alert> : null
 }
 
diff --git a/src/provider/dummy/report.ts b/src/provider/dummy/report.ts
index 8973586..12fd3f1 100644
--- a/src/provider/dummy/report.ts
+++ b/src/provider/dummy/report.ts
@@ -1,4 +1,5 @@
 import { Report, ReportSchema } from "@/data/report";
+import { Stateful } from "@/data";
 
 const choices = [1, 2, 3, 4, 5].map(n => ({
     pl: `Wybór ${n}`,
@@ -8,7 +9,7 @@ const choices = [1, 2, 3, 4, 5].map(n => ({
 export const sampleReportSchema: ReportSchema = [
     {
         type: "short-text",
-        name: "short",
+        id: "short",
         description: {
             en: "Text field, with <strong>HTML</strong> description",
             pl: "Pole tekstowe, z opisem w formacie <strong>HTML</strong>"
@@ -20,7 +21,7 @@ export const sampleReportSchema: ReportSchema = [
     },
     {
         type: "long-text",
-        name: "long",
+        id: "long",
         description: {
             en: "Long text field, with <strong>HTML</strong> description",
             pl: "Długie pole tekstowe, z opisem w formacie <strong>HTML</strong>"
@@ -32,7 +33,7 @@ export const sampleReportSchema: ReportSchema = [
     },
     {
         type: "radio",
-        name: "radio",
+        id: "radio",
         description: {
             en: "single choice field, with <strong>HTML</strong> description",
             pl: "Pole jednokrotnego wyboru, z opisem w formacie <strong>HTML</strong>"
@@ -45,7 +46,7 @@ export const sampleReportSchema: ReportSchema = [
     },
     {
         type: "select",
-        name: "select",
+        id: "select",
         description: {
             en: "select field, with <strong>HTML</strong> description",
             pl: "Pole jednokrotnego wyboru z selectboxem, z opisem w formacie <strong>HTML</strong>"
@@ -57,8 +58,8 @@ export const sampleReportSchema: ReportSchema = [
         },
     },
     {
-        name: "multi",
         type: "checkbox",
+        id: "multi",
         description: {
             en: "Multiple choice field, with <strong>HTML</strong> description",
             pl: "Pole wielokrotnego wyboru, z opisem w formacie <strong>HTML</strong>"
@@ -73,8 +74,10 @@ export const sampleReportSchema: ReportSchema = [
 
 export const emptyReport: Report = {
     fields: {
-        "short": "Testowa wartość",
-        "select": choices[0],
-        "multi": [ choices[1], choices[2] ],
-    }
+        "field_short": "Testowa wartość",
+        "field_select": choices[0],
+        "field_multi": [ choices[1], choices[2] ],
+    },
+    comment: "",
+    state: "draft",
 }
diff --git a/src/state/actions/plan.ts b/src/state/actions/plan.ts
index cafc834..f2aab43 100644
--- a/src/state/actions/plan.ts
+++ b/src/state/actions/plan.ts
@@ -33,6 +33,7 @@ export interface ReceivePlanDeclineAction extends ReceiveSubmissionDeclineAction
 export interface ReceivePlanUpdateAction extends ReceiveSubmissionUpdateAction<InternshipPlanActions.Receive> {
     document: InternshipDocument;
     state: SubmissionState;
+    comment?: string;
 }
 
 export interface SavePlanAction extends SaveSubmissionAction<InternshipPlanActions.Save> {
diff --git a/src/state/actions/report.ts b/src/state/actions/report.ts
index c98aa7b..8681af5 100644
--- a/src/state/actions/report.ts
+++ b/src/state/actions/report.ts
@@ -15,11 +15,15 @@ export enum InternshipReportActions {
     Approve = "RECEIVE_REPORT_APPROVE",
     Decline = "RECEIVE_REPORT_DECLINE",
     Receive = "RECEIVE_REPORT_STATE",
+    Reset = "RESET_REPORT",
 }
 
 export interface SendReportAction extends SendSubmissionAction<InternshipReportActions.Send> {
 }
 
+export interface ResetReportAction extends SendSubmissionAction<InternshipReportActions.Reset> {
+}
+
 export interface ReceiveReportApproveAction extends ReceiveSubmissionApproveAction<InternshipReportActions.Approve> {
 }
 
@@ -29,6 +33,7 @@ export interface ReceiveReportDeclineAction extends ReceiveSubmissionDeclineActi
 export interface ReceiveReportUpdateAction extends ReceiveSubmissionUpdateAction<InternshipReportActions.Receive> {
     report: Report;
     state: SubmissionState,
+    comment: string,
 }
 
 export interface SaveReportAction extends SaveSubmissionAction<InternshipReportActions.Save> {
@@ -38,6 +43,7 @@ export interface SaveReportAction extends SaveSubmissionAction<InternshipReportA
 export type InternshipReportAction
     = SendReportAction
     | SaveReportAction
+    | ResetReportAction
     | ReceiveReportApproveAction
     | ReceiveReportDeclineAction
     | ReceiveReportUpdateAction;
diff --git a/src/state/reducer/plan.ts b/src/state/reducer/plan.ts
index 3887ce0..dd3b1dc 100644
--- a/src/state/reducer/plan.ts
+++ b/src/state/reducer/plan.ts
@@ -54,6 +54,7 @@ const internshipPlanReducer = (state: InternshipPlanState = defaultInternshipPla
                     ApiSubmissionState.Rejected,
                     ApiSubmissionState.Submitted
                 ].includes(action.state),
+                comment: action.comment || null,
                 document: action.document,
             }
 
diff --git a/src/state/reducer/report.ts b/src/state/reducer/report.ts
index 81fb5ac..560a41f 100644
--- a/src/state/reducer/report.ts
+++ b/src/state/reducer/report.ts
@@ -37,6 +37,8 @@ const internshipReportReducer = (state: InternshipReportState = defaultInternshi
     state = internshipReportSubmissionReducer(state, action);
 
     switch (action.type) {
+        case InternshipReportActions.Reset:
+            return defaultInternshipReportState;
         case InternshipReportActions.Save:
         case InternshipReportActions.Send:
             return {
@@ -57,6 +59,7 @@ const internshipReportReducer = (state: InternshipReportState = defaultInternshi
                     ApiSubmissionState.Submitted
                 ].includes(action.state),
                 report: reportSerializationTransformer.transform(action.report),
+                comment: action.comment,
             }
         default:
             return state;