From 9dc82a0f7810514d06569e23a1625fb200bec3af Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Wed, 24 Aug 2022 11:33:21 -0300 Subject: [PATCH 1/2] change telemetry csv separator and pld month list sort --- src/pages/pld/index.tsx | 13 +++++-------- src/pages/telemetria/index.tsx | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 7055e02..2bdf563 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -395,14 +395,11 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { Nenhum { clientMonth.sort((a, b) => { - if (parseFloat(a.mes_ref.slice(0, 2)) < parseFloat(b.mes_ref.slice(0, 2))) - if (parseFloat(a.mes_ref.slice(3, 7)) > parseFloat(b.mes_ref.slice(3, 7))) return -1 - else return 1 - if (parseFloat(a.mes_ref.slice(0, 2)) > parseFloat(b.mes_ref.slice(0, 2))) - if (parseFloat(a.mes_ref.slice(3, 7)) < parseFloat(b.mes_ref.slice(3, 7))) return 1 - else return -1 - - return 0 + if (a.mes_ref.split('/')[0] < b.mes_ref.split('/')[0]) return 1 + if (a.mes_ref.split('/')[0] > b.mes_ref.split('/')[0]) return -1 + }).sort((a, b) => { + if (a.mes_ref.split('/')[1] < b.mes_ref.split('/')[1]) return 1 + if (a.mes_ref.split('/')[1] > b.mes_ref.split('/')[1]) return -1 }).map((data, index) => { return {data.mes_ref} }) diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index 87502b6..98cf61b 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -94,7 +94,7 @@ export default function Telemetria({userName, clients}: any) { row.push(cols[j].innerText); } - data.push(row.join(",")); + data.push(row.join(";")); } downloadCSVFile(data.join("\n"), filename); From 8d050928f0d3eb734a2902f7c7b570030e435d72 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Thu, 25 Aug 2022 15:39:24 -0300 Subject: [PATCH 2/2] add 1hour to demand chart --- src/pages/index.tsx | 28 ++++++++++++++-------------- src/pages/telemetria/index.tsx | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 7a5ea72..6889eb2 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -168,19 +168,19 @@ export default function Home() { ) } -export const getServerSideProps: GetServerSideProps = async (ctx) => { - const { ['@smartAuth-token']: token } = parseCookies(ctx) +// export const getServerSideProps: GetServerSideProps = async (ctx) => { +// const { ['@smartAuth-token']: token } = parseCookies(ctx) - if (token) { - return { - redirect: { - destination: '/dashboard', - permanent: false - } - } - } +// if (token) { +// return { +// redirect: { +// destination: '/dashboard', +// permanent: false +// } +// } +// } - return { - props: {} - }; -} +// return { +// props: {} +// }; +// } diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index 98cf61b..057584a 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -383,8 +383,8 @@ export default function Telemetria({userName, clients}: any) { 5 minutos 15 minutos - {/* 1 hora - 1 dia + 1 hora + {/* 1 dia 1 mês */}