From 507835b1f93123a949943b5a6e21f320a36d54c6 Mon Sep 17 00:00:00 2001
From: Joao Marcos <55150938+jmlv-git@users.noreply.github.com>
Date: Sun, 1 Oct 2023 10:42:12 -0300
Subject: [PATCH 1/3] =?UTF-8?q?Integra=C3=A7=C3=A3o=20Componente=20gr?=
=?UTF-8?q?=C3=A1fico=20do=20Indicador?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/componets/IndicadorCardGraph.tsx | 38 ++++++++++++++++---
src/componets/LineGraph.tsx | 34 ++++++++++-------
....timestamp-1696095715514-3b4069a2a49ca.mjs | 10 +++++
3 files changed, 64 insertions(+), 18 deletions(-)
create mode 100644 vite.config.ts.timestamp-1696095715514-3b4069a2a49ca.mjs
diff --git a/src/componets/IndicadorCardGraph.tsx b/src/componets/IndicadorCardGraph.tsx
index e29aaff..3cac249 100644
--- a/src/componets/IndicadorCardGraph.tsx
+++ b/src/componets/IndicadorCardGraph.tsx
@@ -1,17 +1,45 @@
+import Api from "../Api";
import LineGraph from "./LineGraph";
+import { useState } from 'react';
type IndicadorCardGraphProps = {
indicador: {
+ id: string,
nome: string,
- meses: string[],
- meta: number[],
- supermeta: number[],
- desafio: number[]
+ //eh recebido todas informacoes de indicador
+ //mas so essas sao usada
}
}
+//o tipo recebido é esse:
+/*
+export interface indicatorType {
+ id: string
+ nome: string
+ unidade_medida: string
+ descricao: string
+ data_deadline: Date
+ idGestor: string
+ }
+*/
+
export default function IndicadorCardGraph({ indicador }: IndicadorCardGraphProps) {
+
+ const [cat, setCat] = useState<[][]>([]);
+
+
+
+ Api.get('metas-mes-indicador/'+indicador.id).then(res =>{
+ const aux = res.data;
+ setCat(aux);
+
+ })
+
+
+
+
return (
+
diff --git a/src/componets/LineGraph.tsx b/src/componets/LineGraph.tsx
index 15adfe8..6b8e355 100644
--- a/src/componets/LineGraph.tsx
+++ b/src/componets/LineGraph.tsx
@@ -1,39 +1,47 @@
import Plot from 'react-plotly.js';
-//import { metasMesIndicadorType } from '../types';
+
type LineGraphProps = {
- indicador: {
- meses: string[],
- meta: number[],
- supermeta: number[],
- desafio: number[]
+ mmsdInd: [][]
+ // mmsdInd significa Meses, Mestas, Super-metas, Desafios por Indicadores
+ /*
+ mmsdInd: {
+ esses valores sao referentes a um indicador
+ mmsdInd[0] = mese_ano: string[], todos o meses_anos
+ mmsdInd[1] = meta: number[], valor de metas batidas de cada mes
+ mmsdInd[2] = supermeta: number[], valor de super-metas batidas de cada mes
+ mmsdInd[3] = desafio: number[] valor de metas batidas de cada mes
}
+ */
}
-export default function LineGraph({ indicador }: LineGraphProps) {
+export default function LineGraph({ mmsdInd }: LineGraphProps) {
+
+ //console.log(mmsdInd.desafio)
+
return (
Date: Sun, 1 Oct 2023 11:40:20 -0300
Subject: [PATCH 2/3] =?UTF-8?q?Melhorando=20performance=20da=20integra?=
=?UTF-8?q?=C3=A7=C3=A3o=20+=20cria=C3=A7=C3=A3o=20de=20tipo=20para=20outr?=
=?UTF-8?q?a=20task?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/componets/IndicadorCardGraph.tsx | 16 +++++++++-------
src/types.tsx | 14 +++++++++++++-
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/componets/IndicadorCardGraph.tsx b/src/componets/IndicadorCardGraph.tsx
index 3cac249..9a6dd98 100644
--- a/src/componets/IndicadorCardGraph.tsx
+++ b/src/componets/IndicadorCardGraph.tsx
@@ -1,6 +1,6 @@
import Api from "../Api";
import LineGraph from "./LineGraph";
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
type IndicadorCardGraphProps = {
indicador: {
@@ -27,13 +27,15 @@ export default function IndicadorCardGraph({ indicador }: IndicadorCardGraphProp
const [cat, setCat] = useState<[][]>([]);
-
+ useEffect(() => {
+ Api.get('metas-mes-indicador/'+indicador.id).then(res =>{
+ const aux = res.data;
+ setCat(aux);
+
+ })
+ }, [])
- Api.get('metas-mes-indicador/'+indicador.id).then(res =>{
- const aux = res.data;
- setCat(aux);
-
- })
+
diff --git a/src/types.tsx b/src/types.tsx
index 3452ff3..edf07c7 100644
--- a/src/types.tsx
+++ b/src/types.tsx
@@ -38,4 +38,16 @@ export interface collaboratorType {
totalColabBateramDesafio: number;
totalColab: number;
idIndicador: string;
- }
\ No newline at end of file
+ }
+
+ export interface colaboradorIndicadorType {
+ mes_ano: string;
+ meta: number;
+ superMeta: number;
+ desafio: number;
+ peso: number;
+ resultado: number;
+ notaIndicador: number;
+ idColaborador: string;
+ idIndicador: string;
+}
\ No newline at end of file
From 98b8743403bbf2210c9bc38f72022e9cec8eb020 Mon Sep 17 00:00:00 2001
From: Joao Marcos <55150938+jmlv-git@users.noreply.github.com>
Date: Sun, 1 Oct 2023 19:10:12 -0300
Subject: [PATCH 3/3] =?UTF-8?q?Adicionando=20catch=20ao=20fazer=20requisi?=
=?UTF-8?q?=C3=A7=C3=A3o=20e=20removendo=20arquivo=20estranho?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/componets/IndicadorCardGraph.tsx | 16 +++++++++++-----
....ts.timestamp-1696095715514-3b4069a2a49ca.mjs | 10 ----------
2 files changed, 11 insertions(+), 15 deletions(-)
delete mode 100644 vite.config.ts.timestamp-1696095715514-3b4069a2a49ca.mjs
diff --git a/src/componets/IndicadorCardGraph.tsx b/src/componets/IndicadorCardGraph.tsx
index 9a6dd98..13e70a2 100644
--- a/src/componets/IndicadorCardGraph.tsx
+++ b/src/componets/IndicadorCardGraph.tsx
@@ -28,11 +28,17 @@ export default function IndicadorCardGraph({ indicador }: IndicadorCardGraphProp
const [cat, setCat] = useState<[][]>([]);
useEffect(() => {
- Api.get('metas-mes-indicador/'+indicador.id).then(res =>{
- const aux = res.data;
- setCat(aux);
-
- })
+
+ try{
+ Api.get('metas-mes-indicador/'+indicador.id).then(res =>{
+ const aux = res.data;
+ setCat(aux);
+
+ })
+ } catch (error) {
+ console.log(error)
+ }
+
}, [])
diff --git a/vite.config.ts.timestamp-1696095715514-3b4069a2a49ca.mjs b/vite.config.ts.timestamp-1696095715514-3b4069a2a49ca.mjs
deleted file mode 100644
index 77b5412..0000000
--- a/vite.config.ts.timestamp-1696095715514-3b4069a2a49ca.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-// vite.config.ts
-import { defineConfig } from "file:///C:/Users/Jo%C3%A3o%20Marcos/Desktop/RocketLab/Front/vfoods/node_modules/vite/dist/node/index.js";
-import react from "file:///C:/Users/Jo%C3%A3o%20Marcos/Desktop/RocketLab/Front/vfoods/node_modules/@vitejs/plugin-react/dist/index.mjs";
-var vite_config_default = defineConfig({
- plugins: [react()]
-});
-export {
- vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJDOlxcXFxVc2Vyc1xcXFxKb1x1MDBFM28gTWFyY29zXFxcXERlc2t0b3BcXFxcUm9ja2V0TGFiXFxcXEZyb250XFxcXHZmb29kc1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiQzpcXFxcVXNlcnNcXFxcSm9cdTAwRTNvIE1hcmNvc1xcXFxEZXNrdG9wXFxcXFJvY2tldExhYlxcXFxGcm9udFxcXFx2Zm9vZHNcXFxcdml0ZS5jb25maWcudHNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL0M6L1VzZXJzL0pvJUMzJUEzbyUyME1hcmNvcy9EZXNrdG9wL1JvY2tldExhYi9Gcm9udC92Zm9vZHMvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlJ1xyXG5pbXBvcnQgcmVhY3QgZnJvbSAnQHZpdGVqcy9wbHVnaW4tcmVhY3QnXHJcblxyXG4vLyBodHRwczovL3ZpdGVqcy5kZXYvY29uZmlnL1xyXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xyXG4gIHBsdWdpbnM6IFtyZWFjdCgpXSxcclxufSlcclxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFnVyxTQUFTLG9CQUFvQjtBQUM3WCxPQUFPLFdBQVc7QUFHbEIsSUFBTyxzQkFBUSxhQUFhO0FBQUEsRUFDMUIsU0FBUyxDQUFDLE1BQU0sQ0FBQztBQUNuQixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=