wulkanowy/fake-log
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add the service in the timetable of different lessons

Browse source
This commit is contained in:
RicomenPL 2017-12-17 13:06:42 +01:00
parent afbaac27ca
commit 54285c6dc5
2 changed files with 301 additions and 358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

569
data/opiekun/plan-lekcji.json
View file

@ -3,376 +3,261 @@
"number": "0",
"hourStart": "07:10",
"hourEnd": "07:55",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"days": [
{
"name": "Fizyka",
"group": "[zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
"isCanceled": "1",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Metodologia programowania",
"group": "[zaw2]",
"teacher": "",
"room": "32",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Religia",
"group": "",
"teacher": "Cyranka Krystian",
"room": "3",
"description": "(zastępstwo)",
"isCanceled": "1",
"newLesson": {
"name": "Wychowanie do życia w rodzinie",
"teacher": "Nowak Jadwiga",
"room": "3",
"isCanceled": "",
"isMoved": "1",
"description": ""
}
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "",
"group": "",
"teacher": "",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Uroczyste zakończenie roku szkolnego",
"group": "",
"teacher": "Baran Małgorzata",
"room": "37",
"description": "(",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
}
}
]
},
{
"number": "1",
"hourStart": "08:00",
"hourEnd": "08:45",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
"days": [
{
"name": "Metodologia programowania",
"group": "[zaw2]",
"teacher": "Baran Małgorzata",
"room": "36",
"description": "(zmiana organizacji zajęć)",
"isCanceled": "1",
"newLesson": {
"name": "Wychowanie fizyczne",
"teacher": "",
"room": "G3",
"isCanceled": "",
"isMoved": "1",
"description": "(przeniesiona z lekcji 7, 01.12.2017)"
}
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Język angielski",
"group": "[J1]",
"teacher": "Kobczyk Iwona",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Użytkowanie urządzeń peryferyjnych komputera",
"group": "[zaw2]",
"teacher": "Bączek Robert",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Wychowanie fizyczne",
"group": "[zaw1]",
"teacher": "Jarocki Krzysztof",
"room": "G4",
"description": "",
"isCanceled": "1",
"newLesson": {
"name": "Wychowanie fizyczne",
"teacher": "Nowicka Irena",
"room": "G4",
"isCanceled": "",
"isMoved": "1",
"description": "(zastępstwo)"
}
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "",
"group": "",
"teacher": "",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
}
}
]
},
{
"number": "2",
"hourStart": "08:50",
"hourEnd": "09:35",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
"days": [
{
"name": "Język polski",
"group": "",
"teacher": "Bocian Natalia",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "1",
"description": ""
}
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Język niemiecki",
"group": "[J1]",
"teacher": "Rożeniec Honorata",
"room": "25",
"description": "(okienko dla uczniów)",
"isCanceled": "1",
"newLesson": {
"name": "Język polski",
"teacher": "Bocian Natalia",
"room": "",
"isCanceled": "",
"isMoved": "1",
"description": "(przeniesiona z lekcji 7, 20.06.2017)"
}
},
"dayThree": {
"name": "Fizyka [zaw2]",
{
"name": "Użytkowanie urządzeń peryferyjnych komputera",
"group": "[zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "Matematyka",
"group": "",
"teacher": "Baran Małgorzata",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
{
"name": "",
"group": "",
"teacher": "",
"room": "",
"description": "",
"isCanceled": "",
"newLesson": {
"name": "",
"teacher": "",
"room": "",
"isCanceled": "",
"isMoved": "",
"description": ""
}
}
}
},
{
"number": "3",
"hourStart": "09:40",
"hourEnd": "10:25",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
}
}
},
{
"number": "4",
"hourStart": "10:40",
"hourEnd": "11:25",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
}
}
},
{
"number": "5",
"hourStart": "11:30",
"hourEnd": "12:15",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
}
}
},
{
"number": "6",
"hourStart": "12:20",
"hourEnd": "13:05",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
}
}
},
{
"number": "7",
"hourStart": "13:10",
"hourEnd": "13:55",
"days": {
"dayOne": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayTwo": {
"name": "Mateamatyka",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayThree": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFour": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
},
"dayFive": {
"name": "Fizyka [zaw2]",
"teacher": "Bączek Grzegorz",
"room": "19",
"description": "(uczniowie zwolnieni do domu)",
"isCanceled": "0",
"isMoved": "0"
}
}
]
}
]

90
src/views/opiekun/plan-lekcji.pug
View file

@ -19,28 +19,86 @@ append content
tr
td= item.number
td= item.hourStart + " " + item.hourEnd
td
div
span= item.days.dayOne.name
td
div
span= item.days.dayTwo.name
td
div
span= item.days.dayThree.name
td
div
span= item.days.dayFour.name
td
div
span= item.days.dayFive.name
each day in item.days
td
if day.isCanceled && !day.newLesson.isMoved
div
if day.group
span.x-treelabel-inv= day.name + " " + day.group
span.x-treelabel-inv
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-rlz= day.description
else
span.x-treelabel-inv= day.name
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-rlz= day.description
else if day.isCanceled && day.newLesson.isMoved && !day.newLesson.description
div
if day.group
span.x-treelabel-inv= day.name + " " + day.group
span.x-treelabel-inv
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-zas= day.newLesson.name
span.x-treelabel-zas
span.x-treelabel-zas= day.newLesson.teacher
span.x-treelabel-zas= day.newLesson.room
span.x-treelabel-rlz= day.description
else
span.x-treelabel-inv= day.name
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-zas= day.newLesson.name
span.x-treelabel-zas= day.newLesson.teacher
span.x-treelabel-zas= day.newLesson.room
span.x-treelabel-rlz= day.description
else if day.isCanceled && day.newLesson.isMoved && day.newLesson.description
if day.group
div
span.x-treelabel-inv= day.name + " " + day.group
span.x-treelabel-inv
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-rlz= day.description
div
span.x-treelabel-zas= day.newLesson.name + " " + day.group
span.x-treelabel-zas
span.x-treelabel-zas= day.newLesson.teacher
span.x-treelabel-zas= day.newLesson.room
span.x-treelabel-rlz= day.newLesson.description
else
div
span.x-treelabel-inv= day.name
span.x-treelabel-inv= day.teacher
span.x-treelabel-inv= day.room
span.x-treelabel-rlz= day.description
div
span.x-treelabel-zas= day.newLesson.name
span.x-treelabel-zas= day.newLesson.teacher
span.x-treelabel-zas= day.newLesson.room
span.x-treelabel-rlz= day.newLesson.description
else
div
if !day.group
span= day.name
span= day.teacher
span= day.room
else
span= day.name + " " + day.group
span
span= day.teacher
span= day.room
.description
div
span.x-treelabel-ppl Kursywa
| - planowane
div
span.x-treelabel-rlz Zwykła czcionka
span.x-treelabel-rlz Zwykła czcionka
| - zrealizowane
div
span.x-treelabel-inv Przekreślone