Om corpset #392
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| import { IconMail } from '@tabler/icons-react'; | ||
| import ActionIcon from 'components/input/action-icon'; | ||
| import { filterNone } from 'utils/array'; | ||
| import { numberAndFullName } from 'utils/corps'; | ||
| import { lang } from 'utils/language'; | ||
|
|
||
| interface Instrument { | ||
| instrument: { name: string }; | ||
| isMainInstrument: boolean; | ||
| } | ||
|
|
||
| interface Role { | ||
| name: string; | ||
| } | ||
|
|
||
| interface Corps { | ||
| id: string; | ||
| firstName: string; | ||
| lastName: string; | ||
| nickName: string | null; | ||
| pronouns: string | null; | ||
| number: number | null; | ||
| bNumber: number | null; | ||
| contactURL: string | null; | ||
| points: number; | ||
| firstGigDate: Date | undefined; | ||
| firstRehearsalDate: Date | undefined; | ||
| instruments: Instrument[]; | ||
| roles: Role[]; | ||
| } | ||
|
|
||
| interface CorpsInfoboxProps { | ||
| corps: Corps; | ||
| } | ||
|
|
||
| const genOtherInstrumentsString = (instruments: string[]) => { | ||
| const instrumentsLower = instruments.map((i) => i.toLowerCase()); | ||
| if (instrumentsLower.length === 0) return ''; | ||
| if (instrumentsLower.length === 1) return instrumentsLower[0] ?? ''; | ||
| return `${instrumentsLower | ||
| .slice(0, instrumentsLower.length - 1) | ||
| .join(', ')} och ${instrumentsLower[instrumentsLower.length - 1] ?? ''}`; | ||
| }; | ||
|
|
||
| const roleToEmail: Record<string, string> = { | ||
| Ordförande: "ordforande@bleckhornen.org", | ||
| ViceOrdförande: "vice@bleckhornen.org", | ||
| Sekreterare: "sekreterare@bleckhornen.org", | ||
| Kassör: "kassor@bleckhornen.org", | ||
| }; | ||
|
|
||
| const roleListToEmail = (roles: Role[]) => { | ||
| const matchingRole = roles.find(r => roleToEmail[r.name]); | ||
|
|
||
| return matchingRole ? ('mailto:' + roleToEmail[matchingRole.name]) : null; | ||
| } | ||
|
|
||
| // A list of "instruments" which should have the prefix "är" | ||
| const beingPrefixes = ['dirigent', 'balett', 'slagverksfröken']; | ||
|
|
||
|
|
||
| const PositionInfobox = ({ corps }: CorpsInfoboxProps) => { | ||
|
Owner
There was a problem hiding this comment. I think we should redesign the info card a bit. If we simply use It should be enough to just display the name of the committee, the description, and who is responsible. |
||
| const corpsNameTemp = numberAndFullName(corps); | ||
| const corpsName = | ||
| corpsNameTemp.length > 25 | ||
| ? corpsNameTemp.slice(0, 25) + corpsNameTemp.slice(25).replace(' ', '\n') | ||
| : corpsNameTemp; | ||
|
|
||
| const { | ||
| nickName, | ||
| pronouns, | ||
| contactURL, | ||
| points, | ||
| firstGigDate, | ||
| firstRehearsalDate, | ||
| instruments | ||
| } = corps; | ||
|
|
||
| const mainInstrument = | ||
| instruments.find((i) => i.isMainInstrument)?.instrument.name ?? ''; | ||
| const otherInstruments = instruments | ||
| .filter((i) => !i.isMainInstrument) | ||
| .map((i) => i.instrument.name); | ||
|
|
||
| const isPlayingMainInstrument = !beingPrefixes.includes( | ||
| mainInstrument.toLowerCase(), | ||
| ); | ||
| const isPlayingOtherInstrument = !otherInstruments.some((i) => | ||
| beingPrefixes.includes(i.toLowerCase()), | ||
| ); | ||
|
|
||
|
|
||
| const joinedAt = | ||
| (firstGigDate?.getTime() ?? Number.MAX_VALUE) < | ||
| (firstRehearsalDate?.getTime() ?? Number.MAX_VALUE) | ||
| ? firstGigDate | ||
| : firstRehearsalDate; | ||
|
|
||
| const joinedMsg = `Gick med i corpset den ${joinedAt?.getDate()} ${joinedAt?.toLocaleDateString( | ||
| 'sv', | ||
| { month: 'long' }, | ||
| )} ${joinedAt?.getFullYear()}.`; | ||
|
|
||
| const temp1 = isPlayingMainInstrument ? 'Spelar ' : 'Är '; | ||
|
|
||
| // If the main instrument is the same as the other instruments, we don't need to specify it twice | ||
| const temp2 = | ||
| isPlayingMainInstrument !== isPlayingOtherInstrument | ||
| ? isPlayingOtherInstrument | ||
| ? 'spelar ' | ||
| : 'är ' | ||
| : ''; | ||
|
|
||
| const instrumentsMsg = | ||
| temp1 + | ||
| (otherInstruments.length > 0 ? 'främst ' : '') + | ||
| mainInstrument.toLowerCase() + | ||
| (otherInstruments.length > 0 | ||
| ? ', men ' + temp2 + 'även ' + genOtherInstrumentsString(otherInstruments) | ||
| : '') + | ||
| '.'; | ||
|
|
||
| const roleEmail = roleListToEmail(corps.roles) | ||
| const contact = roleEmail ? roleEmail : contactURL | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className='text-lg font-bold'> | ||
| <div className='flex flex-nowrap items-start gap-2 whitespace-pre'> | ||
| {corpsName} | ||
|
|
||
| {(contact) && ( | ||
| <ActionIcon | ||
| href={contact} | ||
| variant='subtle' | ||
| > | ||
| <IconMail /> | ||
| </ActionIcon> | ||
| )} | ||
| </div> | ||
| {(nickName || pronouns) && ( | ||
| <div className='mb-1 bg-transparent text-xs font-light text-neutral-500'> | ||
| {filterNone([corps.nickName, corps.pronouns]).join(' • ')} | ||
| </div> | ||
| )} | ||
| </div> | ||
| <div className='italic'> | ||
| {lang('Spelpoäng: ', 'Gig points: ')} | ||
| {points} | ||
| </div> | ||
| <div className='h-1.5' /> | ||
| <div className='text-sm font-light'> | ||
| {joinedAt && joinedMsg} {instrumentsMsg}{' '} | ||
|
|
||
| </div> | ||
|
|
||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default PositionInfobox; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still not 100% convinced adding
contactURLtoCorpsis a good idea. I would prefer adding a new modelPositionwhich defines aname,contactUrland maybe links to some of the permission roles.E.g. for the Kassör:
Another solution could be to add
emailandcontactUrltoRole, and create new roles for each board member and commitee chairman. Could be worth addingnameEn/nameEnglishas well to store the English translation.