Bugs gefixed, Zeiterfassung vorbereitet

dasettings/forms.py

@@ -288,8 +288,8 @@ class UserTimeForm(forms.ModelForm):
 		self.fields['startdate'].required = True
 		self.fields['usetime_start'].required = False
 		self.fields['usetime'].required = False
-		self.fields['usetime'].widget.attrs['readonly'] = True
+		#self.fields['usetime'].widget.attrs['readonly'] = True
-		self.fields['usetime_start'].widget.attrs['readonly'] = True
+		#self.fields['usetime_start'].widget.attrs['readonly'] = True
 
 
 # PERMISSION GROUPS FORM
@@ -407,4 +407,3 @@ class AbsenceReasonForm(forms.ModelForm):
 			"is_holiday" : "Geht vom Urlaub ab"
 		}
 		fields = ["name", "need_confirm", "need_rep", "is_holiday", "rgb_color"]
-

dasettings/templates/dasettings/notifications_content.html

@@ -8,7 +8,7 @@
     <div class="card-header" id="notification_standards_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_standards" aria-expanded="true" aria-controls="notification_standards">
-          Standards
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Standards
         </button>
       </h5>
     </div>
@@ -45,7 +45,7 @@
     <div class="card-header" id="notification_news_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_news" aria-expanded="true" aria-controls="notification_news">
-          News
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;News
         </button>
       </h5>
     </div>
@@ -83,7 +83,7 @@
     <div class="card-header" id="notification_groups_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_groups" aria-expanded="true" aria-controls="notification_groups">
-          Gruppen
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Gruppen
         </button>
       </h5>
     </div>
@@ -120,7 +120,7 @@
     <div class="card-header" id="notification_task_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_task" aria-expanded="true" aria-controls="notification_task">
-          Tätigkeiten
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Tätigkeiten
         </button>
       </h5>
     </div>
@@ -159,7 +159,7 @@
     <div class="card-header" id="notification_files_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_files" aria-expanded="true" aria-controls="notification_files">
-          Dateien und Ordner
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Dateien und Ordner
         </button>
       </h5>
     </div>
@@ -196,7 +196,7 @@
     <div class="card-header" id="notification_organizer_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_organizer" aria-expanded="true" aria-controls="notification_organizer">
-          Organizer
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Organizer
         </button>
       </h5>
     </div>
@@ -233,7 +233,7 @@
     <div class="card-header" id="notification_messages_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_messages" aria-expanded="true" aria-controls="notification_messages">
-          Mitteilungen
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Mitteilungen
         </button>
       </h5>
     </div>
@@ -270,7 +270,7 @@
     <div class="card-header" id="notification_chat_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_chat" aria-expanded="true" aria-controls="notification_chat">
-          Chat
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Chat
         </button>
       </h5>
     </div>
@@ -307,7 +307,7 @@
     <div class="card-header" id="notification_abtime_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_abtime" aria-expanded="true" aria-controls="notification_abtime">
-          Abwesenheits- und Zeiterfassung
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Abwesenheits- und Zeiterfassung
         </button>
       </h5>
     </div>
@@ -345,7 +345,7 @@
     <div class="card-header" id="notification_agn_acc">
       <h5 class="mb-0">
         <button class="btn btn-link" data-toggle="collapse" data-target="#notification_agn" aria-expanded="true" aria-controls="notification_agn">
-          Agenturverbund
+          <i class="fas fa-chevron-down"></i>&nbsp;&nbsp;&nbsp;Agenturverbund
         </button>
       </h5>
     </div>

dasettings/templates/dasettings/user_usprof.html

@@ -173,13 +173,13 @@
             {{usertime_form.usetime_start|as_crispy_field}}
           </div>
         </div>
-
+        <!--
         <script type="text/javascript">
           $(document).ready(function(){
             $("#id_usetime").prop("disabled", true);
           })
         </script>
-
+        -->
 
         <h5>Arbeitszeiten&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, an welchen Tagen dieser Mitarbeiter wie viele Stunden arbeitet." class="far fa-question-circle"></i></small></h5>
         <div class="table-responsive">

timemanagement/templates/timemanagement/rendered_confirmform.html

@@ -10,6 +10,7 @@
 Von: {{absence.start|date:"d.m Y"}}<br />
 Bis: {{absence.end|date:"d.m Y"}}<br />
 Grund: {{absence.reason.name}}<br />
+Vertreter: {{absence.representator.first_name}} {{absence.representator.last_name}}<br />
 Informationen: {{absence.info}}<br />
 <hr>
 <h5>Übersicht Urlaubstage wenn Anfrage genehmigt</h5>

timemanagement/templates/timemanagement/tm_ab_all.html

@@ -23,9 +23,10 @@
              <td>{{abday.reason.name}}</td>
              <td>{{abday.info}}</td>
              <td>{% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %}</td>
-             <td style="float: right;">
+             <td style="float: right !important; min-width: 100%">
-              <button type="button " class="btn btn-secondary btn-sm mr-1" onclick="javascript:changeAbsence({{abday.pk}})"><i class="fas fa-pen"></i></button>
+              <button type="button" style="float: right; margin-left: 2px;" class="btn btn-secondary btn-sm" onclick="javascript:$('#confirm-delete_{{abday.pk}}').modal('toggle')"><i class="fas fa-trash"></i></button>
-              <button type="button " class="btn btn-secondary btn-sm" onclick="javascript:$('#confirm-delete_{{abday.pk}}').modal('toggle')"><i class="fas fa-trash"></i></button>
+              <button type="button " style="float: right" class="btn btn-secondary btn-sm mr-1" onclick="javascript:changeAbsence({{abday.pk}})"><i class="fas fa-pen"></i></button>
+              
              </td>
           </tr>
         {% endfor %}