Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepopulate Questionnare #34

Merged
merged 1 commit into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ export type QuestionOption = {
score: number
}

export type QuestionScores = {
scoreid: number
fismasystemid: number
datecalculated: number
notes: string
functionoptionid: number
datacallid: number
}
export type SystemDetailsModalProps = {
open: boolean
onClose: () => void
Expand Down
41 changes: 34 additions & 7 deletions src/views/QuestionnareModal/QuestionnareModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ import { styled } from '@mui/system'
import TextField from '@mui/material/TextField'
import NavigateNextIcon from '@mui/icons-material/NavigateNext'
import NavigateBeforeIcon from '@mui/icons-material/NavigateBefore'
import { FismaQuestion, QuestionOption, SystemDetailsModalProps } from '@/types'
import {
FismaQuestion,
QuestionOption,
SystemDetailsModalProps,
QuestionScores,
} from '@/types'
import axiosInstance from '@/axiosConfig'
import CircularProgress from '@mui/material/CircularProgress'

Expand Down Expand Up @@ -49,7 +54,9 @@ type Category = {
name: string
steps: FismaQuestion[]
}

type questionScoreMap = {
[key: number]: QuestionScores
}
export default function QuestionnareModal({
open,
onClose,
Expand All @@ -62,6 +69,9 @@ export default function QuestionnareModal({
const [categories, setCategories] = React.useState<Category[]>([])
const [options, setOptions] = React.useState<QuestionOption[]>([])
const [loadingQuestion, setLoadingQuestion] = React.useState<boolean>(true)
const [questionScores, setQuestionScores] = React.useState<questionScoreMap>(
{}
)
const [notes, setNotes] = React.useState<string>('')
const activeCategory = categories[activeCategoryIndex]
const activeStep = activeCategory?.steps[activeStepIndex]
Expand Down Expand Up @@ -148,30 +158,46 @@ export default function QuestionnareModal({

setCategories(categoriesData)
if (data.length > 0) {
// console.log(categoriesData)
setQuestionId(categoriesData[0]['steps'][0].function.functionid)
}
})
.catch((error) => {
console.error('Error fetching data:', error)
})
axiosInstance
.get(`scores?datacallid=2&fismasystemid=${system.fismasystemid}`)
.then((res) => {
const hashTable: questionScoreMap = Object.assign(
{},
...res.data.map((item: QuestionScores) => ({
[item.functionoptionid]: item,
}))
)
setQuestionScores(hashTable)
})
.catch((error) => {
console.error('Error fetching question scores:', error)
})
}
}, [open, system])

React.useEffect(() => {
if (questionId) {
try {
axiosInstance.get(`functions/${questionId}/options`).then((res) => {
// console.log(res.data)
setOptions(res.data)
res.data.forEach((item: QuestionOption) => {
if (item.functionoptionid in questionScores) {
setNotes(questionScores[item.functionoptionid].notes)
}
})
setLoadingQuestion(false)
})
} catch (error) {
console.error('Error fetching data:', error)
}
// setQuestionId(firstQuestionnaireId)
}
}, [questionId])
}, [questionId, questionScores])
const renderRadioGroup = (options: QuestionOption[]) => {
return (
<FormControl component="fieldset">
Expand All @@ -183,6 +209,7 @@ export default function QuestionnareModal({
control={<Radio />}
label={option.description}
sx={{ m: 0 }}
checked={questionScores[option.functionoptionid] !== undefined}
/>
))}
</RadioGroup>
Expand Down Expand Up @@ -292,7 +319,7 @@ export default function QuestionnareModal({
>
{renderRadioGroup(options)}
</Box>
<Typography variant="body1">
<Typography variant="body1" sx={{ mb: 2 }}>
{activeStep?.notesprompt || ''}
</Typography>
<CssTextField
Expand Down
4 changes: 2 additions & 2 deletions src/views/Title/Title.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Typography from '@mui/material/Typography'
import { Container } from '@mui/material'
import { Outlet, useLoaderData, Navigate } from 'react-router-dom'
import { Outlet, useLoaderData } from 'react-router-dom'
import { UsaBanner } from '@cmsgov/design-system'
import logo from '../../assets/icons/logo.svg'
import AccountCircleIcon from '@mui/icons-material/AccountCircle'
import 'core-js/stable/atob'
import { userData } from '@/types'
import { useEffect, useState, useRef } from 'react'
import { useEffect, useRef } from 'react'
/**
* Component that renders the contents of the Dashboard view.
* @returns {JSX.Element} Component that renders the dashboard contents.
Expand Down