Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-add priority text field to admissions #1732

Merged
merged 1 commit into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions frontend/src/routes/ApplicationForm/FormStructure.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { SelectedGroups } from ".";
import JsonFieldEditor from "src/components/JsonFieldEditor";
import { Button } from "@webkom/lego-bricks";
import LinkButton from "src/components/LinkButton";
import PriorityTextField from "./PriorityTextField";

interface FormStructureProps extends FormikValues {
admission?: Admission;
Expand Down Expand Up @@ -76,6 +77,25 @@ const FormStructure: React.FC<FormStructureProps> = ({
Mobilnummeret vil bli brukt til å kalle deg inn på intervju.
</HelpText>
<Field name="phoneNumber" component={PhoneNumberField} />
<HelpText>
{!isRevy && (
<>
<Icon name="information-circle-outline" />
Kun leder av Abakus kan se det du skriver inn i prioriterings-
og kommentarfeltet.
</>
)}
<Icon name="information-circle-outline" />
Det er ikke sikkert prioriteringslisten vil bli tatt hensyn til.
Ikke søk på en {isRevy ? "gruppe" : "komité"} du ikke ønsker å bli
med i.
</HelpText>
<Field
name="priorityText"
component={PriorityTextField}
label="Prioriteringer, og andre kommentarer"
optional
/>
<JsonFieldEditor
sectionName="headerFields"
fields={admission?.header_fields}
Expand Down
69 changes: 69 additions & 0 deletions frontend/src/routes/ApplicationForm/PriorityTextField.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import React, { useEffect } from "react";
import { FieldLabel, StyledTextAreaField } from "src/components/styledFields";
import styled from "styled-components";
import { media } from "src/styles/mediaQueries";
import useDebouncedState from "src/utils/useDebouncedState";
import { savePriorityTextDraft } from "src/utils/draftHelper";
import { FormikValues } from "formik";

type PriorityTextFieldProps = FormikValues;

const PriorityTextField: React.FC<PriorityTextFieldProps> = ({
label,
optional = false,
field: { name, onChange, value },
form: { handleBlur },
disabled,
}) => {
const debouncedValue = useDebouncedState(value);

useEffect(() => {
savePriorityTextDraft(value);
}, [debouncedValue]);

return (
<Wrapper>
<LabelWrapper>
<FieldLabel htmlFor={name}>{label}</FieldLabel>
{optional && <Optional>(valgfritt)</Optional>}
</LabelWrapper>
<StyledTextAreaField
name={name}
id={name}
disabled={disabled}
onChange={onChange}
onBlur={handleBlur}
placeholder="Skriv dine kommentarer her..."
value={value}
rows={5}
/>
</Wrapper>
);
};

export default PriorityTextField;

/** Styles **/

const Wrapper = styled.div`
grid-area: prioritytext;
${media.portrait`
margin-top: 0.5rem;
`};
`;

const LabelWrapper = styled.span`
display: flex;
${media.handheld`
flex-direction: column;
margin-bottom: 5px;
`};
`;

const Optional = styled.span`
font-size: 0.8rem;
color: rgba(57, 75, 89, 0.75);
font-weight: 500;
margin-left: 0.3rem;
line-height: 1rem;
`;
21 changes: 21 additions & 0 deletions frontend/src/routes/ReceiptForm/FormStructure.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import { clearAllDrafts } from "src/utils/draftHelper";
import JsonFieldEditor from "src/components/JsonFieldEditor";
import { Button } from "@webkom/lego-bricks";
import LinkButton from "src/components/LinkButton";
import PriorityTextField from "../ApplicationForm/PriorityTextField";

interface FormStructureProps {
toggleIsEditing: () => void;
Expand Down Expand Up @@ -143,6 +144,26 @@ const FormStructure: React.FC<FormStructureProps> = ({ toggleIsEditing }) => {
component={PhoneNumberField}
disabled={true}
/>
<HelpText>
{!isRevy && (
<>
<Icon name="information-circle-outline" />
Kun leder av Abakus kan se det du skriver inn i prioriterings-
og kommentarfeltet.
</>
)}
<Icon name="information-circle-outline" />
Det er ikke sikkert prioriteringslisten vil bli tatt hensyn til.
Ikke søk på en {isRevy ? "gruppe" : "komité"} du ikke ønsker å bli
med i.
</HelpText>
<Field
name="priorityText"
component={PriorityTextField}
label="Prioriteringer, og andre kommentarer"
optional
disabled={true}
/>
<JsonFieldEditor
sectionName="headerFields"
fields={admission?.header_fields}
Expand Down