# Conflicts:
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/helper.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/parse.py
#	schoolapps/untisconnect/plan.py

- Check "show_plan" permission in dashboard

- Do some refactoring

# Conflicts:
#	schoolapps/dashboard/views.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/api.py
#	schoolapps/untisconnect/plan.py

Apply merging of sub rows for HTML table, too | Refactor and comment | Add __eq__ to API objects to improve matching

rename class to aktuell in generate_pdf, exclude flags b (Verfügungsstunde) and F (Lehrerfrei) in get_substituitions_by_date

# Conflicts:
#	.idea/dataSources.local.xml
#	schoolapps/static/common/style.css
#	schoolapps/timetable/templates/timetable/plan.html
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/plan.py

Bug fixes in timetable (issue #248)

Problem: If the start lesson equal to the end lesson, there was no lesson shown

Location: Event.create()
Problem: Got absence by id without filtering by term or school year
Solution: Use run_one of api.py, which filters automatically

- Arrange print icon right
- Add line break for header information in LaTeX
- Show one-hour absences with only one number (e.g. 1.) instead of two (e. g. 1.-1.)
- Add dots to lesson numbers in absences

Update Templates | Update views | update SubRow-class | update generateSubtable-function | update events | make everything work | but it doesn't work. Perhaps @hansegucker can help me

Dev to timetable hints