merged conflicts
This commit is contained in:
commit
48992b7e04
@ -32,6 +32,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function mapGroupTimeToEventRow(groups: Array<Group>) {
|
function mapGroupTimeToEventRow(groups: Array<Group>) {
|
||||||
|
const groupsMappedToEventsTemp = [];
|
||||||
for (const group of groups) {
|
for (const group of groups) {
|
||||||
console.log(group);
|
console.log(group);
|
||||||
const groupTime = group.time;
|
const groupTime = group.time;
|
||||||
@ -60,6 +61,7 @@ export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) =>
|
|||||||
}, [choosenGroups]);
|
}, [choosenGroups]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
console.log(choosenGroups);
|
||||||
console.log(groupsMappedToEvents);
|
console.log(groupsMappedToEvents);
|
||||||
}, [groupsMappedToEvents]);
|
}, [groupsMappedToEvents]);
|
||||||
|
|
||||||
|
@ -89,8 +89,6 @@ export const Results: React.FC = () => {
|
|||||||
group.room = result[i].room.trim();
|
group.room = result[i].room.trim();
|
||||||
lecture.groups.push(group);
|
lecture.groups.push(group);
|
||||||
}
|
}
|
||||||
console.log(result);
|
|
||||||
console.log(result[0].course.name);
|
|
||||||
|
|
||||||
lecturesContext.addLecture(lecture);
|
lecturesContext.addLecture(lecture);
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
Loading…
Reference in New Issue
Block a user