chore: merges branch 'devel' into 169-buscar-usuario-pelo-email-registro

fga-eps-mds · Nov 8, 2021 · e24e4aa · e24e4aa
2 parents ac49e68 + 3868708
commit e24e4aa
Show file tree

Hide file tree

Showing 35 changed files with 1,514 additions and 99 deletions.
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -3,6 +3,7 @@ sonar.projectKey=fga-eps-mds_2021-1-PC-GO-Frontend
 
 sonar.language=js
 
+sonar.sources=./src
 sonar.javascript.lcov.reportPaths=./coverage/lcov.info
 sonar.testExecutionReportPaths=./test-report.xml
 sonar.sourceEncoding=UTF-8
diff --git a/src/Components/Departments/index.js b/src/Components/Departments/index.js
@@ -0,0 +1,25 @@
+import React from "react";
+import PocketDepartment from "../PocketDepartment";
+import { StyledListGroup } from "./style";
+
+const Departments = ({ departments, searchTerm }) => {
+  return (
+    <StyledListGroup>
+      {departments
+        .filter((val) => {
+          if (val === "") {
+            return val;
+          } else if (
+            val.name.toLowerCase().includes(searchTerm.toLowerCase())
+          ) {
+            return val;
+          }
+        })
+        .map((post) => (
+          <PocketDepartment key={post.id} name={post.name} />
+        ))}
+    </StyledListGroup>
+  );
+};
+
+export default Departments;
diff --git a/src/Components/Departments/style.js b/src/Components/Departments/style.js
@@ -0,0 +1,52 @@
+import styled from "styled-components";
+
+export const StyledListGroup = styled.ul`
+  display: contents;
+  list-style-type: none;
+`;
+export const StyledListGroupItem = styled.li``;
+
+export const styles = {};
+
+export const StyledBigDiv = styled.div`
+  width: 100%;
+  height: 5rem;
+  border-radius: 15px;
+  background: #ffffff;
+  border: 2px solid #000000;
+  display: inline-block;
+  align-items: center;
+  .registerNumber {
+    width: 16%;
+  }
+  .city {
+    width: 15%;
+  }
+  .state {
+    width: 7%;
+  }
+  .requester {
+    width: 18%;
+  }
+  .inclusionDate {
+    width: 12%;
+  }
+  .seiNumber {
+    width: 15%;
+  }
+  .tag {
+    width: 10%;
+  }
+  .extra {
+    width: 7%;
+    padding-left: 1.8rem;
+  }
+  button {
+    border: none;
+    background: transparent;
+    cursor: pointer;
+    font-family: Montserrat;
+    font-style: normal;
+    font-size: 26px;
+  }
+`;
diff --git a/src/Components/Fields/index.js b/src/Components/Fields/index.js
@@ -2,19 +2,32 @@ import React, { useState } from "react";
 import PocketFields from "../PocketFields";
 import { StyledListGroup } from "./style";
 
