首頁 探索 說明
註冊 登入
Rene
/
AD
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Formulare fertig, logo rein

root 7 月之前
父節點
ad1b576c45
當前提交
42bc558ea0
共有 6 個文件被更改，包括 91 次插入 和 12 次删除
統一視圖 顯示文件統計
  1. 二進制
      db.sqlite3
  2. 3 0
      main/forms.py
  3. 45 7
      templates/main/edit_shift.html
  4. 25 0
      templates/main/edit_shift1.html
  5. 1 1
      templates/main/home.html
  6. 17 4
      templates/main/ma_month.html

二進制
db.sqlite3
查看文件


+ 3 - 0
main/forms.py
查看文件 

@@ -32,6 +32,9 @@ class ShiftForm(forms.ModelForm):
 
         fields = ['date', 'start', 'end', 'shifttype', 'employee', 'info', 'shiftchef']
 
         fields = ['date', 'start', 'end', 'shifttype', 'employee', 'info', 'shiftchef']
 
 
 
 
 
+    start = forms.TimeField(required=False, widget=forms.TimeInput(format='%H:%M'))
 
+    end = forms.TimeField(required=False, widget=forms.TimeInput(format='%H:%M'))
 
+
 
 class EventForm(forms.ModelForm):
 
 class EventForm(forms.ModelForm):
 
     class Meta:
 
     class Meta:
 
         model = Event
 
         model = Event

+ 45 - 7
templates/main/edit_shift.html
查看文件 

@@ -11,14 +11,52 @@
 
         <h2>Schicht bearbeiten</h2>
 
         <h2>Schicht bearbeiten</h2>
 
         <form method="post">
 
         <form method="post">
 
             {% csrf_token %}
 
             {% csrf_token %}
 
-            {% bootstrap_form form %}
 
-            <button type="submit" class="btn btn-primary">Speichern</button>
 
-            <a href="{% url 'public' %}" class="btn btn-secondary">Abbrechen</a>
 
-        </form>
 
-        <form method="post" action="{% url 'delete_shift' pk=shift.id %}" class="mt-3">
 
-            {% csrf_token %}
 
-            <button type="submit" class="btn btn-danger">Löschen</button>
 
+            <table>
 
+              <tr >
 
+                <td></td>
 
+                <td></td>
 
+                <td></td>
 
+                <td></td>
 
+
 
+              </tr>
 
+              <tr >
 
+                <td><h5>Für Mitarbeiter:</h5></td>
 
+                <td>{{ form.employee }}</td>
 
+                <td>am <input type="hidden" name="date" value="{{ form.initial.date|date:'Y-m-d' }}" id="id_date"></td>
 
+                <td>{{ form.initial.date }}</td>
 
+
 
+              </tr>
 
+              <tr >
 
+                <td>Kommen</td>
 
+                <td>{{ form.start }}</td>
 
+                <td>Gehen</td>
 
+                <td>{{ form.end }}</td>
 
+
 
+              </tr>
 
+              <tr>
 
+                  <td>Sonderschicht</td>
 
+                  <td>{{ form.shifttype }}</td>
 
+                  <td></td>
 
+                  <td></td>
 
+              </tr>
 
+              <tr >
 
+                <td>Info:</td>
 
+                <td rowspan="2"><textarea name="info" cols="20" rows="5" id="id_info"></textarea></td>
 
+                <td></td>
 
+                <td><button type="submit" class="btn btn-primary">Schicht speichern</button></td>
 
+              </tr>
 
+              <tr >
 
+                <td></td>
 
+                <td></td>
 
+                <td><a href="{% url 'home' %}" class="btn btn-secondary">Abbrechen</a></td>
 
+                <td><form method="post" action="{% url 'delete_shift' pk=shift.id %}" class="mt-3">
 
+                         {% csrf_token %}
 
+                        <button type="submit" class="btn btn-danger">Löschen</button>
 
+                    </form></td>
 
+              </tr>
 
+            </table>
 
         </form>
 
         </form>
 
+
 
     </div>
 
     </div>
 
     {% bootstrap_javascript %}
 
     {% bootstrap_javascript %}
 
 </body>
 
 </body>

+ 25 - 0
templates/main/edit_shift1.html
查看文件 

@@ -0,0 +1,25 @@
 
+{% load bootstrap5 %}
 
+<!DOCTYPE html>
 
+<html lang="de">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title>Schicht bearbeiten</title>
 
+    {% bootstrap_css %}
 
+</head>
 
+<body>
 
+    <div class="container">
 
+        <h2>Schicht bearbeiten</h2>
 
+        <form method="post">
 
+            {% csrf_token %}
 
+            {% bootstrap_form form %}
 
+            <button type="submit" class="btn btn-primary">Speichern</button>
 
+            <a href="{% url 'home' %}" class="btn btn-secondary">Abbrechen</a>
 
+        </form>
 
+        <form method="post" action="{% url 'delete_shift' pk=shift.id %}" class="mt-3">
 
+            {% csrf_token %}
 
+            <button type="submit" class="btn btn-danger">Löschen</button>
 
+        </form>
 
+    </div>
 
+    {% bootstrap_javascript %}
 
+</body>
 
+</html>

+ 1 - 1
templates/main/home.html
查看文件 

@@ -212,7 +212,7 @@
 
                                             {% endif %}
 
                                             {% endif %}
 
                                     >
 
                                     >
 
                                             {% if shift.start and shift.end %}
 
                                             {% if shift.start and shift.end %}
 
-                                                {{ shift.start|time:"H:i" }} - {{ shift.end|time:"H:i" }}
 
+                                                {{ shift.start|time:"H:i" }} - {{ shift.end|time:"H:i" }} {% if shift.shifttype != "N" %} {{ shift.shifttype }} {% endif %} {% if shift.info %} ! {% endif %}
 
                                                 {% if shift.shiftchef  %}
 
                                                 {% if shift.shiftchef  %}
 
                                                     {{ shift.shiftchef }}
 
                                                     {{ shift.shiftchef }}
 
                                                 {% endif %}
 
                                                 {% endif %}

+ 17 - 4
templates/main/ma_month.html
查看文件 

@@ -5,13 +5,26 @@
 
     <meta charset="UTF-8">
 
     <meta charset="UTF-8">
 
     <title>Dienstplan</title>
 
     <title>Dienstplan</title>
 
     {% bootstrap_css %}
 
     {% bootstrap_css %}
 
+    <style>
 
+    .alnright { text-align: right; }
 
+    </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
     <div class="container">
 
     <div class="container">
 
-        <h2>Dienstplan für {{ monat }} - {{ jahr }}
 
-</h2>
 
-        <h3>Mitarbeiter: {{ mitarbeiter.name }}
 
-</h3>
 
+        <table width=100%>
 
+            <tr>
 
+                <td width=30%><h2>Dienstplan für {{ monat }} - {{ jahr }}</h2></td>
 
+                <td width=30%></td>
 
+                <td width=30%><img src="https://brose-arena.de/wp-content/plugins/custom-functionality/assets/images/logo-brose-arena.svg" width="300" height="36.1" /></td>
 
+            </tr>
 
+            <tr>
 
+                <td><h3>Mitarbeiter: {{ mitarbeiter.name }}</h3></td>
 
+                <td></td>
 
+                <td></td>
 
+            </tr>
 
+        </table>
 
+
 
+
 
         {% if schichten %}
 
         {% if schichten %}
 
         <table class="table table-striped">
 
         <table class="table table-striped">
 
             <thead>
 
             <thead>