Skip to content

KP-449: move condition that prevents info from showing #369

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −24
Open

KP-449: move condition that prevents info from showing #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 28 additions & 24 deletions public/js/app/pages/Curriculum.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,30 +145,34 @@ function Courses({ curriculumInfo }) {
{ELECTIVE_CONDITIONS.map(electiveCondition => {
const participations = allParticipations[electiveCondition] || []
return (
participations.length !== 0 && (
<Fragment key={electiveCondition}>
{/* Information about conditionally elective courses for this study year, only if there are such courses to display */}
{electiveCondition === 'VV' && (
<div className="conditionallyElectiveInfo">
<LadokData html={curriculumInfo.conditionallyElectiveCoursesInformation} />
</div>
)}
{code ? (
<h4 id={`heading-${code}-${electiveCondition}`}>
{`${t('elective_condition')[electiveCondition]} ${t('courses').toLowerCase()}`}
</h4>
) : (
<h3 id={`heading-common-${electiveCondition}`}>
{`${t('elective_condition')[electiveCondition]} ${t('courses').toLowerCase()}`}
</h3>
)}
<CourseTable
curriculumInfo={curriculumInfo}
participations={participations}
electiveCondition={electiveCondition}
/>
</Fragment>
)
<Fragment key={electiveCondition}>
{/* Always show this section if electiveCondition === 'VV' */}
{electiveCondition === 'VV' && (
<div className="conditionallyElectiveInfo">
<LadokData html={curriculumInfo.conditionallyElectiveCoursesInformation} />
</div>
)}

{/* Only render this part if there are participations */}
{participations.length !== 0 && (
<>
{code ? (
<h4 id={`heading-${code}-${electiveCondition}`}>
{`${t('elective_condition')[electiveCondition]} ${t('courses').toLowerCase()}`}
</h4>
) : (
<h3 id={`heading-common-${electiveCondition}`}>
{`${t('elective_condition')[electiveCondition]} ${t('courses').toLowerCase()}`}
</h3>
)}
<CourseTable
curriculumInfo={curriculumInfo}
participations={participations}
electiveCondition={electiveCondition}
/>
</>
)}
</Fragment>
)
})}
</>
Expand Down