From cd4ae7e71f7ebc9a9dbb41827ad400bd6c5ee052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20Gr=C3=B8n=C3=A5s?= <44143748+sondregronas@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:49:17 +0200 Subject: [PATCH] Ansvarsavtale --- BookingSystem/app.py | 5 ++ BookingSystem/templates/index_student.html | 20 ++++++-- BookingSystem/templates/responsibility.html | 7 +++ .../templates/user/responsibility.html | 48 +++++++++++++++++++ docker-compose.yml | 1 + 5 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 BookingSystem/templates/responsibility.html create mode 100644 BookingSystem/templates/user/responsibility.html diff --git a/BookingSystem/app.py b/BookingSystem/app.py index 91023e2..e715525 100644 --- a/BookingSystem/app.py +++ b/BookingSystem/app.py @@ -137,6 +137,11 @@ def innlevering() -> str: unavailable_items=inventory.get_all_unavailable()) +@app.route('/ansvarsavtale') +def responsibility() -> str: + return flask.render_template('responsibility.html') + + if __name__ == '__main__': init_db() app.run(host='0.0.0.0') diff --git a/BookingSystem/templates/index_student.html b/BookingSystem/templates/index_student.html index 2d0d496..398ea5e 100644 --- a/BookingSystem/templates/index_student.html +++ b/BookingSystem/templates/index_student.html @@ -20,9 +20,23 @@

Velkommen til utstyrsrommet! Før du kan bruke utstyrsrommet må du velge kl {% endfor %} - - -

+ + + +
+ + + +
+
+

Obs!

+

Ansvarsavtalen inkluderer økonomisk ansvar for utstyr som blir ødelagt eller mistet, i henhold til + avtalen. +

+
+ diff --git a/BookingSystem/templates/responsibility.html b/BookingSystem/templates/responsibility.html new file mode 100644 index 0000000..e154ec9 --- /dev/null +++ b/BookingSystem/templates/responsibility.html @@ -0,0 +1,7 @@ +{% extends 'layout.html' %} + +{% block content %} + +{% include 'user/responsibility.html' %} + +{% endblock %} \ No newline at end of file diff --git a/BookingSystem/templates/user/responsibility.html b/BookingSystem/templates/user/responsibility.html new file mode 100644 index 0000000..2cf4b75 --- /dev/null +++ b/BookingSystem/templates/user/responsibility.html @@ -0,0 +1,48 @@ +
+

Ansvarsavtale

+

Avtale om bruk/lån av utstyr

+
+
+

Denne avtalen sikrer:

+ + +
+ +
+

Elevens ansvar:

+ + +
+ +
+ +

Skolen avgjør graden av erstatningsplikt i hvert enkelt tilfelle.

+ +

Jeg har rett til å klage på skolens avgjørelse, og leverer klagen til skolens ledelse ved + avdelingsleder. +

+ +

Dersom eleven er under 18 år må eleven ha tillatelse fra foresatte før avtalen kan godkjennes

+
+
\ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ca3da55..24564c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: - "5000:5000" volumes: - ./data:/app/data + - #./responsibility.html:/app/templates/user/responsibility.html environment: # Feide client settings (Get from https://dashboard.dataporten.no) # FEIDE_REDIRECT_URI must be set to /login/feide/callback in dataporten