after rebase, delete radio type, add get session when completing survey

Author: wilczeqqqq

src/main/java/com/pwr/students/domain/AnswerType.java

@@ -3,5 +3,4 @@
 public enum AnswerType {
     SLIDER,
     TEXT,
-    RADIO,
 }

src/main/resources/config/liquibase/fake-data/question.csv

@@ -1,11 +1,11 @@
 id;category;answer_type;question_content;is_required;jhi_order;survey_id
 1;attitude;TEXT;including Networked;true;44743;1
-2;Integration Berkshire up;RADIO;whatever question content;true;48233;2
+2;Integration Berkshire up;TEXT;whatever question content;true;48233;2
 3;Jazz;SLIDER;whatever question content;true;75409;3
 4;sensor Phased;TEXT;orchestration Palladium;true;33686;4
 5;Account provided;TEXT;VanXXXXXXXXXXXXX;true;91402;5
 6;strategic lame;TEXT;lens Principal CSS;true;73489;6
 7;cyan Denver ferociously;SLIDER;to SouthXXXXXXXX;true;11450;7
 8;Thorium Bowie;SLIDER;Soap RubberXXXXX;true;17469;8
-9;Forward;RADIO;Southeast Bacon Copernicium;false;26648;9
-10;Czech New;RADIO;but Brakus South;true;60643;10
+9;Forward;SLIDER;Southeast Bacon Copernicium;false;26648;9
+10;Czech New;SLIDER;but Brakus South;true;60643;10

src/main/webapp/app/modules/surveyCompletion/survey-page.tsx

@@ -4,11 +4,13 @@ import axios from 'axios';
 import './survey-page.scss';
 import { BiCommentDetail } from 'react-icons/bi';
 import Slider from 'react-input-slider';
-import { useAppDispatch } from 'app/config/store';
+import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { createEntity, getEntities } from 'app/entities/answer/answer.reducer';
 import { IAnswer } from 'app/shared/model/answer.model';
-import { partialUpdateEntity, updateEntity } from 'app/entities/survey-assigment/survey-assigment.reducer';
+import { partialUpdateEntity } from 'app/entities/survey-assigment/survey-assigment.reducer';
 import { ISurveyAssigment } from 'app/shared/model/survey-assigment.model';
+import { getSession } from 'app/shared/reducers/authentication';
+import { reset } from 'app/modules/account/settings/settings.reducer';
 
 const SurveyPage = () => {
   const navigate = useNavigate();
@@ -21,6 +23,15 @@ const SurveyPage = () => {
   const [surveyAssignmentId, setSurveyAssignmentId] = useState(null);
 
   const dispatch = useAppDispatch();
+  const user = useAppSelector(state => state.authentication.account);
+
+  // Fetch the user information during component initialization
+  useEffect(() => {
+    dispatch(getSession());
+    return () => {
+      dispatch(reset());
+    };
+  }, []);
 
   useEffect(() => {
     axios
@@ -89,19 +100,6 @@ const SurveyPage = () => {
       );
     }
 
-    if (currentQuestion.answerType === 'RADIO') {
-      return (
-        <div>
-          {currentQuestion.radioOptions.map((option, index) => (
-            <label key={index}>
-              <input type="radio" value={option} checked={answers[currentQuestionIndex] === option} onChange={handleAnswerChange} />
-              {option}
-            </label>
-          ))}
-        </div>
-      );
-    }
-
     if (currentQuestion.answerType === 'TEXT') {
       return (
         <div>
@@ -129,6 +127,7 @@ const SurveyPage = () => {
         answer,
         comment: comments[index] || '',
         question: survey.questions[index],
+        user: user,
       }));
 
       try {
@@ -186,10 +185,10 @@ const SurveyPage = () => {
     setIsCommentBoxVisible(prevState => !prevState);
   };
 
-  const handleCommentSubmit = () => {
-    setIsCommentBoxVisible(prevState => !prevState);
-    // TODO i guess we need to save the comment somewhere to save while submitting the answers
-  };
+  // const handleCommentSubmit = () => {
+  //   setIsCommentBoxVisible(prevState => !prevState);
+  //   // TODO i guess we need to save the comment somewhere to save while submitting the answers
+  // };
 
   if (!survey) {
     return <div>Loading survey...</div>;
@@ -229,9 +228,9 @@ const SurveyPage = () => {
               value={comments[currentQuestionIndex] || ''}
               onChange={handleCommentChange}
             />
-            <button className="comment-submit" onClick={handleCommentSubmit}>
-              Submit
-            </button>
+            {/*<button className="comment-submit" onClick={handleCommentSubmit}>*/}
+            {/*  Submit*/}
+            {/*</button>*/}
           </div>
         )}
         <div className="buttons">

src/main/webapp/app/modules/userSurveysDashboard/userSurveysDashboard.tsx

@@ -97,7 +97,7 @@ const UserSurveysDashboard = () => {
     const navigate = useNavigate();
 
     const handleSurvey = () => {
-      navigate(`/survey/${survey.id}`);
+      navigate(`/complete-survey/${survey.id}`);
     };
 
     const openModal = () => {

src/main/webapp/app/routes.tsx

@@ -56,7 +56,7 @@ const AppRoutes = () => {
           }
         />
         <Route
-          path="/survey/:surveyId"
+          path="/complete-survey/:surveyId"
           element={
             <PrivateRoute hasAnyAuthorities={[AUTHORITIES.ADMIN, AUTHORITIES.USER]}>
               <SurveyPage />

src/test/java/com/pwr/students/web/rest/QuestionResourceIT.java

@@ -44,7 +44,7 @@ class QuestionResourceIT {
     private static final String UPDATED_CATEGORY = "BBBBBBBBBB";
 
     private static final AnswerType DEFAULT_ANSWER_TYPE = AnswerType.TEXT;
-    private static final AnswerType UPDATED_ANSWER_TYPE = AnswerType.RADIO;
+    private static final AnswerType UPDATED_ANSWER_TYPE = AnswerType.SLIDER;
 
     private static final String DEFAULT_QUESTION_CONTENT = "AAAAAAAAAAAAAAAA";
     private static final String UPDATED_QUESTION_CONTENT = "BBBBBBBBBBBBBBBB";