From 89f39f93e9dc0508cb15adaa045ac479af6235cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Geonizeli?= Date: Wed, 27 Jul 2022 22:41:22 -0300 Subject: [PATCH] fix dashboards and add empty state --- app/javascript/pages/dashboard/Dashboard.tsx | 4 +-- .../pages/dashboard/DashboardContext.tsx | 6 +++- .../pages/dashboard/components/charts/Pie.tsx | 36 ++++++++++--------- app/models/subject.rb | 2 ++ 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/javascript/pages/dashboard/Dashboard.tsx b/app/javascript/pages/dashboard/Dashboard.tsx index 8d549d7..5ff7ac4 100644 --- a/app/javascript/pages/dashboard/Dashboard.tsx +++ b/app/javascript/pages/dashboard/Dashboard.tsx @@ -1,4 +1,4 @@ -import React, {FC,} from 'react' +import React from 'react' import {DashboardProvider} from './DashboardContext' import { @@ -9,7 +9,7 @@ import { } from './charts' import {Filters} from './Filters' -export const Dashboard: FC = () => ( +export const Dashboard = () => (
diff --git a/app/javascript/pages/dashboard/DashboardContext.tsx b/app/javascript/pages/dashboard/DashboardContext.tsx index 83608c2..9a72883 100644 --- a/app/javascript/pages/dashboard/DashboardContext.tsx +++ b/app/javascript/pages/dashboard/DashboardContext.tsx @@ -31,7 +31,11 @@ export const whereDefaultState = (userContext: UserContext) => ( userContext.isOnlyTeacher ? {userId: userContext.user?.id} : {} ) -export const DashboardProvider: FC = ({children}) => { +type DashboardProviderProps = { + children: React.ReactNode +} + +export const DashboardProvider = ({children}: DashboardProviderProps) => { const userContext = useCurrentUser() const [where, setWhere] = useState(whereDefaultState(userContext)) const providerValue = useMemo(() => ({where, setWhere}), [ diff --git a/app/javascript/pages/dashboard/components/charts/Pie.tsx b/app/javascript/pages/dashboard/components/charts/Pie.tsx index 7193fc9..9a1ad30 100644 --- a/app/javascript/pages/dashboard/components/charts/Pie.tsx +++ b/app/javascript/pages/dashboard/components/charts/Pie.tsx @@ -17,22 +17,26 @@ export const Pie: FC = ({title, data}) => { style={{ height: '36rem', width: '36rem' }} >

{title}

- + {data.length ? ( + + ) : ( +
Não existem dados disponíveis.
+ )} ) } \ No newline at end of file diff --git a/app/models/subject.rb b/app/models/subject.rb index 4d5e7d4..e3915b5 100644 --- a/app/models/subject.rb +++ b/app/models/subject.rb @@ -24,5 +24,7 @@ class Subject < ApplicationRecord belongs_to :category belongs_to :axis + has_many :questions + validates :name, presence: true, uniqueness: true end