Fehler im Daily gefunden

adm/templates/adm/adm_user_single.html

@@ -323,10 +323,9 @@
   <div class="tab-pane fade" id="nav-logins" role="tabpanel" aria-labelledby="nav-logins-tab">
   	<br />
 	<h5>Logins (letzten 50)</h5>
-{% for ele in logdata reversed %}
+	{% for ele in logdata reversed %}
-	{{forloop.revcounter}}. {{ele|date:"d.m.Y, H:i"}}<br />
+		{{forloop.revcounter}}. {{ele|date:"d.m.Y, H:i"}}<br />
-{% endfor %}
+	{% endfor %}
-
 
   </div>
 </div>

timemanagement/templates/timemanagement/timemanagement_singleview.html

@@ -49,6 +49,15 @@
               style="background-color: #d3d3d3;"
             {% elif abday != False %}
               style="background-color: {{abday.reason.color}}; color: #ffffff"
+            {% else %}
+                {% for workday in workdays %}
+                  {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                      {% getWorkDayHistory workday as wd_history %}
+                      {% if wd_history.history_user != None %}
+                        style="background-color: #fdcc98;"
+                      {% endif %}
+                  {% endif %}
+                {% endfor %}
             {% endif %}>
             <td>
              {{da|date:"l"}}
@@ -330,6 +339,32 @@
 
                 {% counterWDUp %}
 
+                 {% getWorkDayHistory workday as wd_history %}
+
+                  {% if wd_history.history_user != None %}
+                    
+                    <a href="#/" onclick="javascript:$('#wd_history_{{workday.pk}}').modal('toggle');"><i class="fas fa-cog"></i></a>
+                    <div class="modal fade" id="wd_history_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
+                      <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                          <div class="modal-header">
+                            <h5 class="modal-title">Manuelle Änderung vom {{workday.start|date:"d.m.Y"}}</h5>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                              <span aria-hidden="true">&times;</span>
+                            </button>
+                          </div>
+                          <div class="modal-body" style="text-align: left;">
+                            <p>Geändert am {{wd_history.history_date|date:"d.m.Y, H:i"}} von {{wd_history.history_user.first_name}} {{wd_history.history_user.last_name}}</p>
+                          </div>
+                          <div class="modal-footer">
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  {% endif %}
+                
+
                   {% if workday.freefield != "" %}
                     
                     <a href="#/" onclick="javascript:$('#wd_freefield_{{workday.pk}}').modal('toggle');"><i class="fas fa-eye"></i></a>

timemanagement/templates/timemanagement/timemanagement_teamview_single.html

@@ -330,7 +330,6 @@
                 <br />
                 {% endif %}
 
-
                 {% counterWDUp %}
                 {% getWorkDayHistory workday as wd_history %}
 

users/views.py

@@ -1515,7 +1515,7 @@ def cronactionsdaily(request, code):
 					try:
 						workdays = Workday.objects.filter(user=user, end=None)
 						for wd in workdays:
-							mailstatus += "\n WORKDAY AUTEND ID " + wd.pk
+							mailstatus += "\n WORKDAY AUTEND ID " + str(wd.pk)
 							wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59)
 							wd.save()
 					except:
@@ -1585,6 +1585,7 @@ def cronactionsdaily(request, code):
 	    mailstatus,
 	    'noreply@digitale-agentur.com',
 	    ["htrampe@gmail.com", "info@digitale-agentur.com"],
+	    #["htrampe@gmail.com"],
 	    fail_silently=True,
 	)