Skip to content

Commit

Permalink
Merge branch 'react-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
serd2011 committed Nov 7, 2021
2 parents b4a66d5 + b0ee3cb commit 5b9e83a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"manifest_version": 3,
"version": "3.0",
"version": "3.1",
"author": "Serd2011",
"name": "ГУАП Расписание",
"short_name": "ГУАП Расписание",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "guap_rasp",
"version": "3.0",
"version": "3.1",
"description": "Проект, направленный на упрощение просмотра и улучшение внешнего вида расписания при просмотре с ПК",
"scripts": {
"build": "webpack --config webpack/webpack.config.prod.js",
Expand Down
3 changes: 2 additions & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"Б.Морская 67": "Б.М.",
"Ленсовета 14": "Ленс.",
"Московский 149в": "Моск.",
"Не опеределено": "Не опеределено"
"Не опеределено": "Не опеределено",
"Дистант": "Дистант"
},
"build_names_for_map": [
"Б.Морская 67",
Expand Down
2 changes: 1 addition & 1 deletion src/js/helperFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export async function requestTimeTable(id, isGroup) {
timetable[lesson.ItemId].num = lesson.Less;
timetable[lesson.ItemId].type = lesson.Type;
timetable[lesson.ItemId].name = lesson.Disc;
timetable[lesson.ItemId].rooms = lesson.Rooms;
timetable[lesson.ItemId].rooms = lesson.Rooms || "";
timetable[lesson.ItemId].build = { full: lesson.Build, short: config.build_short_names[lesson.Build] };
timetable[lesson.ItemId].groupsIds = lesson.Groups.slice(1, -1).split("::").map(Number);
timetable[lesson.ItemId].prepsIds = lesson.Preps.slice(1, -1).split("::").map(Number);
Expand Down

0 comments on commit 5b9e83a

Please sign in to comment.