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.

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

Feature/ar 859 order in table #84

Merged
merged 2 commits into from
Aug 31, 2022
Merged

Feature/ar 859 order in table #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1956c0
AR-859: add order to calendar template
sinejespersen Aug 31, 2022
4174cd5
AR-859: add select to calendar admin
sinejespersen Aug 31, 2022
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
20 changes: 20 additions & 0 deletions build/calendar-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,25 @@
"label": "Vis tabeloverskrifter",
"name": "displayHeaders",
"formGroupClasses": "col-md-6 mb-3"
},
{
"key": "calendar-form-header-orders",
"input": "select",
"label": "Hvilken rækkefølge skal overskrifterne i tabellen være i",
"options": [
{
"key": "whenwhatwhere",
"value": "whenwhatwhere",
"title": "Hvornår, hvad, hvor"
},
{
"key": "whatwherewhen",
"value": "whatwherewhen",
"title": "Hvad, hvor, hvornår"
}
],
"name": "headerOrder",
"formGroupClasses": "col-md-6 mb-3",
"helpText": "Dette er kun relevant hvis \"Flere resurser\" er valgt under \"layout\". Standard er \"Hvornår, hvad, hvor.\""
}
]
2 changes: 1 addition & 1 deletion build/calendar.js
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions src/calendar/calendar-admin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,25 @@
"label": "Vis tabeloverskrifter",
"name": "displayHeaders",
"formGroupClasses": "col-md-6 mb-3"
},
{
"key": "calendar-form-header-orders",
"input": "select",
"label": "Hvilken rækkefølge skal overskrifterne i tabellen være i",
"options": [
{
"key": "whenwhatwhere",
"value": "whenwhatwhere",
"title": "Hvornår, hvad, hvor"
},
{
"key": "whatwherewhen",
"value": "whatwherewhen",
"title": "Hvad, hvor, hvornår"
}
],
"name": "headerOrder",
"formGroupClasses": "col-md-6 mb-3",
"helpText": "Dette er kun relevant hvis \"Flere resurser\" er valgt under \"layout\". Standard er \"Hvornår, hvad, hvor.\""
}
]
93 changes: 58 additions & 35 deletions src/calendar/calendar-multiple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@ function CalendarMultiple({
displayHeaders = true,
hideGrid = false,
dateAsBox = false /* TODO: Add this to the configuration of the slide */,
headerOrder = "whenwhatwhere",
} = content;

/** Imports language strings, sets localized formats. */
useEffect(() => {
dayjs.extend(localizedFormat);
}, []);

// Numbers used in css to switch the order of the elements, both headers and "items"
const orderWhere = headerOrder === "whenwhatwhere" ? 3 : 2;
const orderWhat = headerOrder === "whenwhatwhere" ? 2 : 1;
const orderWhen = headerOrder === "whenwhatwhere" ? 1 : 3;

/**
* Capitalize the datestring, as it starts with the weekday.
*
Expand Down Expand Up @@ -76,7 +82,7 @@ function CalendarMultiple({
}, [hasDateAndTime]);

const borderStyle = hideGrid ? { "--border": "0" } : {};

let counterForOrder = 0;
return (
<Wrapper
className={`calendar-multiple ${templateClasses.join(" ")}`}
Expand Down Expand Up @@ -120,59 +126,75 @@ function CalendarMultiple({
<ContentHeaderItem
className="content-item"
key={2}
style={borderStyle}
style={(borderStyle, { order: orderWhen })}
>
<FormattedMessage id="when" defaultMessage="when" />
</ContentHeaderItem>
<ContentHeaderItem
className="content-item"
key={1}
style={borderStyle}
style={(borderStyle, { order: orderWhat })}
>
<FormattedMessage id="what" defaultMessage="what" />
</ContentHeaderItem>
<ContentHeaderItem
className="content-item"
key={3}
style={borderStyle}
style={(borderStyle, { order: orderWhere })}
>
<FormattedMessage id="where" defaultMessage="where" />
</ContentHeaderItem>
</ContentItemsWrapper>
)}
<ContentItemsWrapper>
{calendarEvents?.length > 0 &&
getSortedEvents(calendarEvents).map((entry) => (
<Fragment key={entry.id}>
<ContentItem className="content-item-time" style={borderStyle}>
{dayjs(entry.startTime * 1000)
.locale(localeDa)
.format("LT")}
{entry.endTime && (
<>
<span> - </span>
{dayjs(entry.endTime * 1000)
.locale(localeDa)
.format("LT")}
</>
)}
</ContentItem>
<ContentItem className="content-item-title" style={borderStyle}>
{entry.title ?? resourceUnavailableText ?? (
<FormattedMessage
id="unavailable"
defaultMessage="Unavailable"
/>
)}
</ContentItem>
<ContentItem
className="content-item-resource"
style={borderStyle}
>
{entry.resourceTitle ?? entry.resourceId ?? ""}
</ContentItem>
</Fragment>
))}
getSortedEvents(calendarEvents).map((entry) => {
const returnFragment = (
<Fragment key={entry.id}>
<ContentItem
className="content-item-time"
style={
(borderStyle, { order: counterForOrder + orderWhen })
}
>
{dayjs(entry.startTime * 1000)
.locale(localeDa)
.format("LT")}
{entry.endTime && (
<>
<span> - </span>
{dayjs(entry.endTime * 1000)
.locale(localeDa)
.format("LT")}
</>
)}
</ContentItem>
<ContentItem
className="content-item-title"
style={
(borderStyle, { order: counterForOrder + orderWhat })
}
>
{entry.title ?? resourceUnavailableText ?? (
<FormattedMessage
id="unavailable"
defaultMessage="Unavailable"
/>
)}
</ContentItem>
<ContentItem
className="content-item-resource"
style={
(borderStyle, { order: counterForOrder + orderWhere })
}
>
{entry.resourceTitle ?? entry.resourceId ?? ""}
</ContentItem>
</Fragment>
);
counterForOrder += 3;
return returnFragment;
})}
</ContentItemsWrapper>
</Content>
</Wrapper>
Expand Down Expand Up @@ -290,6 +312,7 @@ CalendarMultiple.propTypes = {
})
).isRequired,
content: PropTypes.shape({
headerOrder: PropTypes.string,
title: PropTypes.string,
hasDateAndTime: PropTypes.bool,
displayHeaders: PropTypes.bool,
Expand Down
1 change: 1 addition & 0 deletions src/slides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ const slides = [
},
},
content: {
headerOrder: "whatwherewhen",
duration: 5000,
layout: "multiple",
hasDateAndTime: true,
Expand Down