Skip to content
Snippets Groups Projects
Commit 7ec48f4a authored by Richard Fernando Heise Ferreira's avatar Richard Fernando Heise Ferreira Committed by Stephanie Briere Americo
Browse files

Issue #37: FIX Chrome ordenation behavior

parent 304e1b1f
No related branches found
No related tags found
2 merge requests!58Version 1.1,!54Issue #53: Fix password info
...@@ -10,16 +10,16 @@ import { useHistory } from "react-router-dom"; ...@@ -10,16 +10,16 @@ import { useHistory } from "react-router-dom";
import CardForm from "../components/fieldsListForms/CardForm.jsx"; import CardForm from "../components/fieldsListForms/CardForm.jsx";
import Tab from "../components/fieldsListForms/Tab.jsx"; import Tab from "../components/fieldsListForms/Tab.jsx";
import { Typography } from "@material-ui/core"; import { Typography } from "@material-ui/core";
const useStyles = makeStyles((theme) => ({ const useStyles = makeStyles(theme => ({
body: { body: {
marginBottom: "15%", marginBottom: "15%"
}, },
Forms: { Forms: {
textAlign: "center", textAlign: "center",
marginBottom: "3%", marginBottom: "3%",
fontSize: "20px", fontSize: "20px"
}, }
})); }));
export default function ListForms() { export default function ListForms() {
const classes = useStyles(); const classes = useStyles();
...@@ -40,25 +40,33 @@ export default function ListForms() { ...@@ -40,25 +40,33 @@ export default function ListForms() {
function sort(type) { function sort(type) {
setAuxForms([]); setAuxForms([]);
if (type === "") { if (type === "") {
const tmp = [...forms].sort((a, b) => a.id > b.id); const tmp = [...forms].sort(function(a, b) {
return a.id > b.id ? 1 : -1;
});
setAuxForms(tmp); setAuxForms(tmp);
} else if (type === 1) { } else if (type === 1) {
const tmp = [...forms].sort((a, b) => a.title > b.title); const tmp = [...forms].sort(function(a, b) {
return a.tittle > b.tittle ? 1 : -1;
});
setAuxForms(tmp); setAuxForms(tmp);
} else if (type === 2) { } else if (type === 2) {
const tmp = [...forms].sort((a, b) => a.id < b.id); const tmp = [...forms].sort(function(a, b) {
return a.id < b.id ? 1 : -1;
});
setAuxForms(tmp); setAuxForms(tmp);
} else if (type === 3) { } else if (type === 3) {
const tmp = [...forms].sort((a, b) => a.answersNumber < b.answersNumber); const tmp = [...forms].sort(function(a, b) {
return a.answersNumber < b.answersNumber ? 1 : -1;
});
setAuxForms(tmp); setAuxForms(tmp);
} else if (type === 4) { } else if (type === 4) {
let tmp = [...forms] let tmp = [...forms]
.filter((value) => { .filter(value => {
return value.date; return value.date;
}) })
.sort((a, b) => a.date > b.date) .sort((a, b) => a.date > b.date)
.concat( .concat(
[...forms].filter((value) => { [...forms].filter(value => {
return value.date === ""; return value.date === "";
}) })
); );
...@@ -73,7 +81,7 @@ export default function ListForms() { ...@@ -73,7 +81,7 @@ export default function ListForms() {
function searching(string) { function searching(string) {
console.log(string); console.log(string);
setAuxForms( setAuxForms(
[...forms].filter((value) => { [...forms].filter(value => {
return value.title.toLowerCase().includes(string.toLowerCase()); return value.title.toLowerCase().includes(string.toLowerCase());
}) })
); );
...@@ -86,12 +94,12 @@ export default function ListForms() { ...@@ -86,12 +94,12 @@ export default function ListForms() {
async function fetchData(id) { async function fetchData(id) {
const res = await api const res = await api
.get(`/user/list/${id}`) .get(`/user/list/${id}`)
.then(function (res) { .then(function(res) {
setForms(res.data.sort((a, b) => a.id > b.id)); setForms(res.data.sort((a, b) => a.id > b.id));
setAuxForms(res.data.sort((a, b) => a.id > b.id)); setAuxForms(res.data.sort((a, b) => a.id > b.id));
setisLoaded(true); setisLoaded(true);
}) })
.catch((error) => { .catch(error => {
if (error.response.status === 401) { if (error.response.status === 401) {
window.sessionStorage.removeItem("token"); window.sessionStorage.removeItem("token");
window.sessionStorage.removeItem("userId"); window.sessionStorage.removeItem("userId");
...@@ -114,7 +122,7 @@ export default function ListForms() { ...@@ -114,7 +122,7 @@ export default function ListForms() {
<Grid className={classes.Forms}>Seus Formulários:</Grid> <Grid className={classes.Forms}>Seus Formulários:</Grid>
<Grid container justify="center" spacing={3} className={classes.body}> <Grid container justify="center" spacing={3} className={classes.body}>
{auxForms.length ? ( {auxForms.length ? (
auxForms.map((form) => ( auxForms.map(form => (
<Grid item xl={4} lg={4} md={4} sm={6} xs={12} zeroMinWidth> <Grid item xl={4} lg={4} md={4} sm={6} xs={12} zeroMinWidth>
<CardForm <CardForm
id={form.id} id={form.id}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment