sheptikhinv/survey-webapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix surveyInfo

Browse source
This commit is contained in:
Tatiana Nikolaeva 2025-05-26 10:11:53 +05:00
parent 6068c717d3
commit 33f2b5ef62
8 changed files with 91 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SurveyFrontend/src/api/SurveyApi.ts
View file

@ -5,6 +5,7 @@ export interface ISurvey {
title: string;
description: string;
createdBy: number;
createdAt: string;
}
export interface INewSurvey{

13
SurveyFrontend/src/components/MySurveyList/MySurveyList.tsx
View file

@ -13,6 +13,17 @@ export const MySurveyList = () => {
const navigate = useNavigate();
const [surveys, setSurveys] = useState<MySurveyItem[]>([]);
const formatDate = (dateString: string) => {
const date = new Date(dateString);
const day = String(date.getDate()).padStart(2, '0');
const month = String(date.getMonth() + 1).padStart(2, '0');
const year = date.getFullYear();
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
return `${day}/${month}/${year} ${hours}:${minutes}`;
};
useEffect(() => {
const fetchSurvey = async () => {
try {
@ -63,7 +74,7 @@ export const MySurveyList = () => {
<h1 className={styles.title}>{survey.title}</h1>
<h2 className={styles.description}>{survey.description}</h2>
</div>
<span className={styles.date}>Дата создания: {survey.createdBy}</span>
<span className={styles.date}>Дата создания: {formatDate(survey.createdAt)}</span>
</div>
<div className={styles.container}>
<div className={`${styles.status} ${

18
SurveyFrontend/src/components/Results/Results.tsx
View file

@ -1,18 +1,22 @@
import SurveyInfo from "../SurveyInfo/SurveyInfo.tsx";
import styles from './Results.module.css'
import {useState} from "react";
import {useOutletContext} from "react-router-dom";
import {ISurvey} from "../../api/SurveyApi.ts";
export const Results = () => {
const [descriptionSurvey, setDescriptionSurvey] = useState('');
const [titleSurvey, setTitleSurvey] = useState('Название опроса');
const { survey, setSurvey } = useOutletContext<{
survey: ISurvey;
setSurvey: (survey: ISurvey) => void;
}>();
return(
<div className={styles.results}>
<SurveyInfo
titleSurvey={titleSurvey}
descriptionSurvey={descriptionSurvey}
setDescriptionSurvey={setDescriptionSurvey}
setTitleSurvey={setTitleSurvey}
titleSurvey={survey.title}
descriptionSurvey={survey.description}
setDescriptionSurvey={(value) => setSurvey({ ...survey, description: value })}
setTitleSurvey={(value) => setSurvey({ ...survey, title: value })}
/>
</div>
)

1
SurveyFrontend/src/components/SettingSurvey/SettingSurvey.module.css
View file

@ -2,6 +2,7 @@
.settingSurvey{
width: 85%;
height: 100vh;
}
.startEndTime{

48
SurveyFrontend/src/components/SettingSurvey/SettingSurvey.tsx
View file

@ -1,51 +1,25 @@
import React, {useState} from 'react';
import React from 'react';
import SurveyInfo from "../SurveyInfo/SurveyInfo.tsx";
import styles from "./SettingSurvey.module.css";
import TimeEvent from "../TimeEvent/TimeEvent.tsx";
import SaveButton from "../SaveButton/SaveButton.tsx";
// import {useParams} from "react-router-dom";
// import {getSurveyById, ISurvey} from "../../api/SurveyApi.ts";
import {ISurvey} from "../../api/SurveyApi.ts";
import {useOutletContext} from "react-router-dom";
const SettingSurvey: React.FC = () => {
const [descriptionSurvey, setDescriptionSurvey] = useState('');
// const [survey, setSurvey] = useState<ISurvey | null>(null);
const [titleSurvey, setTitleSurvey] = useState('');
// const { surveyId } = useParams<{ surveyId: string }>();
// useEffect(() => {
// if (!surveyId) {
// console.error('Survey ID is missing');
// return;
// }
// const id = parseInt(surveyId);
// if (isNaN(id)) {
// console.error('Invalid survey ID');
// return;
// }
//
// const fetchData = async () => {
// try {
// const surveyData = await getSurveyById(id);
// setSurvey(surveyData);
// setTitleSurvey(surveyData.title);
// setDescriptionSurvey(surveyData.description);
// } catch (error) {
// console.error('Ошибка:', error);
// }
// };
//
// fetchData();
//
// }, [surveyId]);
const { survey, setSurvey } = useOutletContext<{
survey: ISurvey;
setSurvey: (survey: ISurvey) => void;
}>();
return (
<div className={styles.settingSurvey}>
<SurveyInfo
titleSurvey={titleSurvey}
descriptionSurvey={descriptionSurvey}
setDescriptionSurvey={setDescriptionSurvey}
setTitleSurvey={setTitleSurvey}
titleSurvey={survey.title}
descriptionSurvey={survey.description}
setDescriptionSurvey={(value) => setSurvey({ ...survey, description: value })}
setTitleSurvey={(value) => setSurvey({ ...survey, title: value })}
/>
<div className={styles.startEndTime}>
<TimeEvent title='Время начала'/>

4
SurveyFrontend/src/components/SurveyInfo/SurveyInfo.tsx
View file

@ -88,7 +88,7 @@ const SurveyInfo: React.FC<SurveyInfoProps> = ({titleSurvey, setDescriptionSurve
}
const renderTitle = () => {
if (isSurveyViewPage || isCompleteSurveyActive) {
if (isCompleteSurveyActive) {
return (
<button className={styles.titleSurvey}>
<h1>{titleSurvey || 'Название опроса'}</h1>
@ -176,4 +176,4 @@ const SurveyInfo: React.FC<SurveyInfoProps> = ({titleSurvey, setDescriptionSurve
};
export default SurveyInfo;
export default SurveyInfo;

33
SurveyFrontend/src/components/SurveyPage/SurveyPage.tsx
View file

@ -1,8 +1,8 @@
import React, { useEffect, useState } from "react";
import SurveyInfo from "../SurveyInfo/SurveyInfo.tsx";
import QuestionsList, { Question } from "../QuestionsList/QuestionsList.tsx";
import { getSurveyById, ISurvey, updateSurvey } from "../../api/SurveyApi.ts";
import { useParams } from "react-router-dom";
import { ISurvey, updateSurvey } from "../../api/SurveyApi.ts";
import {useOutletContext} from "react-router-dom";
import { addNewQuestion, getListQuestions, updateQuestion, deleteQuestion } from "../../api/QuestionApi.ts";
import styles from "./SurveyPage.module.css";
import SaveButton from "../SaveButton/SaveButton.tsx";
@ -153,22 +153,28 @@ class ActionQueue {
}
export const SurveyPage: React.FC = () => {
const [survey, setSurvey] = useState<ISurvey | null>(null);
// const [survey, setSurvey] = useState<ISurvey | null>(null);
const [questions, setQuestions] = useState<Question[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const { surveyId } = useParams<{ surveyId: string }>();
// const { surveyId } = useParams<{ surveyId: string }>();
const [description, setDescription] = useState('');
const [title, setTitle] = useState('');
const { survey, setSurvey } = useOutletContext<{
survey: ISurvey;
setSurvey: (survey: ISurvey) => void;
}>();
useEffect(() => {
if (!surveyId) {
if (!survey.id) {
console.error('Survey ID is missing');
return;
}
const id = parseInt(surveyId);
// const id = parseInt(survey.id);
const id = survey.id;
if (isNaN(id)) {
console.error('Invalid survey ID');
return;
@ -177,10 +183,10 @@ export const SurveyPage: React.FC = () => {
const fetchData = async () => {
try {
setLoading(true);
const surveyData = await getSurveyById(id);
setSurvey(surveyData);
setTitle(surveyData.title);
setDescription(surveyData.description);
// const surveyData = await getSurveyById(id);
setSurvey(survey);
setTitle(survey.title);
setDescription(survey.description);
const questionsData = await getListQuestions(id);
const formattedQuestions = await Promise.all(questionsData.map(async q => {
@ -205,14 +211,15 @@ export const SurveyPage: React.FC = () => {
};
fetchData();
}, [surveyId]);
}, [survey.id]);
const handleSave = async () => {
if (!surveyId || !survey) return;
if (!survey.id || !survey) return;
try {
setError(null);
const id = parseInt(surveyId);
// const id = parseInt(survey.id);
const id = survey.id;
const actionQueue = new ActionQueue();
actionQueue.add({

35
SurveyFrontend/src/pages/SurveyCreateAndEditingPage/SurveyCreateAndEditingPage.tsx
View file

@ -1,16 +1,47 @@
import Header from "../../components/Header/Header.tsx";
import Navigation from "../../components/Navigation/Navigation.tsx";
import styles from './SurveyCreateAndEditingPage.module.css'
import { Outlet } from "react-router-dom";
import {Outlet, useParams, useLocation} from "react-router-dom";
import {useEffect, useState} from "react";
import {getSurveyById, ISurvey} from "../../api/SurveyApi.ts";
export const SurveyCreateAndEditingPage = () => {
const { surveyId } = useParams<{ surveyId: string }>();
const location = useLocation();
const [survey, setSurvey] = useState<ISurvey | null>(null);
const [loading, setLoading] = useState(false);
const isCreateMode = location.pathname.includes('/survey/create');
useEffect(() => {
if (isCreateMode || !surveyId) return;
setLoading(true);
const fetchSurvey = async () => {
try {
const data = await getSurveyById(parseInt(surveyId));
setSurvey(data);
} catch (error) {
console.error("Ошибка загрузки опроса:", error);
} finally {
setLoading(false);
}
};
fetchSurvey();
}, [surveyId, isCreateMode]);
if (!isCreateMode) {
if (loading) return <div>Загрузка...</div>;
if (!survey) return <div>Опрос не найден</div>;
}
return (
<div className={styles.layout}>
<Header />
<div className={styles.main}>
<Navigation />
<div className={styles.content}>
<Outlet />
<Outlet context={{ survey, setSurvey }}/>
</div>
</div>
</div>