dm1sh/timetable-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dm1sh:pdf
Branches Tags
dm1sh:main
dm1sh:pdf
..
compare: dm1sh:main
Branches Tags
dm1sh:main
dm1sh:pdf

12 Commits
pdf ... main

Author SHA1 Message Date
Dmitriy Shishkov
88270fdcfe
Update README.md 2020-12-15 10:43:51 +05:00
TUTOR03
7ad62907ec Apply Prettier styles 2020-12-13 14:15:30 +00:00
TUTOR03
adaf786ddd created Timetable state logic 2020-12-13 19:14:28 +05:00
dm1sh
d008eedce0
Created basic state types 2020-12-13 17:47:39 +05:00
TUTOR03
b5aa7a4ed6 Merge branch 'main' of https://github.com/dm1sh/timetable-generator into main 2020-12-13 17:27:29 +05:00
TUTOR03
c055659a87 add bootstrap icons 2020-12-13 17:27:13 +05:00
TUTOR03
55d3f4757e Apply Prettier styles 2020-12-13 12:25:12 +00:00
TUTOR03
03dfa117b2 Merge branch 'main' of https://github.com/dm1sh/timetable-generator into main 2020-12-13 17:23:49 +05:00
TUTOR03
3d82a01683 first design 2020-12-13 17:23:32 +05:00
Dm1tr1y147
27a0d3eac4
Merge branch 'main' of github.com:dm1sh/timetable-generator into main 2020-12-13 00:18:56 +05:00
TUTOR03
046408f81d Apply Prettier styles 2020-12-12 16:57:45 +00:00
TUTOR03
1417158c14 Just test sublime merge 2020-12-12 21:55:51 +05:00
9 changed files with 357 additions and 1 deletions
Show Stats Expand all files Collapse all files

3
README.md
View File

@ -1 +1,2 @@
# Application for sheduling classes in UPML ## Application for sheduling classes in UPML
# Not finished: switched to [organization repository](https://github.com/SSH-KK/timetable-generator)

36
dataExample.json Normal file
View File

@ -0,0 +1,36 @@
{
"days": [
{
"events": [
{
"lessons": [0, 1, 2, 3, 4, 5]
},
{
"lessons": [0, 1, 2, 3, 4, 5]
}
],
"date": 5467546
},
{
"events": [
{
"lessons": [0, 1, 2, 3, 4, 5]
}
],
"date": 5467546
}
],
"cards": [
{
"subject": 3,
"room": 505,
"teacher": 1
}
],
"subjects": [
{
"title": "Math",
"teachers": ["Popov", "somebody"]
}
]
}

1
package.json
View File

