From a38e6e682ee1a712b1874c6eb292a077c2270ae1 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Wed, 23 Sep 2020 12:26:41 +0200 Subject: [PATCH] =?UTF-8?q?Bugs=20und=20Zeiterfassung=20=C3=9Cbersicht=20T?= =?UTF-8?q?eil=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/dasettings/user_content.html | 8 +- news/models.py | 2 +- news/templates/news/news_addnews.html | 6 +- news/templates/news/news_management.html | 6 +- news/templates/news/news_management_SAVE.html | 68 - news/urls.py | 2 + news/views.py | 13 +- .../__pycache__/counter_tag.cpython-38.pyc | Bin 16270 -> 16253 bytes standards/templatetags/counter_tag.py | 2 - .../timemanagement/rendered_table.html | 6 +- .../timemanagement_management.html | 399 +- .../timemanagement_overview.html | 1 + .../timemanagement_singleview.html | 324 + .../timemanagement_teamview.html | 72 + .../timemanagement/tm_ab_management.html | 11 +- timemanagement/views.py | 12 +- users/static/users/css/bs4_summernote.css | 291 + users/static/users/css/datatables_bs4.css | 1 + users/static/users/css/font/summernote.eot | Bin 0 -> 12072 bytes users/static/users/css/font/summernote.ttf | Bin 0 -> 11896 bytes users/static/users/css/font/summernote.woff | Bin 0 -> 7428 bytes users/static/users/css/font/summernote.woff2 | Bin 0 -> 6156 bytes users/static/users/css/google_font.css | 560 + users/static/users/css/google_swap.css | 63 + users/static/users/css/jquery_datatables.css | 1 + users/static/users/js/bs4_dt.js | 11 + users/static/users/js/bs4_summernote.js | 10137 +++++++++++++++ users/static/users/js/jquery.js | 10598 ++++++++++++++++ .../static/users/js/jquery_dataTables.min.js | 180 + users/static/users/js/jquery_ui_min.js | 13 + users/static/users/js/summernote-bs4.js.map | 1 + users/templates/users/base.html | 84 +- users/templates/users/dashboard.html | 71 +- users/views.py | 14 +- 34 files changed, 22497 insertions(+), 460 deletions(-) delete mode 100644 news/templates/news/news_management_SAVE.html create mode 100644 timemanagement/templates/timemanagement/timemanagement_overview.html create mode 100644 timemanagement/templates/timemanagement/timemanagement_singleview.html create mode 100644 timemanagement/templates/timemanagement/timemanagement_teamview.html create mode 100644 users/static/users/css/bs4_summernote.css create mode 100644 users/static/users/css/datatables_bs4.css create mode 100644 users/static/users/css/font/summernote.eot create mode 100644 users/static/users/css/font/summernote.ttf create mode 100644 users/static/users/css/font/summernote.woff create mode 100644 users/static/users/css/font/summernote.woff2 create mode 100644 users/static/users/css/google_font.css create mode 100644 users/static/users/css/google_swap.css create mode 100644 users/static/users/css/jquery_datatables.css create mode 100644 users/static/users/js/bs4_dt.js create mode 100644 users/static/users/js/bs4_summernote.js create mode 100644 users/static/users/js/jquery.js create mode 100644 users/static/users/js/jquery_dataTables.min.js create mode 100644 users/static/users/js/jquery_ui_min.js create mode 100644 users/static/users/js/summernote-bs4.js.map diff --git a/dasettings/templates/dasettings/user_content.html b/dasettings/templates/dasettings/user_content.html index 69b27ec..32a644d 100644 --- a/dasettings/templates/dasettings/user_content.html +++ b/dasettings/templates/dasettings/user_content.html @@ -10,8 +10,8 @@ Nachname E-Mail Agenturfunktion - Gleitzeit - Letzter Login + Tätigkeit Telefon Mobil @@ -25,7 +25,7 @@ {{ item.last_name }} {{ item.email }} {% if item.profile.func == None %}-{%else%}{{ item.profile.func }}{%endif%} - + {{ item.profile.compfunc }} {{ item.profile.phoneland }} {{ item.profile.phonemobile }} diff --git a/news/models.py b/news/models.py index 32408ff..c73ca76 100644 --- a/news/models.py +++ b/news/models.py @@ -19,7 +19,7 @@ class News(models.Model): go_online_on = models.DateTimeField(default=timezone.now, blank=True) # Default date plus two weeks - go_offline_on = models.DateTimeField(default=timezone.now, blank=True, null=True) + go_offline_on = models.DateTimeField(default=None, blank=True, null=True) last_modified_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='news_mod_by', default=None) last_modified_on = models.DateTimeField(default=timezone.now, blank=True) diff --git a/news/templates/news/news_addnews.html b/news/templates/news/news_addnews.html index dab28cd..a9e6ed9 100644 --- a/news/templates/news/news_addnews.html +++ b/news/templates/news/news_addnews.html @@ -25,9 +25,9 @@ $(document).ready(function() { }); //Set offline-Datei plus 2 weeks - today = new Date(); - today = new Date(today.setDate(today.getDate() + 14)); - $("#id_go_offline_on").data("DateTimePicker").date(today); + //today = new Date(); + //today = new Date(today.setDate(today.getDate() + 14)); + //$("#id_go_offline_on").data("DateTimePicker").date(today); }); diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 50e8c79..491bc8d 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -53,13 +53,17 @@ {{news_single.name }} {{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }} {{ news_single.created_date }} - {{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} + {{ news_single.go_online_on|date:"d.m.Y, H:i"}} {% if news_single.go_offline_on != None %} bis {% endif %} {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} {% if news_single.created_by == request.user or perms.users.news_management %}   + + + +   diff --git a/news/templates/news/news_management_SAVE.html b/news/templates/news/news_management_SAVE.html deleted file mode 100644 index d7a72a9..0000000 --- a/news/templates/news/news_management_SAVE.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends "users/base.html" %} -{% block content %} -
-

