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

merged conflicts

This commit is contained in:
Maciek Głowacki 2020-08-12 17:14:21 +02:00
parent f1cf374b07 09384e46fd
commit 48992b7e04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Scheduler/SchedulerEvents/index.tsx
View File

@ -32,6 +32,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
useEffect(() => {
function mapGroupTimeToEventRow(groups: Array<Group>) {
const groupsMappedToEventsTemp = [];
for (const group of groups) {
console.log(group);
const groupTime = group.time;
@ -60,6 +61,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
}, [choosenGroups]);
useEffect(() => {
console.log(choosenGroups);
console.log(groupsMappedToEvents);
}, [groupsMappedToEvents]);

2
src/components/TopBar/Results/index.tsx
View File

@ -89,8 +89,6 @@ export const Results: React.FC = () => {
group.room = result[i].room.trim();
lecture.groups.push(group);
}
console.log(result);
console.log(result[0].course.name);
lecturesContext.addLecture(lecture);
setOpen(false);