Skip to content

added language selector for reporting forms #957

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.

Sign up for GitHub

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

Merged
idormenco merged 1 commit into from
Apr 16, 2025
Merged

added language selector for reporting forms #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 49 additions & 15 deletions web-citizen-reporting/web-citizen-reporting-template/src/components/ReportAnswersStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,16 @@ import { useSuspenseQuery } from "@tanstack/react-query";
import { notFound } from "@tanstack/react-router";
import { format } from "date-fns";
import { CalendarIcon } from "lucide-react";
import React, { useCallback, useEffect } from "react";
import React, { useCallback, useEffect, useState } from "react";
import { useFormContext } from "react-hook-form";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectTrigger,
SelectValue,
} from "./ui/select";

function QuestionText({
languageCode,
Expand Down Expand Up @@ -95,6 +103,10 @@ function ReportAnswersStep() {

const formValues = form.watch();

const [selectedLanguage, setSelectedLanguage] = useState<string>(
citizenReportForm.defaultLanguage
);

useEffect(() => {
citizenReportForm.questions.forEach((question) => {
if (isMultiSelectQuestion(question)) {
Expand Down Expand Up @@ -146,11 +158,33 @@ function ReportAnswersStep() {
return (
<Card>
<CardHeader>
<CardTitle>
{citizenReportForm.name[citizenReportForm.defaultLanguage]}
<CardTitle className="flex justify-between mb-4">
<div>{citizenReportForm.name[selectedLanguage]}</div>

<div className="flex flex-row gap-2 items-center">
<div className="p-1 mb-1">Language:</div>
<Select
onValueChange={setSelectedLanguage}
defaultValue={selectedLanguage}
value={selectedLanguage}
>
<SelectTrigger>
<SelectValue placeholder="Language" />
</SelectTrigger>
<SelectContent>
<SelectGroup>
{citizenReportForm.languages.map((language) => (
<SelectItem key={language} value={language}>
{language}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
</div>
</CardTitle>
<CardDescription>
{citizenReportForm.description[citizenReportForm.defaultLanguage]}
{citizenReportForm.description[selectedLanguage]}
</CardDescription>
</CardHeader>

Expand All @@ -166,11 +200,11 @@ function ReportAnswersStep() {
<FormItem>
<QuestionText
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<QuestionDescription
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>

<FormControl>
Expand Down Expand Up @@ -198,11 +232,11 @@ function ReportAnswersStep() {
<FormItem>
<QuestionText
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<QuestionDescription
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<FormControl>
<Input
Expand Down Expand Up @@ -231,11 +265,11 @@ function ReportAnswersStep() {
<FormItem className="flex flex-col">
<QuestionText
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<QuestionDescription
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<Popover>
<PopoverTrigger asChild>
Expand Down Expand Up @@ -284,11 +318,11 @@ function ReportAnswersStep() {
<FormItem className="space-y-3">
<QuestionText
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<QuestionDescription
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<FormControl>
<RadioGroup
Expand All @@ -305,7 +339,7 @@ function ReportAnswersStep() {
<RadioGroupItem value={option.id} />
</FormControl>
<FormLabel className="font-normal">
{option.text[citizenReportForm.defaultLanguage]}
{option.text[selectedLanguage]}
</FormLabel>
</FormItem>
))}
Expand Down Expand Up @@ -353,11 +387,11 @@ function ReportAnswersStep() {
<div className="mb-4">
<QuestionText
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
<QuestionDescription
question={question}
languageCode={citizenReportForm.defaultLanguage}
languageCode={selectedLanguage}
/>
</div>
{question.options.map((option) => (
Expand Down
1 change: 0 additions & 1 deletion web-citizen-reporting/web-citizen-reporting-template/src/queries/use-locations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { getForms } from "@/api/get-forms";
import { getLocations } from "@/api/get-locations";
import { queryOptions, useQuery } from "@tanstack/react-query";

Expand Down