@ -42,6 +42,7 @@
}, },
"dependencies": { "dependencies": {
"@types/pdfmake": "^0.1.16", "@types/pdfmake": "^0.1.16",
"bootstrap-icons": "^1.2.1",
"pdfmake": "^0.1.68", "pdfmake": "^0.1.68",
"react": "^15.0.0 || ^16.0.0 || ^17.0.0 ", "react": "^15.0.0 || ^16.0.0 || ^17.0.0 ",
"react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 " "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 "

128
src/HTML one.html Normal file
View File

@ -0,0 +1,128 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
<link rel="stylesheet" href="test_html.css">
<title>Document</title>
</head>
<body>
<div class="wrapper">
<nav id="sidebar" class="active me-3">
<div class="sidebar-header">
<h3>Bootstrap Sidebar</h3>
</div>
<button type="button" id="sidebar-toggle" class="btn btn-secondary rounded-end">X</button>
</nav>
<div id="content" class="container mt-3">
<!-- <nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<button type="button" id="sidebarCollapse" class="btn btn-info">
<i class="fas fa-align-left"></i>
<span>Toggle Sidebar</span>
</button>
</div>
</nav> -->
<div class="row text-center">
<div class="col-md-4 rounded-2 shadow-sm">11</div>
<div class="col-md-4 rounded-2 shadow-sm">11</div>
<div class="col-md-4 rounded-2 shadow-sm">11</div>
</div>
<div class="row text-center border-bottom border-3">
<div class="col-md-2 rounded-2 shadow-sm">91</div>
<div class="col-md-2 rounded-2 shadow-sm">91</div>
<div class="col-md-2 rounded-2 shadow-sm">91</div>
<div class="col-md-2 rounded-2 shadow-sm">91</div>
<div class="col-md-2 rounded-2 shadow-sm">91</div>
<div class="col-md-2 rounded-2 shadow-sm">91</div>
</div>
<div class="row">
<div class="col-md-4 rounded-2 shadow-sm">
<div class="row">
<div class="col-md-6 text-center border-bottom border-start border-3">
<h6>Физика</h6>
<h6>505</h6>
<h6>Попов</h6>
</div>
<div class="col-md-6 d-flex align-items-center justify-content-center text-center border-bottom border-end border-start border-3">
<div class="dropdown">
<button class="btn btn-sm btn-success dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
Выберите пару
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</div>
</div>
</div>
<div class="d-grid gap-2 my-2">
<button class="btn btn-outline-primary btn-sm" type="button">Новые Пары</button>
</div>
</div>
<div class="col-md-4 rounded-2 shadow-sm">
<div class="row">
<div class="col-md-6 text-center border-bottom border-3">
<h6>Физика</h6>
<h6>505</h6>
<h6>Попов</h6>
</div>
<div class="col-md-6 d-flex align-items-center justify-content-center text-center border-bottom border-end border-start border-3">
<div class="dropdown">
<button class="btn btn-sm btn-success dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
Выберите пару
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</div>
</div>
</div>
<div class="d-grid gap-2 my-2">
<button class="btn btn-outline-primary btn-sm" type="button">Новые Пары</button>
</div>
</div>
<div class="col-md-4 rounded-2 shadow-sm">
<div class="row">
<div class="col-md-6 text-center border-bottom border-3">
<h6>Физика</h6>
<h6>505</h6>
<h6>Попов</h6>
</div>
<div class="col-md-6 d-flex align-items-center justify-content-center text-center border-bottom border-end border-start border-3">
<div class="dropdown">
<button class="btn btn-sm btn-success dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
Выберите пару
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</div>
</div>
</div>
<div class="d-grid gap-2 my-2">
<button class="btn btn-outline-primary btn-sm" type="button">Новые Пары</button>
</div>
</div>
<!-- <div class="col-md-4 rounded-2 shadow-sm">dfsfsfesfs</div>
<div class="col-md-4 rounded-2 shadow-sm">dfsfsfesfs</div> -->
</div>
<div class="d-grid gap-2 my-2">
<button class="btn btn-outline-primary btn-sm" type="button">Новый День</button>
</div>
</div>
</div>
<script type="text/javascript">
document.querySelector('#sidebar-toggle').addEventListener('click', ()=>{
document.querySelector('#sidebar').classList.toggle('active')
})
</script>
</body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
</html>

93
src/hooks.ts Normal file
View File

@ -0,0 +1,93 @@
import { useState } from "react";
import {
TimetableT,
UseTimetableHookFT,
CreateCardFT,
CreateSubjectFT,
CreateDayFT,
AddEventFT,
AddLessonFT,
DayT,
CardT,
SubjectT,
} from "./types/timetable";
import { initialEventLessonsGenrator } from "./utils/timetable";
export const useTimetable: UseTimetableHookFT = () => {
const [cardState, setCardState] = useState<CardT[]>([]);
const [dayState, setDayState] = useState<DayT[]>([]);
const [subjectState, setSubjectState] = useState<SubjectT[]>([]);
// const [startDateState, setStartDateState] = useState<number>(0)
const createSubject: CreateSubjectFT = (title, teachers) => {
setSubjectState(prev => [...prev, { title, teachers }]);
};
const createCard: CreateCardFT = (subject, teacher, room) => {
setCardState(prev => [...prev, { subject, teacher, room }]);
};
const createDay: CreateDayFT = date => {
setDayState(prev => [...prev, { date, events: [] }]);
};
const addEvent: AddEventFT = dayId => {
setDayState(days =>
days.map((day, i) =>
i == dayId
? {
...day,
events: [
...day.events,
{ lessons: initialEventLessonsGenrator() },
],
}
: day
)
);
};
const addLesson: AddLessonFT = (
dayId,
eventId,
groupId,
isPair,
lessonId,
lessonNumber
) => {
setDayState(days =>
days.map((day, dayIndex) =>
dayIndex == dayId
? {
...day,
events: day.events.map((event, eventIndex) =>
eventIndex == eventId
? {
lessons: event.lessons.map((lesson, lessonIndex) =>
lessonIndex == groupId
? isPair
? [lessonId, lessonId]
: lesson.map((lessonElement, lessonElementIndex) =>
lessonElementIndex == lessonNumber
? lessonId
: lessonElement
)
: lesson
),
}
: event
),
}
: day
)
);
};
return {
state: { cards: cardState, subjects: subjectState, days: dayState },
createCard,
createSubject,
createDay,
addLesson,
};
};

4
src/styles/App.module.css
View File

@ -1,3 +1,7 @@
.title { .title {
color: red; color: red;
} }
/*just test sunlime merge*/
body {
background-color: blue;
}

38
src/test_html.css Normal file
View File

@ -0,0 +1,38 @@
.wrapper {
display: flex;
width: 100%;
align-items: stretch;
}
#sidebar {
min-width: 18%;
max-width: 18%;
min-height: 100vh;
position: relative;
background-color: #adb5bd;
transition: all 0.3s;
}
#sidebar {
margin-left: -18%;
}
#sidebar.active {
margin-left: 0px;
}
#sidebar-toggle {
position: absolute;
border-radius: 0;
top: 0;
left: 100%;
}
@media (max-width: 768px) {
#sidebar {
margin-left: -250px;
}
#sidebar.active {
margin-left: 0;
}
}

53
src/types/timetable.ts Normal file
View File

@ -0,0 +1,53 @@
export type TimetableT = {
days: DayT[];
cards: CardT[];
subjects: SubjectT[];
};
export type DayT = {
events: EventT[];
date: number; // epoch time
};
type EventT = {
lessons: number[][]; // IDs
};
export type CardT = {
subject: number; // ID
room: number; // Number
teacher: number; // ID in subject
};
export type SubjectT = {
title: string;
teachers: string[]; // teachers allowed for this subject
};
export type CreateSubjectFT = (title: string, teachers: string[]) => void;
export type CreateCardFT = (
subject: number,
teacher: number,
room: number
) => void;
export type CreateDayFT = (date: number) => void;
export type AddEventFT = (dayId: number) => void;
export type AddLessonFT = (
dayId: number,
eventId: number,
groupId: number,
isPair: boolean,
lessonId: number,
lessonNumber?: number
) => void;
export type UseTimetableHookFT = () => {
createSubject: CreateSubjectFT;
createCard: CreateCardFT;
createDay: CreateCardFT;
state: TimetableT;
};

2
src/utils/timetable.ts Normal file
View File

@ -0,0 +1,2 @@
export const initialEventLessonsGenrator = () =>
Array(6).map<number[]>(() => [0, 0]);