-const Fields = ({ process }) => {
+const Fields = ({ process, searchTerm }) => {
   const [creator, setCreator] = useState("Padrão");
 
   return (
     <StyledListGroup>
-      {process.map((post) => (
-        <PocketFields
-          key={post.id}
-          name={post.name}
-          description={post.description}
-          creator={creator}
-        ></PocketFields>
-      ))}
+      {/* ADicionando lógica que filtra campos */}
+      {process
+        .filter((val) => {
+          if (searchTerm === "") {
+            return val;
+          } else if (
+            val.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.description.toLowerCase().includes(searchTerm.toLowerCase())
+          ) {
+            return val;
+          }
+        })
+        .map((post) => (
+          // Campo individual de campos
+          <PocketFields
+            key={post.id}
+            name={post.name}
+            description={post.description}
+            creator={creator}
+          ></PocketFields>
+        ))}
     </StyledListGroup>
   );
 };

diff --git a/src/Components/HeaderWithButtons/index.js b/src/Components/HeaderWithButtons/index.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from "react";
 import {
+  AdminDiv,
   Head,
   StyledDropDown,
   StyledHeaderImage,
@@ -52,6 +53,16 @@ const HeaderWithButtons = () => {
     window.location.reload();
   }
 
+  function handleSeeDepartment() {
+    history.push("/visualizar-departamentos");
+    window.location.reload();
+  }
+
+  function handleSeeSections() {
+    history.push("/visualizar-secoes");
+    window.location.reload();
+  }
+
   function handleSeeAllUsers() {
     history.push("/visualizar-usuarios");
     window.location.reload();
@@ -68,7 +79,7 @@ const HeaderWithButtons = () => {
         setName(user?.name);
       }
     } catch (err) {
-      console.log(err, "goldfish");
+      console.log("Erro ao carregar os dados do usuário!", err);
     }
   }
 
@@ -81,6 +92,7 @@ const HeaderWithButtons = () => {
       <Head>
         <StyledHeaderImage onClick={handleHomePage} src={Logo} />
         <StyledOrganizeButtons>
+          {/* Buttons to redirect in web app */}
           <StyledDropDown>
             <button>Registros</button>
             <div style={{ textAlign: "center" }}>
@@ -90,9 +102,10 @@ const HeaderWithButtons = () => {
           </StyledDropDown>
           <StyledDropDown>
             <button>Administrador</button>
-            <div style={{ textAlign: "center" }}>
+            <div>
               <button onClick={handleCreateUser}>Criar Usuário</button>
-              <button onClick={() => {}}>Criar Departamento</button>
+              <button onClick={handleSeeDepartment}>Ver Departamentos</button>
+              <button onClick={handleSeeSections}>Ver Seções</button>
               <button onClick={() => {}}>Tag</button>
               <button onClick={handleSeeAllFields}>Campos</button>
               <button onClick={handleSeeAllUsers}>Listar Usuários</button>

diff --git a/src/Components/HeaderWithButtons/styles.js b/src/Components/HeaderWithButtons/styles.js
@@ -17,7 +17,7 @@ export const StyledHeaderImage = styled.img`
 `;
 
 export const StyledOrganizeButtons = styled.div`
-  margin-right: 3rem;
+  margin-right: 5rem;
   button {
     color: ${colors.white};
     font-style: normal;
@@ -30,7 +30,7 @@ export const StyledOrganizeButtons = styled.div`
     text-align: center;
 
     cursor: pointer;
-    margin: 0 0 0 40px;
+    margin: 0 20px;
   }
 `;
 
@@ -60,7 +60,8 @@ export const StyledDropDown = styled.div`
   }
   :hover {
     div {
-      display: block;
+      display: flex;
+      flex-direction: column;
     }
   }
 `;
diff --git a/src/Components/PocketDepartment/index.js b/src/Components/PocketDepartment/index.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+import { StyledBigDiv } from "./styles";
+
+const PocketDepartment = ({ name }) => (
+  <StyledBigDiv>
+    <button class="registerNumber">{name}</button>
+  </StyledBigDiv>
+);
+
+export default PocketDepartment;
diff --git a/src/Components/PocketDepartment/styles.js b/src/Components/PocketDepartment/styles.js
@@ -0,0 +1,24 @@
+import styled from "styled-components";
+
+export const styles = {};
+
+export const StyledBigDiv = styled.div`
+  width: 100%;
+  height: 5rem;
+  border-radius: 15px;
+  background: #ffffff;
+  border: 2px solid #000000;
+  display: inline-block;
+  align-items: center;
+  .registerNumber {
+    width: 100%;
+  }
+  button {
+    border: none;
+    background: transparent;
+    cursor: pointer;
+    font-family: Montserrat;
+    font-style: normal;
+    font-size: 26px;
+  }
+`;
diff --git a/src/Components/PocketSection/index.js b/src/Components/PocketSection/index.js
@@ -0,0 +1,11 @@
+import React from "react";
+import { StyledBigDiv } from "./styles";
+
+const PocketSection = ({ name }) => (
+  // Show all sections per name
+  <StyledBigDiv>
+    <button class="registerNumber">{name}</button>
+  </StyledBigDiv>
+);
+
+export default PocketSection;
diff --git a/src/Components/PocketSection/styles.js b/src/Components/PocketSection/styles.js
@@ -0,0 +1,24 @@
+import styled from "styled-components";
+
+export const styles = {};
+
+export const StyledBigDiv = styled.div`
+  width: 100%;
+  height: 5rem;
+  border-radius: 15px;
+  background: #ffffff;
+  border: 2px solid #000000;
+  display: inline-block;
+  align-items: center;
+  .registerNumber {
+    width: 100%;
+  }
+  button {
+    border: none;
+    background: transparent;
+    cursor: pointer;
+    font-family: Montserrat;
+    font-style: normal;
+    font-size: 26px;
+  }
+`;
diff --git a/src/Components/PocketUser/index.js b/src/Components/PocketUser/index.js
@@ -1,15 +1,26 @@
 import React from "react";
 import { StyledListGroup, StyledBigDiv, StyledText } from "./style";
 
-const PocketUser = ({ user }) => {
+const PocketUser = ({ user, searchTerm }) => {
   return (
     <StyledListGroup>
-      {user.map((singleUser) => (
-        <StyledBigDiv>
-          <StyledText>{singleUser.name}</StyledText>
-          <StyledText>{singleUser.email}</StyledText>
-        </StyledBigDiv>
-      ))}
+      {user
+        .filter((val) => {
+          if (searchTerm === "") {
+            return val;
+          } else if (
+            val.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.email.toLowerCase().includes(searchTerm.toLowerCase())
+          ) {
+            return val;
+          }
+        })
+        .map((singleUser) => (
+          <StyledBigDiv>
+            <StyledText>{singleUser.name}</StyledText>
+            <StyledText>{singleUser.email}</StyledText>
+          </StyledBigDiv>
+        ))}
     </StyledListGroup>
   );
 };

diff --git a/src/Components/Process/index.js b/src/Components/Process/index.js
@@ -2,7 +2,7 @@ import React from "react";
 import PocketDocument from "../PocketDocument";
 import { StyledListGroup } from "./style";
 
-const Process = ({ process }) => {
+const Process = ({ process, searchTerm }) => {
   const seiNumberLimit = (seiNumber) => {
     if (seiNumber.length < 10) {
       return seiNumber;
@@ -13,22 +13,39 @@ const Process = ({ process }) => {
 
   return (
     <StyledListGroup>
-      {process.map((post) => (
-        <PocketDocument
-          key={post.id}
-          registerNumber={
-            post.register_number === "" ? "-" : post.register_number
+      {process
+        .filter((val) => {
+          if (searchTerm === "") {
+            return val;
+          } else if (
+            val.state.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.city.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.document_date
+              .toLowerCase()
+              .includes(searchTerm.toLowerCase()) ||
+            val.requester.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.sei_number.toLowerCase().includes(searchTerm.toLowerCase()) ||
+            val.register_number.toLowerCase().includes(searchTerm.toLowerCase())
+          ) {
+            return val;
           }
-          requester={post.requester === "" ? "-" : post.requester}
-          inclusionDate={post.document_date === "" ? "-" : post.document_date}
-          city={post.city === "" ? "-" : post.city}
-          state={post.state === "" ? "-" : post.state}
-          seiNumber={
-            post.sei_number === "" ? "-" : seiNumberLimit(post.sei_number)
-          }
-          registerId={post.id}
-        ></PocketDocument>
-      ))}
+        })
+        .map((post) => (
+          <PocketDocument
+            key={post.id}
+            registerNumber={
+              post.register_number === "" ? "-" : post.register_number
+            }
+            requester={post.requester === "" ? "-" : post.requester}
+            inclusionDate={post.document_date === "" ? "-" : post.document_date}
+            city={post.city === "" ? "-" : post.city}
+            state={post.state === "" ? "-" : post.state}
+            seiNumber={
+              post.sei_number === "" ? "-" : seiNumberLimit(post.sei_number)
+            }
+            registerId={post.id}
+          ></PocketDocument>
+        ))}
     </StyledListGroup>
   );
 };