{translation.courseRoundInformation.round_header} {selectedRoundHeader}
-{translation.courseLabels.header_contact}
-
diff --git a/public/js/app/components/RoundInformation/RoundInformationInfoGrid.jsx b/public/js/app/components/RoundInformation/RoundInformationInfoGrid.jsx
index 8ab06e78..cdd2cb98 100644
--- a/public/js/app/components/RoundInformation/RoundInformationInfoGrid.jsx
+++ b/public/js/app/components/RoundInformation/RoundInformationInfoGrid.jsx
@@ -1,12 +1,48 @@
-import React from 'react'
+import React, { useEffect, useState, useRef } from 'react'
import { useLanguage } from '../../hooks/useLanguage'
import InfoModal from '../InfoModal'
import { CourseMemoLink } from './CourseMemoLink'
import { CourseScheduleLink } from './CourseScheduleLink'
-import { PlannedModules } from './PlannedModules'
+
+// Calculates if a "Show more" button should be displayed, and creates props for content and button elements.
+const useShowMoreContent = content => {
+ const ref = useRef(null)
+ const [hasMoreContent, setHasMoreContent] = useState(false)
+ const [contentHeight, setHeight] = useState(undefined)
+ const { translation } = useLanguage()
+
+ const showMoreContent = hasMoreContent && !!contentHeight
+ const hideMoreContent = hasMoreContent && !showMoreContent
+ useEffect(() => {
+ if (ref.current) {
+ const el = ref.current
+ const isOverflowing = el.clientHeight < el.scrollHeight
+ setHasMoreContent(isOverflowing)
+ }
+ }, [content])
+
+ const contentProps = {
+ ref,
+ style: { maxHeight: contentHeight }, // set max height for animation from the max value specified in css to actual content height
+ className: `roundInformation__infoGridItemContent ${hideMoreContent ? 'hidden' : ''}`,
+ }
+
+ const showMoreButtonProps = hasMoreContent
+ ? {
+ onClick: () => {
+ setHeight(showMoreContent ? undefined : ref.current.scrollHeight)
+ },
+ children: showMoreContent ? translation.showMoreContent.hide : translation.showMoreContent.show,
+ className: 'roundInformation__infoGridItemShowMoreButton',
+ }
+ : undefined
+
+ return { contentProps, showMoreButtonProps }
+}
const Item = ({ children, html, title, infoModalContent }) => {
const { translation } = useLanguage()
+ const { contentProps, showMoreButtonProps } = useShowMoreContent(html ?? children)
return (
-
-
+ -
diff --git a/public/js/app/components/RoundSelector/RoundSelector.jsx b/public/js/app/components/RoundSelector/RoundSelector.jsx
index b469bcf6..4c9559ea 100644
--- a/public/js/app/components/RoundSelector/RoundSelector.jsx
+++ b/public/js/app/components/RoundSelector/RoundSelector.jsx
@@ -14,6 +14,7 @@ export const RoundSelector = ({ activeSemesters, semesterRoundState }) => {
showRoundData,
selectedSemester,
activeSemesterOnlyHasOneRound,
+ hasOnlyOneRound,
roundsForSelectedSemester,
activeRound,
} = semesterRoundState
@@ -34,13 +35,13 @@ export const RoundSelector = ({ activeSemesters, semesterRoundState }) => {
ariaLabel={translation.courseLabels.header_dropdown_menu_aria_label}
/>
-
@@ -21,12 +57,19 @@ const Item = ({ children, html, title, infoModalContent }) => {
/>
)}
- {html ? : {children} }
+
+ {html ? (
+
+ ) : (
+
)
}
-function RoundInformationInfoGrid({ courseCode, courseRound, selectedSemester }) {
+function RoundInformationInfoGrid({ courseCode, courseRound, plannedModules }) {
const { translation } = useLanguage()
return (
@@ -73,9 +116,7 @@ function RoundInformationInfoGrid({ courseCode, courseRound, selectedSemester })
{children}
+ )}
+ {showMoreButtonProps && }
+ {courseRound.round_seats || translation.courseRoundInformation.round_no_seats_limit}
- {hasActiveSemesters ? ( - translation.courseLabels.header_dropdown_menu_navigation - ) : ( + {hasActiveSemesters ? ( + !hasOnlyOneRound &&
{translation.courseLabels.header_dropdown_menu_navigation}
+ ) : ( +{translation.courseLabels.lable_no_rounds} - )} -
+ + )}
diff --git a/public/js/app/components/__tests__/RoundInformation.test.js b/public/js/app/components/__tests__/RoundInformation.test.js
index 047838c2..1cc2adeb 100644
--- a/public/js/app/components/__tests__/RoundInformation.test.js
+++ b/public/js/app/components/__tests__/RoundInformation.test.js
@@ -25,7 +25,7 @@ const defaultSemesterRoundState = {
}
describe('Component ', () => {
- beforeAll(() => {
+ beforeEach(() => {
usePlannedModules.mockReturnValue({
plannedModules: 'somePlannedModules',
})
@@ -72,7 +72,7 @@ describe('Component ', () => {
courseRound: mockCourseRound,
}
- useCourseEmployees.mockReturnValueOnce({
+ useCourseEmployees.mockReturnValue({
courseRoundEmployees: {
examiners: `${examinersData}'`,
responsibles: `${responsiblesData}`,
diff --git a/public/js/app/components/__tests__/RoundInformationContacts.test.js b/public/js/app/components/__tests__/RoundInformationContacts.test.js
index 201aea16..4871bcfe 100644
--- a/public/js/app/components/__tests__/RoundInformationContacts.test.js
+++ b/public/js/app/components/__tests__/RoundInformationContacts.test.js
@@ -22,14 +22,7 @@ const withinNextSibling = element => within(nextSibling(element))
describe('Component ', () => {
describe('examiners, responsibles and teachers', () => {
test('shoud show headers with "missing info" text when data is missing', () => {
- render(
- ', () => {
})
test('shoud show headers with data inserted as html', () => {
- useCourseEmployees.mockReturnValue({
- courseRoundEmployees: {
- examiners: '',
- responsibles: '',
- teachers: '',
- },
- })
render(
Test examiners',
+ responsibles: '',
+ teachers: '',
+ }}
/>
)
const examinerLabel = screen.getByText('Examiner')
@@ -71,58 +59,12 @@ describe('Component ', () => {
expect(teacherLink).toHaveTextContent('Test teachers')
expect(teacherLink).toHaveAttribute('href', '/profile/testteachers/')
})
-
- test('should update data when prop changes', () => {
- useCourseEmployees.mockImplementation(({ applicationCode }) =>
- applicationCode === '1111'
- ? { courseRoundEmployees: { examiners: 'Examiner for 1111' } }
- : applicationCode === '3333'
- ? { courseRoundEmployees: { examiners: 'Examiner for 3333' } }
- : { courseRoundEmployees: { examiners: '' } }
- )
-
- const { rerender } = render(
- ', () => {
"shoud NOT show header if contact name is '%s'",
contactNameArg => {
render(
-
- 
+ {{#if (eq theme "external")}}
+ {{else}}
+
+ {{/if}}
\ No newline at end of file
Fantastisk kurs
', en: 'This course is awesome
' }, courseDisposition: { sv: 'Kursupplägg på svenska
', en: 'Course Disposition in english
' }, - supplementaryInfo: { sv: 'Övrig info
', en: 'Extra info
' }, imageInfo: 'own_image', }), })) @@ -145,9 +144,7 @@ describe('Discontinued course to test', () => { "course_required_equipment": "Ingen information tillagd", "course_state": "ESTABLISHED", "course_suggested_addon_studies": "Ingen information tillagd", - "course_supplemental_information": "Övrig info
", - "course_supplemental_information_url": "Ingen information tillagd", - "course_supplemental_information_url_text": "Ingen information tillagd", + "course_supplemental_information": "", "imageFromAdmin": "own_image", "sellingText": "Fantastisk kurs
", }, diff --git a/server/controllers/mocks/mockedDiscontinuedCourse.js b/server/controllers/mocks/mockedDiscontinuedCourse.js index ee6f4011..c535ad6d 100644 --- a/server/controllers/mocks/mockedDiscontinuedCourse.js +++ b/server/controllers/mocks/mockedDiscontinuedCourse.js @@ -11,7 +11,6 @@ const mockedDiscontinuedCourse = { }, educationalLevelCode: 'RESEARCH', gradeScaleCode: 'PF', - supplementaryInfo: 'Ersätter kurs FBB3640.
', title: 'Kolhydratteknik inom glykovetenskap', titleOther: 'Carbohydrate Technologies in Glycoscience', cancelled: false, diff --git a/server/views/helpers/index.js b/server/views/helpers/index.js index 66658a90..ee1d44ff 100644 --- a/server/views/helpers/index.js +++ b/server/views/helpers/index.js @@ -1,5 +1,5 @@ 'use strict' - +const handlebars = require('handlebars') const registerHeaderContentHelper = require('@kth/kth-node-web-common/lib/handlebars/helpers/headerContent') const { registerBreadcrumbHelper } = require('@kth/kth-node-web-common/lib/handlebars/helpers/breadcrumbs') const { registerLanguageLinkHelper } = require('@kth/kth-node-web-common/lib/handlebars/helpers/languageLink') @@ -41,3 +41,5 @@ require('@kth/kth-node-web-common/lib/handlebars/helpers/contentedit') const i18n = require('../../../i18n') require('@kth/kth-node-web-common/lib/handlebars/helpers/createI18nHelper')(i18n) require('@kth/kth-node-web-common/lib/handlebars/helpers/safe') + +handlebars.registerHelper('eq', (var1, var2) => var1.toString() === var2.toString()) diff --git a/server/views/partials/headerLogotype.handlebars b/server/views/partials/headerLogotype.handlebars index f9e8d7b7..6239219e 100644 --- a/server/views/partials/headerLogotype.handlebars +++ b/server/views/partials/headerLogotype.handlebars @@ -1,6 +1,9 @@
+ {{#if (eq theme "external")}}
+ {{else}}
+
+ {{/if}}