diff --git a/db.sqlite3 b/db.sqlite3 index 8ea956c..6ecbe29 100755 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/leitstelle/static/css/create.css b/leitstelle/static/css/create.css index 4717ad4..689d0a3 100755 --- a/leitstelle/static/css/create.css +++ b/leitstelle/static/css/create.css @@ -1,3 +1,17 @@ -h1 { - color: red; +#box1 { + text-align: left; + height: auto; + width: 70%; + border-radius: 1rem; + box-shadow: 0rem 0rem 2rem rgb(248, 0, 0); + /* background-color: hsla(0, 100%, 53%, 0.686); */ + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-weight: 600; + padding: 2em; + margin-top: 5rem; + margin-left: 17.5%; +} +.fz_activ { + background-color: rgb(255, 61, 61); + color: white; } \ No newline at end of file diff --git a/leitstelle/templates/leitstelle/base.html b/leitstelle/templates/leitstelle/base.html deleted file mode 100755 index ac76987..0000000 --- a/leitstelle/templates/leitstelle/base.html +++ /dev/null @@ -1,33 +0,0 @@ -{% load static %} - - - - - - - - - - - - - - - - - EmergencyControlCenter - Index - - - - {% block pushup %} - {% endblock %} - - {% include "main/header.html" %} - - {% block content %} - {% endblock %} - - - - - \ No newline at end of file diff --git a/leitstelle/templates/leitstelle/create.html b/leitstelle/templates/leitstelle/create.html index fbc9579..2ebd525 100755 --- a/leitstelle/templates/leitstelle/create.html +++ b/leitstelle/templates/leitstelle/create.html @@ -1,11 +1,64 @@ -{% extends 'leitstelle/base.html' %} +{% extends 'main/base.html' %} {% block content %} -
-

Neuer Einsatz

-

test

-
+
+

Einsatzgenerierung

+
+
+
+
+

Stichwort:

+ +
+
+ +
+ +
+
+

Freitext

+ +
+
+
+ + + +

Fahrzeuge

+
+ {% for fz in fz %} +
+ {{ fz.3 }} - {{ fz.2 }} + +
+ {% endfor %} +
+ + + ABBRUCH +
+
+ {% endblock %} \ No newline at end of file diff --git a/leitstelle/templates/leitstelle/index.html b/leitstelle/templates/leitstelle/index.html index 2ca9784..a93f288 100755 --- a/leitstelle/templates/leitstelle/index.html +++ b/leitstelle/templates/leitstelle/index.html @@ -1,16 +1,14 @@ -{% extends 'leitstelle/base.html' %} +{% extends 'main/base.html' %} {% block content %} -
- -

Alarmierung
erstellen

+
+ +

Alarm Erstellen

 -
diff --git a/leitstelle/templates/leitstelle/setStation.html b/leitstelle/templates/leitstelle/setStation.html new file mode 100755 index 0000000..2828e0d --- /dev/null +++ b/leitstelle/templates/leitstelle/setStation.html @@ -0,0 +1,25 @@ +{% extends 'main/base.html' %} + + +{% block content %} + +
+

Wache wählen

+
+
+

Feuerwehr:

+ +
+ + + ABBRUCH +
+
+ + +{% endblock %} \ No newline at end of file diff --git a/leitstelle/urls.py b/leitstelle/urls.py index a7728ae..2e7dedc 100755 --- a/leitstelle/urls.py +++ b/leitstelle/urls.py @@ -5,4 +5,5 @@ from . import views urlpatterns = [ path("", views.index, name="leitstelle"), path("create/", views.create, name="create"), + path("wache_setzen/", views.setStation, name="setStation"), ] \ No newline at end of file diff --git a/leitstelle/views.py b/leitstelle/views.py index 8f1cae9..f2116c3 100755 --- a/leitstelle/views.py +++ b/leitstelle/views.py @@ -1,8 +1,15 @@ from django.shortcuts import render +from main.models import alarmierung_SW, fahrzeug, leitstelle # Create your views here. def index(request): return render(request, 'leitstelle/index.html') def create(request): - return render(request, 'leitstelle/create.html') \ No newline at end of file + sw_request = alarmierung_SW.objects.all().values_list() + fz_request = fahrzeug.objects.all().order_by('Funkrufname').values_list() + return render(request, 'leitstelle/create.html', {'sw':sw_request, 'fz':fz_request}) + +def setStation(request): + feuwehr_request = leitstelle.objects.all().order_by('name').values_list() + return render(request, 'leitstelle/setStation.html', {'fw':feuwehr_request}) \ No newline at end of file diff --git a/main/admin.py b/main/admin.py index 2ff64b7..3ba52d6 100755 --- a/main/admin.py +++ b/main/admin.py @@ -1,9 +1,10 @@ from django.contrib import admin -from .models import hours +from .models import * # Register your models here. - -class HoursAdmin(admin.ModelAdmin): - list_display = ("user", "date", "hours", "minutes", "is_ldc", "is_geplant") -admin.site.register(hours, HoursAdmin) +admin.site.register(fahrzeug) +admin.site.register(alarmierung_SW) +admin.site.register(alarmierung) +admin.site.register(feuerwehr) +admin.site.register(leitstelle) \ No newline at end of file diff --git a/main/models.py b/main/models.py index 750c3f5..3b2f353 100755 --- a/main/models.py +++ b/main/models.py @@ -1,11 +1,44 @@ from django.db import models from django.contrib.auth.models import User -# Create your models here. -class hours(models.Model): - user = models.ForeignKey(User, on_delete=models.CASCADE, null=True) - date = models.DateField(auto_now_add=False) - is_ldc = models.BooleanField(default=False) - is_geplant = models.BooleanField(default=False) - hours = models.IntegerField(auto_created=False, default=0) - minutes = models.IntegerField(auto_created=False, default=0) \ No newline at end of file + +# FEUERWEHR +class feuerwehr(models.Model): + name = models.CharField(max_length=50) + + def __str__(self): + return self.name + +# FAHRZEUGE +class fahrzeug(models.Model): + fw = models.ForeignKey(feuerwehr, on_delete=models.CASCADE, name="Standort", null=True) + kürzel = models.CharField(max_length=50, name="kürzel", default="") + fn = models.CharField(max_length=20, name="Funkrufname", default="") + + def __str__(self): + return self.Standort.name + " -- " + str(self.Funkrufname) + " -- " + str(self.kürzel) + +# STICHWORT +class alarmierung_SW(models.Model): + kürzel = models.CharField(max_length=20) + beschreibung = models.CharField(max_length=50) + + def __str__(self): + return self.kürzel + " -- " + str(self.beschreibung) + +# ALARMIERUNG +class alarmierung(models.Model): + timestamp = models.DateTimeField(auto_created=True) + sw = models.ForeignKey(alarmierung_SW, on_delete=models.CASCADE, name="Stichwort") + ft = models.CharField(max_length=100, null=True) + fz = models.CharField(max_length=100, null=True) + fw = models.ForeignKey(feuerwehr, on_delete=models.CASCADE, name="Standort") + + def __str__(self): + return str(self.timestamp) + " -- " + str(self.Stichwort.kürzel) + " -- " + str(self.ft) + " -- " + str(self.fz) + " -- " + str(self.Standort.name) + +class leitstelle(models.Model): + name = models.CharField(max_length=50) + fw = models.CharField(max_length=150) + def __str__(self): + return self.name \ No newline at end of file diff --git a/main/static/css/styles.css b/main/static/css/styles.css index abd5674..fca7d57 100755 --- a/main/static/css/styles.css +++ b/main/static/css/styles.css @@ -33,4 +33,4 @@ img.pb { .form-control { height: 2.5rem; -} \ No newline at end of file +} diff --git a/main/templates/main/base.html b/main/templates/main/base.html index 385b6f3..a5a7c00 100755 --- a/main/templates/main/base.html +++ b/main/templates/main/base.html @@ -13,6 +13,7 @@ + EmergencyControlCenter - Index @@ -23,8 +24,8 @@ {% include "main/header.html" %} - {% block content %} - {% endblock %} + {% block content %} + {% endblock %}
diff --git a/main/templates/main/header.html b/main/templates/main/header.html index f7c9921..c35fda1 100755 --- a/main/templates/main/header.html +++ b/main/templates/main/header.html @@ -1,7 +1,7 @@ {% load static %}
-
+