y0rune/frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
Maciek Głowacki
2020-08-18 00:21:21 +02:00
parent 74ad2e835c
commit 281a1742bc
3 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/SchedulerEvents.tsx
View File

@ -11,7 +11,7 @@ interface SchedulerEventsProps {
export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) => {
const { choosenGroups } = useContext(coursesContext)!;
const [groupsMappedToEvents, setGroupsMappedToEvents] = useState<any>([]);
const [choosenGroupsMappedToEvents, setChoosenGroupsMappedToEvents] = useState<any>([]);
interface GroupTimeToEventRowMapping {
[time: string]: number;
@ -29,22 +29,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
};
useEffect(() => {
function mapGroupTimeToEventRow(groups: Array<Group>) {
const groupsMappedToEventsTemp = [];
for (const group of groups) {
const groupTime = group.time;
const eventRow: number = groupTimeToEventRowMapping[groupTime];
const groupMappedToEvent: any = {
id: group.id,
day: group.day,
eventRow: eventRow,
lecturer: group.lecturer,
room: group.room,
};
setGroupsMappedToEvents((groupsMappedToEvents: any) => [...groupsMappedToEvents, groupMappedToEvent]);
}
}
function alternative(choosenGroups: Array<Group>) {
function mapGroupTimeToEventRow(choosenGroups: Array<Group>) {
const groupsMapped = choosenGroups.map(({ id, day, lecturer, room, time }) => ({
id,
day,
@ -52,9 +37,9 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
room,
eventRow: groupTimeToEventRowMapping[time],
}));
setGroupsMappedToEvents(groupsMapped);
setChoosenGroupsMappedToEvents(groupsMapped);
}
alternative(choosenGroups);
mapGroupTimeToEventRow(choosenGroups);
}, [choosenGroups]);
return (
@ -62,7 +47,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
{[...Array(6)].map((_, index) => (
<SchedulerRow
key={index}
groups={groupsMappedToEvents.filter((group: any) => {
groups={choosenGroupsMappedToEvents.filter((group: any) => {
return group.eventRow === index;
})}
indexRow={index}

9
src/components/SchedulerRow.tsx
View File

@ -26,21 +26,20 @@ interface SchedulerRowProps {
}
export const SchedulerRow = ({ groups, indexRow, cellTop, cellWidth }: SchedulerRowProps) => {
// console.log(`You passed me these of a groupzzz`);
// console.log(groups)
return (
<>
{[...Array(5)].map((value, eventIndex) => (
{[...Array(5)].map((_, eventIndex) => (
<SchedulerEvent
eventIndex={eventIndex}
cellTop={cellTop}
cellWidth={cellWidth}
key={`eventRow${indexRow}eventCol${eventIndex}`}
key={eventIndex}
id={`eventRow${indexRow}eventCol${eventIndex}`}
>
{groups.map((group, index) =>
group.day === eventIndex ? <div key={index}>{groups[index]?.lecturer}</div> : null,
group.day === eventIndex && <div key={index}>{groups[index]?.lecturer}</div>,
)}
</SchedulerEvent>
))}