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. -

-
- -
-
-
-
- -
-
- - - - - - - - - - - - {% 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 %} - - {% 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 f6b959a..2204fa2 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index b893c4e..82fc14e 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -435,8 +435,6 @@ def getabscenceday(loggeduser, user, daytocheck): if(len(absencedays) > 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" %}