Screen Finished Visit

polijrorg · Aug 1, 2024 · 3757072 · 3757072
1 parent 4499a54
commit 3757072
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 28 deletions.
diff --git a/src/components/Overview/styles.ts b/src/components/Overview/styles.ts
@@ -57,7 +57,6 @@ export const NoVisitsContainer = styled(View)`
   height: 15%;
   display: flex;
 
-  background-color: red;
   align-items: 'center';
   justify-content: 'center';
 `;

diff --git a/src/components/QuestionSection/index.tsx b/src/components/QuestionSection/index.tsx
@@ -29,7 +29,6 @@ interface Props {
   onUpdateAnswers: (answers: any[]) => void;
   onCategoryUpdate?: (updatedCategory: ICategories) => void;
   onDeleteCategory?: (categoryId: string) => void; // Novo prop para deletar categoria
-  loading?: boolean;
 }
 
 const QuestionSection: React.FC<Props> = ({
@@ -40,7 +39,6 @@ const QuestionSection: React.FC<Props> = ({
   onUpdateAnswers,
   onCategoryUpdate,
   onDeleteCategory,
-  loading,
 }) => {
   const [categoryQuestions, setCategoryQuestions] = useState<IQuestions[]>([]);
   const [answers, setAnswers] = useState<any[]>([]);
@@ -52,17 +50,21 @@ const QuestionSection: React.FC<Props> = ({
   const [isDeleting, setIsDeleting] = useState(false); // Novo estado de carregamento
   const { user } = useAuth();
   const toast = useToast();
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     const fetchQuestions = async () => {
       try {
+        setLoading(true);
         const questions = await VisitService.getQuestionsByIdCategory(
           category.id
         );
         setCategoryQuestions(questions);
         setEditedQuestions(questions);
       } catch (error) {
         console.log(error);
+      } finally {
+        setLoading(false);
       }
     };
     fetchQuestions();
@@ -114,7 +116,7 @@ const QuestionSection: React.FC<Props> = ({
 
       for (const question of editedQuestions) {
         await VisitService.updateQuestion({
-          id: question.id,
+          id: question.id || '',
           question: question.question,
         });
       }
@@ -135,11 +137,13 @@ const QuestionSection: React.FC<Props> = ({
     setEditedCategory({ ...editedCategory, name });
   };
 
-  const handleQuestionChange = (id: string, question: string) => {
-    const updatedQuestions = editedQuestions.map((q) =>
-      q.id === id ? { ...q, question } : q
-    );
-    setEditedQuestions(updatedQuestions);
+  const handleQuestionChange = (id: string | undefined, question: string) => {
+    if (id) {
+      const updatedQuestions = editedQuestions.map((q) =>
+        q.id === id ? { ...q, question } : q
+      );
+      setEditedQuestions(updatedQuestions);
+    }
   };
 
   const showToast = (message: string, type: string) => {
@@ -249,12 +253,14 @@ const QuestionSection: React.FC<Props> = ({
               <TextInput
                 style={styles.questionInput}
                 value={question.question}
-                onChangeText={(text) => handleQuestionChange(question.id, text)}
+                onChangeText={(text) =>
+                  handleQuestionChange(question.id!, text)
+                }
                 placeholder="Edit Question"
                 placeholderTextColor="#666"
               />
               <TouchableOpacity
-                onPress={() => handleDeleteQuestion(question.id)}
+                onPress={() => handleDeleteQuestion(question.id!)}
               >
                 <FontAwesome
                   name="trash"
@@ -312,16 +318,20 @@ const QuestionSection: React.FC<Props> = ({
       ) : (
         <>
           <S.TemaQuestion>{category?.name || 'Tema Question'}</S.TemaQuestion>
-          {categoryQuestions.map((question, index) => (
-            <S.Wrapper key={question.id}>
-              <InputRange
-                onChangeValue={(id: string, value: number) =>
-                  handleInputChange(question.id, value, question.question)
-                }
-                textAsk={question.question}
-              />
-            </S.Wrapper>
-          ))}
+          {loading ? (
+            <ActivityIndicator size="large" color="#3E63DD" />
+          ) : (
+            categoryQuestions.map((question, index) => (
+              <S.Wrapper key={question.id}>
+                <InputRange
+                  onChangeValue={(id: string, value: number) =>
+                    handleInputChange(question.id!, value, question.question)
+                  }
+                  textAsk={question.question}
+                />
+              </S.Wrapper>
+            ))
+          )}
         </>
       )}
     </ScrollView>

diff --git a/src/screens/EvaluateVisit/EvaluateVisitManager/index.tsx b/src/screens/EvaluateVisit/EvaluateVisitManager/index.tsx
@@ -290,7 +290,6 @@ const EvaluateVisitManager = () => {
               <S.CategoryContainer key={category.id}>
                 <QuestionSection
                   key={category.id}
-                  loading={loading}
                   sellerId=""
                   category={category}
                   index={idx + 1}

diff --git a/src/screens/EvaluateVisit/index.tsx b/src/screens/EvaluateVisit/index.tsx
@@ -247,6 +247,7 @@ const EvaluateVisit = () => {
     setIndexScreen(1);
     setSelectedSeller(null);
     setStoreName('');
+    setCategories([]);
   };
 
   return (
@@ -304,12 +305,16 @@ const EvaluateVisit = () => {
 
           {indexScreen === categories.length && categories.length !== 0 && (
             <>
-              <S.ButtonIniciar onPress={() => setIndexScreen(indexScreen + 1)}>
-                <S.TextBtn>Ver Resumo do dia de visita</S.TextBtn>
-              </S.ButtonIniciar>
-              <S.Outline onPress={initialNewVisit}>
-                <S.TextBtnNova>Iniciar nova visita</S.TextBtnNova>
-              </S.Outline>
+              <S.ContainerButton>
+                <S.ButtonIniciar
+                  onPress={() => setIndexScreen(indexScreen + 1)}
+                >
+                  <S.TextBtn>Ver Resumo do dia de visita</S.TextBtn>
+                </S.ButtonIniciar>
+                <S.Outline onPress={initialNewVisit}>
+                  <S.TextBtnNova>Iniciar nova visita</S.TextBtnNova>
+                </S.Outline>
+              </S.ContainerButton>
             </>
           )}