News

-
-

- Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden. -

-
-
- News anlegen -
-
-
-
-
- -
-
- - - - - - - - - - - - {% for news_single in news %} - - - - - - - - {% endfor %} - -
TitelErstellt vonErstellt amSichtbar von/bis 
{{news_single.name }}{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}{{ news_single.created_date }}{{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} - {% if news_single.created_by == request.user or perms.users.news_management %} -
- -
- Bearbeiten -
- Löschen -
-
- {% endif %} - -
-
-
- -{% endblock content %} diff --git a/news/urls.py b/news/urls.py index 9cbd455..13be753 100644 --- a/news/urls.py +++ b/news/urls.py @@ -14,6 +14,8 @@ urlpatterns = [ #path('ajax/loadtasks/', views.load_tasks, name='ajax_loadtasks'), #path('standard//changestat', views.StandardChangePublic, name="standard-status"), path('news//single', views.NewsSingle, name="news-single"), + path('newsga/', permission_required('users.modulenews')(views.NewsGoToArchiv), name="news-gotoarchiv"), + #path('standard//area', views.StandardArea, name="standard-area"), #path('standard//task', views.StandardTask, name="standard-task") ] diff --git a/news/views.py b/news/views.py index 40b52e0..40264fc 100644 --- a/news/views.py +++ b/news/views.py @@ -18,7 +18,8 @@ class NewsManagement(LoginRequiredMixin, ListView): # Change context and return for template-data def get_context_data(self, **kwargs): filterdate = timezone.now() - news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') + news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') | News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__isnull=True).order_by('-created_date') + news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date') news_coming = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__gt=filterdate).order_by('-created_date') @@ -74,6 +75,16 @@ def NewsAdd(request): } return render(request, 'news/news_addnews.html', context) +@login_required +def NewsGoToArchiv(request, pk): + + news = News.objects.get(pk=pk) + news.go_offline_on = timezone.now() + news.save() + + + return redirect("news-management") + @login_required def NewsUpdate(request, id): news = News.objects.get(pk=id, agency=request.user.profile.agency) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index f6b959aeeba96f5a0a6ef48c145d7640802e12a6..2204fa233deff57331585618ef7c347bc3705e39 100644 GIT binary patch delta 751 zcmYL`Ur5tY6vuad`|am%bH5GQaBVPZVyrDUSFZi>Hw)^aUW$lB`U7D&D#8iZdPyjv zUVKQ%^AhyZL)1e-+0R@SSt#bj=wYm^S&}8_m|#5w3!HY(7#p1J}w| zm3Boj>G(?2Up!+NQu@4bTI=_o0$kbgM=!G&dO{6iH#cCN|A^f}RzU<4oE1KR10tclDeq!&i6xeRdZ}t?;AcH8dX)P4I z3DOLC-fJ(L%>auy74kwBS3^U#@@9chFPNwxr)j$!0BM}ry$Ut>swKb+3N0DWJUwxr z!)M3~m%7*|F7rl~?C!jf>Pj;91+!rv1aU3whGosQ=LYycQ^`ld9gZa)mBnWH#ylK8 zV1uOdI2CD>=16|U-;oB-H?Nm?UHf(}XM`M_43O{-;Q)L|7xN6E+As UK4b=f>jnp2**gohcx+$dA8okNRsaA1 delta 745 zcmYL`Ur1A77{>RWoz1hkql*n|;gp%NwzgVoJ9C>wUDTCPkU<57u^|R7`C1SZh1gA9 z81)iF&_x#Xhlu3hCc6=_e@b;DE}Ldqn&<|LBEn$V_pZAR@}2WDGyOiDAw2@KDAk~ z%5$b{fFB&upJJ`CwkS*D9Zw59$6p>h3}d#|j&wONZ`6ldO#ojp;d8S%PRq)LNHQbTqa6$NtYq@sm2i~Rf`qdR3uLIU%FYtV^ZjS4JbPqiJ>jr(B{ok2hR z#$&-|xQdU1HYgOQ)TFoJk6^&u%crz@;TphD$Pa(8pj(GmLgnTMt7Q=wP`MJn>7)`? zMLqu+b0JxNLPoy%;Fy5=a2BT2?_mQR>L*`{Fi03CydaDaMhRntal#y-co{iTON0Vp VnV{jr 0): returnstat = list(absencedays)[0] - print(absencedays) - return returnstat @register.simple_tag diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html index 552348a..2b8c551 100644 --- a/timemanagement/templates/timemanagement/rendered_table.html +++ b/timemanagement/templates/timemanagement/rendered_table.html @@ -226,7 +226,7 @@
-{% if user|usergperm:"absencemanager" %} +{% if user|usergperm:"absencemanager" %}