From 401fd60ca49e734f14a2ba1a8dbb1921dd911b2a Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 18 Oct 2021 07:01:36 +0200 Subject: [PATCH 01/11] Umbau auf NC als neuer Branch --- README.md | 4 +- adm/forms.py | 5 +- adm/templates/adm/adm_base.html | 35 +- adm/templates/adm/adm_import_flow.html | 264 +++++++ adm/templates/adm/adm_import_overview.html | 58 ++ adm/templates/adm/adm_tmworkday.html | 58 -- adm/templates/adm/adm_user_single.html | 14 - .../__pycache__/__init__.cpython-38.pyc | Bin 181 -> 174 bytes .../__pycache__/adm_tags.cpython-38.pyc | Bin 2657 -> 2650 bytes adm/urls.py | 5 +- adm/views.py | 94 ++- api/urls.py | 21 + api/views.py | 692 +++++++++++++++++- chat/views.py | 8 +- cloud/views.py | 11 +- .../templates/dasettings/groups_content.html | 38 +- .../templates/dasettings/moduls_content.html | 8 +- .../dasettings/moduls_content_SAVE.html | 82 +++ dasettings/templates/dasettings/settings.html | 22 +- .../dasettings/user_newuser_step1.html | 16 +- .../templates/dasettings/user_usprof.html | 4 +- dasettings/views.py | 170 ++++- digitaleagentur/asgi.py | 10 +- digitaleagentur/routing.py | 6 +- digitaleagentur/settings.py | 47 +- digitaleagentur/utils.py | 94 ++- firstrun.py | 3 - news/urls.py | 2 +- news/views.py | 7 +- recoverdir/views.py | 124 ++-- requirements.txt | 3 + standards/models.py | 9 +- standards/templates/standards/jscode_icon.js | 15 + .../templates/standards/standards_add.html | 44 +- .../templates/standards/standards_single.html | 17 +- .../standards/standards_single_agn.html | 7 +- .../__pycache__/__init__.cpython-38.pyc | Bin 187 -> 180 bytes .../__pycache__/counter_tag.cpython-38.pyc | Bin 25583 -> 27113 bytes standards/templatetags/counter_tag.py | 86 ++- standards/urls.py | 4 +- standards/views.py | 212 ++++-- .../realtime_dropdown_nc_iframe.html | 337 +++++++++ .../timemanagement/rendered_table.html | 5 +- .../timemanagement/tm_ab_management.html | 6 +- .../timemanagement/tm_ab_update.html | 6 +- timemanagement/urls.py | 4 +- timemanagement/views.py | 13 +- users/admin.py | 8 +- ...inwebsocket.py => mainwebsocket.py_DELETE} | 3 +- users/middleware/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc | Bin 0 -> 174 bytes .../__pycache__/oauth.cpython-38.pyc | Bin 0 -> 3569 bytes users/middleware/oauth.py | 116 +++ users/models.py | 14 +- users/routing.py | 4 +- users/signals.py | 111 +-- users/static/users/css/custom.css | 1 - users/static/users/js/nc_js.js | 38 + users/templates/users/base.html | 414 ++--------- users/templates/users/dashboard.html | 2 - users/templates/users/login.html | 66 +- users/templates/users/login.html_SAVE | 56 ++ users/templates/users/nclog.html | 1 + users/templates/users/password_reset.html | 33 +- .../templates/users/password_reset.html_SAVE | 25 + users/templates/users/register.html | 75 +- users/templates/users/register.html_SAVE | 67 ++ users/templates/users/registercomplete.html | 32 +- .../users/registercomplete.html_SAVE | 24 + users/urls.py | 13 +- users/views.py | 244 ++++-- 71 files changed, 2988 insertions(+), 1029 deletions(-) create mode 100644 adm/templates/adm/adm_import_flow.html create mode 100644 adm/templates/adm/adm_import_overview.html delete mode 100644 adm/templates/adm/adm_tmworkday.html create mode 100644 dasettings/templates/dasettings/moduls_content_SAVE.html create mode 100644 standards/templates/standards/jscode_icon.js create mode 100644 timemanagement/templates/timemanagement/realtime_dropdown_nc_iframe.html rename users/{mainwebsocket.py => mainwebsocket.py_DELETE} (99%) create mode 100644 users/middleware/__init__.py create mode 100644 users/middleware/__pycache__/__init__.cpython-38.pyc create mode 100644 users/middleware/__pycache__/oauth.cpython-38.pyc create mode 100644 users/middleware/oauth.py create mode 100644 users/static/users/js/nc_js.js create mode 100644 users/templates/users/login.html_SAVE create mode 100644 users/templates/users/nclog.html create mode 100644 users/templates/users/password_reset.html_SAVE create mode 100644 users/templates/users/register.html_SAVE create mode 100644 users/templates/users/registercomplete.html_SAVE diff --git a/README.md b/README.md index ce61565..08d67af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ digitale agentur - README -Quellcode für Prod aktuell - -Aktuelle Version für die Prod! \ No newline at end of file +Agenturstand zur Migration in Nextcloud. \ No newline at end of file diff --git a/adm/forms.py b/adm/forms.py index 2f245a7..aeacad6 100644 --- a/adm/forms.py +++ b/adm/forms.py @@ -22,12 +22,11 @@ class AdmWorkdayForm(forms.ModelForm): "start" : "Start", "end" : "Ende", "target" : "Zielarbeitszeit", - "freefield" : "Notiz", - "delflag" : "Nicht berücksichtigen (delflag)" + "freefield" : "Notiz" } fields = [ - "start", "end", "target", "freefield", "delflag" + "start", "end", "target", "freefield" ] widgets = { 'start': DatePickerInput(options={"format":'DD.MM.YYYY HH:mm', "locale":'de'}), diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html index c5a6dc8..00941bd 100644 --- a/adm/templates/adm/adm_base.html +++ b/adm/templates/adm/adm_base.html @@ -97,6 +97,16 @@ Agenturen + {% if active_link == 'adm-import' %} +
  • + {% else %} +
  • + {%endif%} + + + Import +
    • + {% if active_link == 'adm-bills' %}
  • {% else %} @@ -118,17 +128,6 @@ Benutzer
    • - - {% if active_link == 'adm-tm-wd-bug' %} -
  • - {% else %} -
  • - {%endif%} - - - TM-WD-Bug -
    • -
  • @@ -296,7 +295,7 @@
    -
    +
    {% if messages %} {% for message in messages %} @@ -543,7 +542,7 @@ function removeNotification(notifyid){ } - +/* $(document).on('click', function (e) { if(e.target["id"] != 'chatButton'){ @@ -551,13 +550,13 @@ $(document).on('click', function (e) { $("#chat_alluserscontent").fadeOut(); } } -}); +});*/ diff --git a/adm/templates/adm/adm_import_flow.html b/adm/templates/adm/adm_import_flow.html new file mode 100644 index 0000000..9c52961 --- /dev/null +++ b/adm/templates/adm/adm_import_flow.html @@ -0,0 +1,264 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +
    +

    Agenturimport der Agentur {{agency.name}}

    + Die Seite nicht verlassen oder neu laden! +
    +
    +
    Es werden {{groups|length}} Gruppen angelegt...
    +
    + + + + + + + +
    + + +
    +{% endblock content %} \ No newline at end of file diff --git a/adm/templates/adm/adm_import_overview.html b/adm/templates/adm/adm_import_overview.html new file mode 100644 index 0000000..b9b639f --- /dev/null +++ b/adm/templates/adm/adm_import_overview.html @@ -0,0 +1,58 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +
    +

    Agenturimport

    + Agenturen können hier importiert werden und erhalten einen detallierten Bericht. Bereits importierte Agenturen speichern ihre MainGroupID in Nextcloud +
    + + + + + + + + + + {% for ele in agencys %} + + + + + + {% endfor %} + +
    AgenturnameImportierstatus 
    {{ele.name}} + {% if ele.importid|length == 0 %} + Agentur jetzt zu Nextcloud migrieren + {% else %} + Agentur importiert + {% endif %} +
    +
    + +
    +{% endblock content %} \ No newline at end of file diff --git a/adm/templates/adm/adm_tmworkday.html b/adm/templates/adm/adm_tmworkday.html deleted file mode 100644 index 6ccdca5..0000000 --- a/adm/templates/adm/adm_tmworkday.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "adm/adm_base.html" %} -{% block content %} -{% load adm_tags %} -{% load mathfilters %} -{% load humanize %} -{% load counter_tag %} -
    -

    Übersicht Arbeitstag und Abwesenheit -

    - - - - - - - - - - {% for user in users %} - {% getADMAbsenceWorkdays user as workdays %} - {% getADMAbsenceWorkdaysTrue user as workdaystrue %} - - - - - - {% endfor %} - -
    NameRelevante Arbeitstage OHNE FLAGRelevante Arbeitstage MIT FLAG
    {{user.username}} - {% for wd in workdays %} {{wd.pk}}, {% endfor %} - - {% for wd in workdaystrue %} {{wd.pk}}, {% endfor %} -
    - -{% endblock content %} \ No newline at end of file diff --git a/adm/templates/adm/adm_user_single.html b/adm/templates/adm/adm_user_single.html index 0ea944c..277139c 100644 --- a/adm/templates/adm/adm_user_single.html +++ b/adm/templates/adm/adm_user_single.html @@ -1,6 +1,5 @@ {% extends "adm/adm_base.html" %} {% block content %} -{% load counter_tag %} {% load adm_tags %}
    @@ -23,19 +22,6 @@ Letzter Login {{userdata.last_login|default:"-"}} - {% if userdata.usertime.usetime %} - - Gleitzeitkonto: - - {% loadaccounttime userdata as actualaccounttime %} - {% if actualaccounttime.1 == 0 %} - +{{actualaccounttime.0}} Stunden - {% else %} - -{{actualaccounttime.0}} Stunden - {% endif %} - - - {% endif %}
    diff --git a/adm/templatetags/__pycache__/__init__.cpython-38.pyc b/adm/templatetags/__pycache__/__init__.cpython-38.pyc index c26aaa9bba48ff037fe51024bb841872a29e9285..b23f1adf856d832b46b321cd9a84f1b5b604829e 100644 GIT binary patch delta 45 zcmdnWxQ>xKl$V!_0SKykeoo}JVGN$=p(>b}o>`KZlbV>GnpaX<6rYzovDE+oA0iHK delta 52 zcmZ3-xRsGRl$V!_0SFvz4^QN_VT_vSp(>FWpOTfBm!7Yml9`@al9-d4n4X$fQd%^z G&Hw;yXb?^S diff --git a/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc b/adm/templatetags/__pycache__/adm_tags.cpython-38.pyc index 78e81e7426ead986dd45cbdb75c46ac420b93580..95ab77e58a5fec36f4cce685910db4d6dfaf1a76 100644 GIT binary patch delta 165 zcmaDTa!Z6el$V!_0SKykes1IzV`dDVti-G;n3f%uCG4Eh@Ujo0yZ6m>yrAS(1^Mlz)o_NEF}VORXp=N-Ql- zElSQW%`3UZl$d^Nav6s$qsQbe92SgGlizY^14&6v1t4j~sR|?$IDLTRT24PUd!UPo KJSH=8B>(_gMK@9a delta 203 zcmca5@=%03l$V!_0SFvz4{ziaV`hw+ti-G;kr`KZlbV>GnpaX< zv^j$LG)RpKdmy9TnI##CN%>JMK%zK`FSVki zD6zCSwJ15iG_T|qQ(}751&O@79qt#nJExFj(zC9x=_ST8p}B{iqG rh#TmpA|4RI3nXq$Hs(|XDvspz0g}r&{n+e4QcjZ{StTY5ad`j$Gv+{` diff --git a/adm/urls.py b/adm/urls.py index b2d9a46..a87296b 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -10,6 +10,8 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie urlpatterns = [ path('', AdmMain.as_view(), name='adm-main'), path('ag/', AdmAgencys.as_view(), name="adm-agencys"), + path('import/', AdmImport.as_view(), name="adm-import"), + path('doimport/', AdmImportFlow.as_view(), name="adm-import-flow"), path('us/', AdmUsers.as_view(), name="adm-users"), path('agsingle/', AdmAgencySingle.as_view(), name="adm-agency-single"), path('ad/del/', delAgency.as_view(), name='adm-agency-delete'), @@ -23,5 +25,6 @@ urlpatterns = [ path('wd//delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"), path('wd/break//delete', AdmBreakDelete.as_view(), name="adm-break-delete"), path('wd//break/add', AdmAddBreak.as_view(), name="adm-break-add"), - path('tmbug/', AdmTmWorkdayColl.as_view(), name="adm-tm-wd-bug"), + # MIGRATION + path('mig/aggroupfolder/', createAgGroupFolder, name="mig-groupfolder"), ] diff --git a/adm/views.py b/adm/views.py index 42ef70a..29ad489 100644 --- a/adm/views.py +++ b/adm/views.py @@ -4,6 +4,7 @@ from django.shortcuts import render, redirect, reverse from django.urls import reverse_lazy from django.conf import settings from django.http import HttpResponseRedirect,HttpResponse, JsonResponse +from requests.api import head from .models import MainStatistic, MainSalesMonth from django.contrib.auth.models import User from chat.models import ChatMessage @@ -29,20 +30,6 @@ from django.template.loader import render_to_string from cloud.models import DataFile import math import requests -from digitaleagentur.timemanagement_utils import * - -# TODO: ADM-Oberfläche Auswertung machen, an welchen Tagen eines Mitarbeiters auch eine Abwesenheit - -class AdmTmWorkdayColl(TemplateView): - template_name = "adm/adm_tmworkday.html" - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context.update({'active_link' : "adm-tm-wd-bug"}) - - context.update({'users' : User.objects.all().order_by('username') }) - return context - ''' Prüfung, ob angemeldeter User Mitarbeiterstatus hat. IMMER PER DISPATCH EINBAUEN! ''' @@ -677,17 +664,94 @@ class AdmAddBreak(CreateView): return reverse('adm-workday-update', kwargs={'pk': self.kwargs['pk']}) +''' + IMPORT AGENCY +''' +class AdmImport(TemplateView): + template_name="adm/adm_import_overview.html" + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'adm-import'}) + context.update({'agencys' : Agency.objects.all()}) + return context +from django.contrib.auth.models import Group +from cloud.models import * +class AdmImportFlow(TemplateView): + template_name="adm/adm_import_flow.html" + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'adm-import'}) + agency = Agency.objects.get(pk=kwargs.get("pk")) + # Agency itself + context.update({'agency' : agency}) + # Users in that Agency + context.update({'users' : User.objects.filter(profile__agency=agency)}) + # DataFiles + normal_files = [] + for f in DataFile.objects.filter(agency=agency): + if(f.parent.name != "Standards Uploadbereich"): + normal_files.append(f) + + context.update({'files' : normal_files}) + + # DataDirs + context.update({'dirs' : DataDir.objects.filter(agency=agency).exclude(is_root=True)}) + + # Groups of the Agency + groups = Group.objects.all() + ag_pk = str(agency.pk) + ag_groups = [] + for g in groups: + if(ag_pk in g.name): + ag_groups.append(g) + context.update({'groups' : ag_groups}) + # Loading Standard-Files + standards = Standards.objects.filter(agency=agency) + standard_files = [] + for s in standards: + for f in s.addedfiles.all(): + if(f.parent.name == "Standards Uploadbereich"): + standard_files.append(f) + context.update({'standard_files' : standard_files}) + # Loading Standard-PKs + standard_pk = [] + for s in standards: + standard_pk.append(str(s.pk)) + context.update({'standard_pk' : standard_pk}) + + # LINK TO THE NC-INSTANCE + context.update({'nclink' : settings.NEXTCLOUD_URL}) + context.update({'ncid' : self.request.user.profile.nc_sid}) + context.update({'nc_url' : settings.NEXTCLOUD_URL}) + return context - +''' + Erstellt einen Gruppenordner +''' +def createAgGroupFolder(request, agencypk): + agency = Agency.objects.get(pk=agencypk) + data = { + "gid" : "agencymaingroupid_" + str(agency.pk), + "aid" : str(agency.pk), + } + + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/creategf?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + r_2 = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/Standards Uploadbereich', auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + json_response = json.loads(r.text) + response_status = json_response['ocs']['meta']['status'] + if(response_status == "ok"): + return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!'}) + else: + return JsonResponse({'status' : False, 'message': 'Konnte nicht angelegt werden!', 'errormessage_r' : r.text}) diff --git a/api/urls.py b/api/urls.py index 987d2ed..6c7d644 100644 --- a/api/urls.py +++ b/api/urls.py @@ -11,4 +11,25 @@ urlpatterns = [ path('getchatrooms/', views.getchatrooms, name='api-getchatrooms'), path('getsinglechat/', views.getsinglechat, name='api-getsinglechat'), path('chatnewmessage/', views.savenewchatmessage, name='api-savechatmessage'), + + # MIGRATION + path('migrateagencyusers/', views.migrateAgencyUsers, name="api-migrateagencyusers"), + path('addgroup/', views.NCAddGroup, name="apiaddgroup"), + path('adduser/', views.NCAddUser, name="apiadduser"), + path('addgf/', views.NCAddGroupFolder, name="apiaddgf"), + path('addfile/', views.NCAddFiles, name="apiaddfile"), + path('addstandardfile/', views.NCAddStandardFiles, name="apiaddstandardfile"), + path('adddir/', views.NCAddDirs, name="apiadddir"), + path('addswitchstandards/', views.NCSwitchStandardFiles, name="apiswitchstandards"), + + path('setlog/', views.SetUserData, name="apisetlog"), + # EXTERNAL FROM NC + path('logout/', views.apilogout, name="api-logout"), + path('uschanged//', views.userChangedInNc, name="api-userchanged"), + path('deletefile//', views.deleteNCFile, name="api-deletencfile"), + path('tm/startday//', views.startWorkDay, name="api-startday"), + path('tm/endday//', views.endWorkDay, name="api-endday"), + path('tm/startbreak//', views.startBreak, name="api-startbreak"), + path('tm/endbreak//', views.endBreak, name="api-endbreak"), + path('tm/gettime//', views.getTime, name="api-gettime"), ] \ No newline at end of file diff --git a/api/views.py b/api/views.py index a7037f8..51a9003 100644 --- a/api/views.py +++ b/api/views.py @@ -1,6 +1,9 @@ +from django.views.decorators.csrf import ensure_csrf_cookie +from cloud.models import DataFile, DataDir +from django.shortcuts import redirect from rest_framework.views import APIView from rest_framework.response import Response -from rest_framework.permissions import IsAuthenticated # <-- Here +#from rest_framework.permissions import IsAuthenticated # <-- Here import json from standards.models import Standards from rest_framework import serializers @@ -11,39 +14,44 @@ from rest_framework.authentication import SessionAuthentication, BasicAuthentica from rest_framework.decorators import authentication_classes from chat.models import ChatRoom, ChatMessage from django.http import HttpResponseRedirect,HttpResponse, JsonResponse - +from django.contrib.sessions.models import Session from timemanagement.models import Absence +from django.conf import settings +from digitaleagentur.utils import * +from timemanagement.models import Workday, FreeDays, Absence +from standards.models import Standards, NCFile +from users.models import AgencyGroup, Agency, AgencyNetwork, AgencyNetworkPreperation, UserTime, UserYearAbsenceInfo, AgencyBills +from standards.templatetags import * class GetUserId(APIView): - permission_classes = (IsAuthenticated,) # <-- And here + #permission_classes = (IsAuthenticated,) # <-- And here def post(self, request): return Response({"userid" : self.request.user.pk}) @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def getStandardList(request): standards = Standards.objects.filter(agency=request.user.profile.agency) ser = StandardsSerializer(standards, many=True) return Response(ser.data, status=status.HTTP_200_OK) @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def getSingleStandard(request, pk): standard = Standards.objects.get(pk=int(pk)) ser = StandardsSerializer(standard, many=False) return Response(ser.data, status=status.HTTP_200_OK) @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def logoutByToken(request): - print(request) request.user.auth_token.delete() return Response(status=status.HTTP_200_OK) @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def getchatrooms(request): chatrooms = ChatRoom.objects.filter(creator=request.user) | ChatRoom.objects.filter(chatmember_single=request.user) chatrooms_ser = ChatRoomSerializer(chatrooms, many=True) @@ -51,7 +59,7 @@ def getchatrooms(request): @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def getsinglechat(request, pk): chatroom = ChatRoom.objects.get(pk=pk) if chatroom.creator == request.user or chatroom.chatmember_single == request.user or (request.user in chatroom.chatmembers.all()): @@ -62,7 +70,7 @@ def getsinglechat(request, pk): @api_view(['POST', ]) -@permission_classes((IsAuthenticated,)) +#@permission_classes((IsAuthenticated,)) def savenewchatmessage(request): room = ChatRoom.objects.get(pk=request.POST["room"]) if(request.user == room.creator or request.user == room.chatmember_single): @@ -74,4 +82,668 @@ def savenewchatmessage(request): else: return Response(status=status.HTTP_403_FORBIDDEN) +# IMPORTED MODELS FOR MIGRATION +from users.models import Agency +from django.contrib.auth.models import User + +@api_view(['GET', ]) +def migrateAgencyUsers(request, pk): + datapackage = {} + Ag = Agency.objects.get(pk=pk) + for user in User.objects.filter(profile__agency=Ag): + if(len(user.email) > 0 and len(user.first_name) > 0 and len(user.last_name) > 0): + datapackage.update({str(user.pk) : {"userid" : user.email, "displayname" : user.first_name + " " + user.last_name}}) + return JsonResponse(datapackage) + + + + +@api_view(['GET', ]) +def apilogout(request, uid): + print("LOGOUT: " + str(uid)) + user = User.objects.get(username=uid) + user.profile.nc_sid = "" + user.save() + [s.delete() for s in Session.objects.all() if s.get_decoded().get('_auth_user_hash') == user.get_session_auth_hash()] + return JsonResponse({'res' : 'ok'}) + + +# This function change the Username of a user, when it was changed in NextCloud! Works only for the own user :) ! +import xmltodict, json, requests +@api_view(['GET'], ) +def userChangedInNc(request, uid, sid): + user = User.objects.get(username=uid) + print("SID: " + sid) + if(user.is_authenticated and getNCLoggedUserBySession(sid) == uid): + nc_login_headers = {'Authorization' : 'Bearer ' + sid} + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users/" + uid, headers=nc_login_headers) + xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) + final_json = json.loads(js) + new_displayname = final_json['ocs']['data']['displayname'].split(" ") + new_email = final_json['ocs']['data']['email'] + user.email = new_email + user.first_name = new_displayname[0] + new_last_name = "" + new_displayname.pop(0) + for ele in new_displayname: + new_last_name += " " + ele + user.last_name = new_last_name + user.save() + return JsonResponse({"status" : "ok!"}) + return JsonResponse({"status" : "NO AUTH"}) + +from requests.auth import HTTPBasicAuth +import random +import string +from django.contrib.auth.models import Group +from users.models import AgencyGroup + +def get_random_number(length = 6): + result_str = ''.join(random.choice("0123456789") for i in range(length)) + return result_str + +def get_random_password(length = 6): + result_str = ''.join(random.choice("!_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJLMNOPQRSTUVWXYZ0123456789") for i in range(length)) + return result_str + +# Returns a new groupID for NC by Groupname and Agency +def create_group_id(agencygroupname, agency): + newgroupid = "" + pregroupstr = "agencymaingroupid_" + if(agencygroupname == "Mitarbeiter"): + newgroupid = pregroupstr + str(agency.pk) + # NORMAL GROUOPS + elif(agencygroupname == "Administratoren"): + newgroupid = pregroupstr + str(agency.pk) + "_defaultadmingroup" + elif(agencygroupname == "Notfallhilfe"): + newgroupid = pregroupstr + str(agency.pk) + "_recover" + else: + newgroupid = pregroupstr + str(agency.pk) + "_subgroup_" + get_random_number() + return newgroupid + + +''' + Diese Methode erstellt die Gruppen in NC nach dem Schemata, wie sie auch bei einer Registrierung aufgebaut werden. + +''' +@api_view(['GET'], ) +def NCAddGroup(request): + if request.method == "GET": + + group = Group.objects.get(name=request.GET.get('groupid')) + aggroup = AgencyGroup.objects.get(group=group) + agency = aggroup.agency + newgroupid = create_group_id(aggroup.agencygroupname, agency) + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data = { + "groupid" : newgroupid + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/groups", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + r_status = json.loads(r.text) + if(r_status['ocs']['meta']['statuscode'] == 100): + # Group created, save new group id in Django + aggroup.nc_name = newgroupid + aggroup.save() + + # Group created, set display name in NC + data = { + "name": aggroup.agencygroupname, + "id" : newgroupid + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' erzeugt - ID: ' + newgroupid}) + elif(r_status['ocs']['meta']['statuscode'] == 102): + return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') existiert bereits. Wird übersprungen. Bitte Namen prüfen!'}) + else: + return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') konnte nicht erzeugt werden. Bitte manuell prüfen'}) + #except: + # return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') konnte nicht erzeugt werden. Bitte manuell prüfen' + r.text}) + return JsonResponse({"status" : "NO AUTH"}) + + +''' + Hier werden die Nutzer angelegt. +''' +@api_view(['GET'], ) +def NCAddUser(request): + if request.method == "GET": + agency = Agency.objects.get(pk=request.GET.get('agencyid')) + user = User.objects.get(pk=request.GET['userid']) + # Check, that only users in the same agency can do that! + if(user.profile.agency == agency): + # Load all groups the User is in and get AgencyGroup for NC-Group-Name + groups = [] + for g in user.groups.all(): + groups.append(AgencyGroup.objects.get(group=g).nc_name) + + #password = get_random_password(50) + password = "" + userid = user.username + displayName = user.first_name + " " + user.last_name + email = user.email + + # Data for the new User + data = { + "userid": userid, + "password": password, + "displayName": displayName, + "email":email, + "groups[]":groups + } + + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + + # Request for adding the new User + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + try: + r_status = json.loads(r.text) + if(r_status['ocs']['meta']['statuscode'] == 100): + return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' angelegt und in die Gruppen gepackt.'}) + else: + return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' konnte nicht angelegt werden. Bitte manuell prüfen!', 'message' : r.text}) + except: + return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' konnte nicht angelegt werden. Bitte manuell prüfen!', 'message' : r.text}) + + return JsonResponse({"status" : "NO AUTH"}) + +@api_view(['GET'],) +def getTMInfos(request, uid, secretkey): + if request.method == "GET": + return JsonResponse({"status" : "DATA " + uid + " " + secretkey}) + + return JsonResponse({"status" : "NO AUTH"}) + +from requests.auth import HTTPBasicAuth +''' + Anlegen des Gruppenordners der Agentur in NC + + WIRD NICHT VERWENDET!!! +''' +@api_view(['POST'], ) +def NCAddGroupFolder(request): + if request.method == "POST": + agency = Agency.objects.get(pk=request.POST.get('agencyid')) + data = { + "gid" : "agencymaingroupid_" + str(agency.pk), + "aid" : str(agency.pk), + "sk'" : settings.NC_SECRETKEY + } + headers = { + 'Authorization': 'Bearer ' + request.user.profile.nc_sid + } + # Groupfolder + r = requests.post(settings.NEXTCLOUD_URL + "apps/agency/createagf", data=data, headers=headers) + + # Standard Folder + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + settings.NEXTCLOUD_USER_API + "/Agenturdaten_" + str(agency.pk)+ '/Standards Uploadbereich/', auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + return JsonResponse({'status' : True, 'message': 'Gruppenordner und Standard-Ordner angelegt!' + r.text}) + + return JsonResponse({"status" : "NO AUTH"}) + +import os + +''' + Hier werden die Dateien angelegt und entsprechende Zugriffsrechte der Gruppen gesetzt. +''' +@api_view(['GET'], ) +def NCAddFiles(request): + if request.method == "GET": + agency = Agency.objects.get(pk=request.GET.get('agencyid')) + file_to_load = DataFile.objects.get(pk=request.GET.get('fileid')) + datadir_parent = None + datadir_parent_dirnames = [] + if(file_to_load.parent != None): + datadir_parent = file_to_load.parent + datadir_parent_dirnames = [file_to_load.parent.name] + + while(datadir_parent.parent != None): + datadir_parent_dirnames.append(datadir_parent.parent.name) + datadir_parent = datadir_parent.parent + ## Popping last Element + d_prestring = "" + if(len(datadir_parent_dirnames) > 0): + datadir_parent_dirnames.pop(len(datadir_parent_dirnames)-1) + # Turning Array around + datadir_parent_dirnames = datadir_parent_dirnames[::-1] + + # Dirs needed for the File + for d in datadir_parent_dirnames: + new_folder = d_prestring + "/" +d + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + d_prestring += "/" + d + + # Uplod the file! + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name + with open(file_to_load.file.path, 'rb') as f: + r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + if(len(r.text) == 0): + return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' angelegt.'}) + else: + return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' konnte nicht angelegt. Bitte manuell prüfen!'}) + + return JsonResponse({"status" : "NO AUTH"}) + +''' + STANDARD FILES +''' +@api_view(['GET'], ) +def NCAddStandardFiles(request): + if request.method == "GET": + agency = Agency.objects.get(pk=request.GET.get('agencyid')) + file_to_load = DataFile.objects.get(pk=request.GET.get('fileid')) + + # Uplod the file! + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_"+ str(agency.pk) + "/Standards Uploadbereich/" + file_to_load.name + with open(file_to_load.file.path, 'rb') as f: + r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + if(len(r.text) == 0): + return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' angelegt.'}) + else: + return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' konnte nicht angelegt. Bitte manuell prüfen!'}) + + return JsonResponse({"status" : "NO AUTH"}) + + +''' + Hier werden die Dateien angelegt und entsprechende Zugriffsrechte der Gruppen gesetzt. +''' +@api_view(['GET'], ) +def NCAddDirs(request): + if request.method == "GET": + agency = Agency.objects.get(pk=request.GET.get('agencyid')) + dir_to_create = DataDir.objects.get(pk=request.GET.get('dirid')) + sharestring = "" + if(dir_to_create.visibleby.all().count() > 0): + sharestring = " Ordner nur sichtbar durch: " + for cd in dir_to_create.visibleby.all(): + sharestring += cd.agencygroupname + " (" + cd.nc_name + ")" + # Dir has no parent, create + if(len(dir_to_create.parent.name) == 0): + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt. ' + sharestring}) + # Dir has parents, start thinking :) + else: + datadir_parent = None + datadir_parent_dirnames = [] + if(dir_to_create.parent != None and len(dir_to_create.parent.name) > 0): + datadir_parent = dir_to_create.parent + datadir_parent_dirnames = [dir_to_create.parent.name] + + if(datadir_parent.parent != None): + while(datadir_parent.parent != None and len(datadir_parent.parent.name) > 0): + datadir_parent_dirnames.append(datadir_parent.parent.name) + datadir_parent = datadir_parent.parent + + if(len(datadir_parent_dirnames) > 0): + datadir_parent_dirnames = datadir_parent_dirnames[::-1] + d_prestring = "" + for d in datadir_parent_dirnames: + new_folder = d_prestring + "/" +d + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + d_prestring += "/" + d + + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + d_prestring + "/" + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt.' + sharestring}) + + + return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) + +@api_view(['GET'], ) +def NCTest(request): + #print(request.headers) + return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) + +# Setting the Users Data for logging +@api_view(['POST'], ) +def SetUserData(request): + try: + user = User.objects.get(username=request.POST.get('uid')) + user.profile.nc_sid = request.POST.get('sid') + user.save() + return JsonResponse({'message' : 'A user was found in request, sid set!'}) + except: + return JsonResponse({'message' : 'USER NOT FOUND'}) + + + + +def getFileIdFromXML(xmlresponse): + try: + split_response = xmlresponse.split("") + split_fileele = split_response[1].split("<") + return split_fileele[0] + except: + return None + + +''' + Standardateien neu zuweisen + + Pro Datei in addedfiles wird ein neues NCFile-Objekt erstellt und in addedfiles_nc gespeichert. In den Ansichten der Standards werden dann nur noch die addedfiles_nc-Elemente gesehen und verändert. +''' +@api_view(['GET'], ) +def NCSwitchStandardFiles(request): + if request.method == "GET": + #agency = Agency.objects.get(pk=request.GET.get('agencyid')) + standard = Standards.objects.get(pk=request.GET.get('standardid')) + response_status = "OK" + for f in standard.addedfiles.all(): + filesearchdata = '/files/' + settings.NEXTCLOUD_USER_API + '/Agenturdaten_' + str(standard.agency.pk) + 'infinity' + f.name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav", data=filesearchdata, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), headers={'Content-Type' : 'text/xml'}) + fileid = getFileIdFromXML(r.text) + if(fileid == None): + response_status += " FEHLER BEI STANDARD " + str(standard.pk) + " " + else: + ncfile = NCFile.objects.create(agency=standard.agency, nc_id=fileid, file_id=f) + standard.addedfiles_nc.add(ncfile) + return JsonResponse({"status" : response_status}) + return JsonResponse({"status" : "NO AUTH"}) + +@api_view(['GET'], ) +def deleteNCFile(request, fid, secretkey): + if request.method == "GET": + if(secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'): + try: + file_to_del = NCFile.objects.filter(nc_id=fid).first() + file_to_del.delete() + except: + pass + return JsonResponse({"status" : 'true'}) + else: + return JsonResponse({"status" : "NO AUTH"}) + else: + return JsonResponse({"status" : "NO AUTH"}) + +# APIs for TIMEMANAGEMENT +@api_view(['GET'], ) +def startWorkDay(request, uid, secretkey): + if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + today = date.today() + targettime = 0.0 + if(today.isoweekday() == 1): + targettime = user.usertime.wd_mo + elif(today.isoweekday() == 2): + targettime = user.usertime.wd_tu + elif(today.isoweekday() == 3): + targettime = user.usertime.wd_we + elif(today.isoweekday() == 4): + targettime = user.usertime.wd_th + elif(today.isoweekday() == 5): + targettime = user.usertime.wd_fr + elif(today.isoweekday() == 6): + targettime = user.usertime.wd_sa + elif(today.isoweekday() == 7): + targettime = user.usertime.wd_so + + # Liegt eine halbe Abwesenheit vor, wird hier die Zielarbeitszeit halbiert + if(getAbsenceForOneDay(user, today) != False): + targettime = targettime / 2 + + # Prpfung, ob bereits Arbeitstage an diesem Tag vorliegen + tempworkday = Workday.objects.filter(agency=user.profile.agency, user=user, start__day=today.day, start__month=today.month, start__year=today.year, delflag = False) + + + user_has_workdays = False + if len(tempworkday) == 0: + # Noch kein Arbeitstag vorhanden, Zielarbeitszeit ganz normal + user_has_workdays = True + else: + # Es ist bereits ein ARbeitstag vorhanden, daher wird die Zielarbeitszeit des zweiten Teils auf 0 gesetzt + targettime=0.0 + + + wd = Workday(user=user, agency=user.profile.agency, start=timezone.now(), target=targettime) + wd.save() + + data = { + "success" : True, + "wd_starttime" : wd.start.strftime("%H:%M:%S"), + "wd_starttime_complete" : wd.start + } + + return JsonResponse(data) + else: + return JsonResponse({"status" : "FALSE"}) + +# APIs for TIMEMANAGEMENT +import os +from django.conf import settings +from django.utils import timezone +from datetime import date +import datetime +# Ladet das aktuelle Gleitzeitkonto +''' + + Es werden nur Tage berücksichtigt, die in der Vergangenheit liegen! + +''' +def format_timedelta(td): + hours, remainder = divmod(td.total_seconds(), 3600) + minutes, seconds = divmod(remainder, 60) + hours, minutes, seconds = int(hours), int(minutes), int(seconds) + if hours < 10: + hours = '0%s' % int(hours) + if minutes < 10: + minutes = '0%s' % minutes + if seconds < 10: + seconds = '0%s' % seconds + return '%s:%s:%s' % (hours, minutes, seconds) + +def loadaccounttime(user): + status = 0 + today = date.today() + workdays = Workday.objects.filter(user=user, start__lt=today, delflag = False).exclude(end=None) + + finalaccounttimesum = datetime.timedelta(minutes=0) + datetime.timedelta(hours=UserTime.objects.get(user=user).startcount) + + + for workday in workdays: + # Zeit, die der Mitarbeiter gearbeitet haben MUSS + + sum_break = 0 + + if(len(workday.breaks.all()) > 0): + + for ele in workday.breaks.all(): + if ele.end != None and ele.start != None: + sum_break += (ele.end - ele.start).seconds + + finalsum = ((workday.end - workday.start).seconds - sum_break) + hastowork = datetime.timedelta(hours=workday.target) + final_info = (int(finalsum) - int(hastowork.total_seconds()))/60 + + if(final_info >= 0.0): + finalaccounttimesum += datetime.timedelta(minutes=final_info) + else: + final_info = final_info * -1 + finalaccounttimesum -= datetime.timedelta(minutes=final_info) + + # Gesamtgleitzeit einmal schick darstellen mit rot und grün + # Wenn GLeitzeit NEGATIV ist + if(finalaccounttimesum.total_seconds() < 0): + status = 1 + final_info_data = format_timedelta(datetime.timedelta(seconds=finalaccounttimesum.total_seconds()*(-1))) + else: + status = 0 + final_info_data = format_timedelta(datetime.timedelta(seconds=finalaccounttimesum.total_seconds())) + + final_info_data_neu = final_info_data.split(":")[0] + ":" + final_info_data.split(":")[1] + + #final_info = str(final_info_data[0]) + ":" + str(final_info_data[1]) + return [final_info_data_neu, status] + + +''' + Gibt alle aktuellen Zeitdaten zurück: + - Aktuelles Gleitzeitkonto + - Ob ein aktueller Arbeitstag vorliegt (wenn ja, dann die entsprechenden Daten) + +''' +@api_view(['GET'], ) +def getTime(request, uid, secretkey): + if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + usetime = True + + if(user.usertime!= None and user.usertime.usetime == False): + usetime = False + + wd = Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False) + workdaydata_workday = 0 + workdaydata_starttime = 0 + breakstatus = False + breaktimer = 0 + breaksum = 0 + + if(len(wd) > 0): + wd_second = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] + workdaydata_workday = list(wd)[0].start + workdaydata_starttime = wd_second.start.strftime("%H:%M:%S") + + + for b in wd_second.breaks.all(): + if(b.end != None): + breaksum += (b.end - b.start).seconds + + breaksum = breaksum*1000 + + + # Check for Breaks + if(len(wd_second.breaks.all()) > 0): + # Check if all Breaks ended + wdbreak = wd_second.breaks.filter(end=None) + if(len(wdbreak) > 0): + breakstatus = True + + + # Break Found, return actual breakcounter + if(breakstatus): + wdbreak = wd_second.breaks.filter(end=None) + if(len(wdbreak) > 0): + now = timezone.now() + breakstart = list(wdbreak)[0].start + breaktimer = (now - breakstart).seconds * 1000 + + return JsonResponse({'actualtime' : loadaccounttime(user)[0], 'workdaydata_workday' : workdaydata_workday, 'workdaydata_starttime' : workdaydata_starttime, 'breakstatus' : breakstatus, 'breaktimer' : breaktimer, 'breaksum' : breaksum, 'usetime' : usetime}) + + else: + return ({"status" : "FALSE"}) + + +# APIs for TIMEMANAGEMENT +# End a WorkDay +@api_view(['GET'], ) +def endWorkDay(request, uid, secretkey): + if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] + # END ALL BREAKS + for b in wd.breaks.all(): + if b.end == None: + b.end = timezone.now() + b.save() + wd.end = timezone.now() + wd.save() + + breaksum = 0 + for b in wd.breaks.all(): + if(b.end != None): + breaksum += (b.end - b.start).seconds + + data = { + "success" : True, + "wd_endtime" : wd.end.strftime("%H:%M:%S"), + "actualbreaktime" : breaksum*1000 + } + + return JsonResponse(data) + else: + return JsonResponse({"status" : "FALSE"}) + +# Start Break +@api_view(['GET'], ) +def startBreak(request, uid, secretkey): + if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] + newbreak = Breaks(workday=wd, user=user, agency=user.profile.agency, start=timezone.now()) + newbreak.save() + wd.breaks.add(newbreak) + data = { + "success" : True, + "break_starttime" : newbreak.start, + } + return JsonResponse(data) + else: + return JsonResponse({"status" : "FALSE"}) + +# End Break +@api_view(['GET'], ) +def endBreak(request, uid, secretkey): + if request.method == "GET" and secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN': + + username_new = uid.replace("REPLACEDATAELEMENTVER0000000001", "@") + username_new = username_new.replace("POINTPOINTPOINTPOINTPOINTPOINT", ".") + + user = User.objects.filter(username=username_new).first() + + + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] + toendbreak = list(wd.breaks.filter(end=None))[0] + toendbreak.end = timezone.now() + toendbreak.save() + + wd = list(Workday.objects.filter(user=user, agency=user.profile.agency, end=None, delflag = False))[0] + breaksum = 0 + for b in wd.breaks.all(): + if(b.end != None): + breaksum += (b.end - b.start).seconds + + data = { + "success" : True, + "actualbreaktime" : breaksum*1000, + "wdtime" : wd.start + } + return JsonResponse(data) + else: + return JsonResponse({"status" : "FALSE"}) + + + + + diff --git a/chat/views.py b/chat/views.py index 95ba670..7d5a2dc 100644 --- a/chat/views.py +++ b/chat/views.py @@ -1,11 +1,11 @@ from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required -from channels_presence.models import Presence +#from channels_presence.models import Presence from django.http import HttpResponseRedirect,HttpResponse, JsonResponse from django.contrib.auth.models import User -from channels_presence.models import Room -from channels_presence.models import Presence -import channels.layers +#from channels_presence.models import Room +#from channels_presence.models import Presence +#import channels.layers from django.utils import timezone from .models import ChatRoom, ChatMessage from .forms import ChatAddChatRoom, ChatUpdateChatRoom diff --git a/cloud/views.py b/cloud/views.py index 3ff9352..f2c0525 100644 --- a/cloud/views.py +++ b/cloud/views.py @@ -162,11 +162,10 @@ def adddirbyajax(request, parent): data = {'filename' : fileobj.name, 'linked_standards' : linked_standards_final} # CHECK DOUBLE FILENAME elif(request.GET.get("action") == "check_doublefile"): - fileobj = list(DataFile.objects.filter(name__icontains=request.GET.get('name'), agency=request.user.profile.agency)) - if len(fileobj) > 0: - data = {"found" : True} - else: - data = {"found" : False} + #fileobj = list(DataFile.objects.filter(name__icontains=request.GET.get('name'), agency=request.user.profile.agency)) + #if len(fileobj) > 0: + #else: + data = {"found" : False} # DELETE FILE elif(request.GET.get("action") == "del_file"): DataFile.objects.filter(pk=request.GET.get('id'), agency=request.user.profile.agency).delete() @@ -243,8 +242,6 @@ def adddirbyajax(request, parent): uploadsource = request.POST["uploadsource"] replace = request.POST["replace"] - print(replace) - # DECODE request.decoding = 'utf-8' diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index d7d6af9..cd24382 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -62,6 +62,7 @@ Die Gruppe Notfallhilfe ist für keine weiteren Rechte konfigurierbar.
    {% endif %} + {% if aggroup.agencygroupname != "Mitarbeiter" %}
    Mitarbeiter zur Gruppe {{aggroup.agencygroupname}} hinzufügen
    @@ -78,7 +79,9 @@
    -
    +
    + {% endif %} +
    Gruppenmitglieder in {{aggroup.agencygroupname}}
    {% if varcounter > 0 %} @@ -89,10 +92,11 @@ {% for user in usersofagency %} {% for group in user.groups.all %} {% if group.name == aggroup.group.name %} - {% if request.user == user and aggroup.is_admin %} + {% if request.user == user and aggroup.is_admin or aggroup.agencygroupname == "Mitarbeiter" %} {% else %} - {{ user.first_name }} {{ user.last_name }}   + + {{ user.first_name }} {{ user.last_name }}   {% endif %} {% endif %} @@ -352,9 +356,9 @@ function changeGroupName(groupid){ { $("#newgroupname").val(data['data']['groupname']); $("#modTitle").html("Gruppenname ändern"); - $("#saveNewGroup").prop("disabled", false); - groupupdate_id = groupid; - groupaction = 1; + $("#saveNewGroup").prop("disabled", false); + groupupdate_id = groupid; + groupaction = 1; } }); } @@ -387,15 +391,15 @@ function updateGroupName(){ }, success: function( data ) { - - if(data['success']){ - window.location.href = window.location.href + "?showtoast=true"; - } - else{ - $("#newGroup").modal("toggle"); - $('#notchange_err').toast('show'); - $("#toast_errcontent").html("Der Gruppenname ist in der Agentur bereits vorhanden!"); - } + if(data['success']){ + window.location.href = window.location.href + "?showtoast=true"; + $("#newGroup").modal("toggle"); + } + else{ + $("#newGroup").modal("toggle"); + $('#notchange_err').toast('show'); + $("#toast_errcontent").html("Der Gruppenname ist in der Agentur bereits vorhanden!"); + } } }); } @@ -413,9 +417,9 @@ function updateGroupName(){ success: function( data ) { if(data['success']){ - $("#newGroup").modal("toggle"); + $("#newGroup").modal("hide"); $('#notchange_done').toast('show'); - $("#groupname_" + groupupdate_id).html("Gruppe "+data['data']['newvalue']+" "); + $("#groupname_" + groupupdate_id).html("Gruppe "+data['data']['newvalue']+" "); } else{ $('#notchange_err').toast('show'); diff --git a/dasettings/templates/dasettings/moduls_content.html b/dasettings/templates/dasettings/moduls_content.html index e016555..ecc9803 100644 --- a/dasettings/templates/dasettings/moduls_content.html +++ b/dasettings/templates/dasettings/moduls_content.html @@ -1,10 +1,10 @@ {% load crispy_forms_tags %} +
    - @@ -14,9 +14,9 @@ {% for formfield in modulform %} + {% if formfield.name == 'module_organigramm' or formfield.name == 'module_timemanagement' %} - + {% endif %} {% endfor %}
    ModulAktiviert Einstellungen
    {{formfield.label_tag}}{{formfield}} {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %} @@ -25,13 +25,13 @@ {% endif %}
    -
    - +
    {% for formfield in modulform %} +{% endfor %} diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index 27a3456..30852d9 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -37,9 +37,11 @@

    Einstellungen{% if request.user.profile.showtooltips %} {% endif %}

    +
    +
    Benachrichtigungen{% if request.user.profile.showtooltips %} {% endif %}
    @@ -170,7 +176,7 @@
    {% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index 4468ce6..b162fa3 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -61,8 +61,8 @@ {{ mail }} 

    -    -

    +
    diff --git a/dasettings/views.py b/dasettings/views.py index 357bf04..8987cb2 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -547,6 +547,7 @@ Hier werden die Profilinfos des User zurückgesetzt; Parameter kommen von Settin - Passwort aktualisieren ''' +import requests @login_required def SettingsProfilManagement(request, context): # Check, which form @@ -590,6 +591,10 @@ def SettingsProfilManagement(request, context): context['passwordform'] = passwordform return render(request, 'dasettings/settings.html', context) +def get_random_number(length = 6): + result_str = ''.join(random.choice("0123456789") for i in range(length)) + return result_str + @login_required def SettingsAjaxRouter(request): success = False @@ -645,7 +650,7 @@ def SettingsAjaxRouter(request): tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency) data = {"funcname" : tempjob.name} success = True - # DELETE FINAL AGECY JOB + # DELETE FINAL AGENCY JOB elif request.method == 'GET' and request.GET['action'] == "delete_agencyfunc" : job_id = request.GET['id'] tempjob = AgencyJob.objects.get(pk=job_id, agency=request.user.profile.agency) @@ -663,7 +668,31 @@ def SettingsAjaxRouter(request): group.agencygroupname = request.GET['newvalue'] group.save() data = {"newvalue" : group.agencygroupname} + + # Update Groupname in NC + ''' + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true', + } + ''' + ''' + data_nc = { + "groupid" : group.nc_name, + "newvalue" : request.GET['newvalue'] + } + ''' + #r = requests.post(settings.NEXTCLOUD_URL + "/apps/agency/updateagencygroup", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + data = { + "name": request.GET['newvalue'], + "id" : group.nc_name + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + #r = requests.post(settings.NEXTCLOUD_URL + "/apps/agency/api/v1/renameagg", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) success = True + data = {"newvalue" : request.GET['newvalue']} else: success = False # GRUPPENNAMEN HOLEN @@ -671,21 +700,70 @@ def SettingsAjaxRouter(request): group = AgencyGroup.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) data = {"groupname" : group.agencygroupname} success = True + # SAVE NEW GROUP ADD GROUP elif request.method == 'GET' and request.GET['action'] == "add_group" : if(checkForGroupName(request, request.GET['newvalue'])): tempgroup = Group(name=str(request.user.profile.agency.pk) + "_" + randomString(8)) tempgroup.save() tempgroup_ag = AgencyGroup(savefordel=False, group=tempgroup, agency=request.user.profile.agency, agencygroupname=request.GET['newvalue']) - tempgroup_ag.save() + success = True data = {"group_id" : tempgroup_ag.pk, "group_name" : tempgroup_ag.agencygroupname} + nc_groupid = "agencymaingroupid_" + str(tempgroup_ag.agency.pk) + "_subgroup_" + get_random_number() + tempgroup_ag.nc_name = nc_groupid + tempgroup_ag.save() + + # ADD group in NC + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "groupid" : nc_groupid, + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/groups", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + # Group created, set display name in NC + data_nc = { + "name": tempgroup_ag.agencygroupname, + "id" : nc_groupid + } + + r = requests.post(settings.NEXTCLOUD_URL + "apps/agency/regr", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + # Add current User to this Group + # TODO: Hier checken, ob das wirklich nötig ist...? + #data_nc = { + # "groupid" : nc_groupid + #} + data = { + "name": tempgroup_ag.agencygroupname, + "id" : nc_groupid + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + #r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users/" + request.user.username + "/groups", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + else: success = False + # DELETE A GROUP elif request.method == 'GET' and request.GET['action'] == "delete_group" : groupag = AgencyGroup.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) + + # DELETE GROUP IN NC + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "groupid" : groupag.nc_name, + } + r = requests.request("DELETE", settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/groups/" + groupag.nc_name,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) group_to_del = groupag.group group_to_del.delete() success = True + # PERMISSIONS ON GROUP! elif request.method == 'GET' and request.GET['action'] == "change_perm_group" : success = True @@ -716,6 +794,18 @@ def SettingsAjaxRouter(request): aggroup.group.user_set.remove(usertoremove) data = {"userid" : usertoremove.pk, "groupid" : aggroup.pk, "user_fname" : usertoremove.first_name, "user_lname" : usertoremove.last_name} + # User add + # NC REMOVE USER FROM GROUP + # first_name and last_name CHANGE - Update in NC as DisplayName + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "groupid" : aggroup.nc_name, + } + r = requests.request("DELETE", settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + usertoremove.username + "/groups",headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) else: success = False # ADD USER TO GROUP @@ -729,6 +819,20 @@ def SettingsAjaxRouter(request): if(request.user.profile.agency.pk == aggroup.agency.pk): aggroup.group.user_set.add(usertoadd) data = {"userid" : usertoadd.pk, "groupid" : aggroup.pk, "user_fname" : usertoadd.first_name, "user_lname" : usertoadd.last_name} + + # User add + # NC ADD USER TO GROUP + # first_name and last_name CHANGE - Update in NC as DisplayName + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "groupid" : aggroup.nc_name, + } + r = requests.post(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + usertoadd.username + "/groups",headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) + else: success = False # AREA @@ -851,8 +955,19 @@ def SettingsAjaxRouter(request): success = False else: tempuser.email = newmail - tempuser.username = newmail + #tempuser.username = newmail tempuser.save() + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "key" : "email", + "value" : newmail + } + r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + tempuser.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) + print(r.text) success = True else: data = {"mail" : tempmail} @@ -870,6 +985,18 @@ def SettingsAjaxRouter(request): tempuser.save() data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name} success = True + + # first_name and last_name CHANGE - Update in NC as DisplayName + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "key" : "displayname", + "value" : tempuser.first_name + " " + tempuser.last_name + } + r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + tempuser.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) else: data = {"userfullname" : tempuser.first_name + " " + tempuser.last_name} success = False @@ -1542,7 +1669,7 @@ def UserChangeMain(request, pk): } return render(request, 'dasettings/user_changemaindata.html', context) -# Method for first User-Creation-Step +# Method for first User-Creation-Step - NEW USER @login_required def NewUserFirstStep(request): context = { @@ -1551,24 +1678,45 @@ def NewUserFirstStep(request): if request.method == 'POST': newuserform = UserNewUserForm(request.POST) if newuserform.is_valid(): - if(request.POST.get("sendmailnewuser")): - msg_html = render_to_string('users/newusers_email.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')}) - send_mail(request.user.profile.agency.name + ' Account', 'Hallo ' + newuserform.cleaned_data.get('first_name') + ' ' + newuserform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://app.digitale-agentur.com/password-reset/ ein Passwort.','noreply@digitale-agentur.com',[newuserform.cleaned_data.get('email')],html_message=msg_html,fail_silently=True) + #if(request.POST.get("sendmailnewuser")): + # msg_html = render_to_string('users/newusers_email.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')}) + # send_mail(request.user.profile.agency.name + ' Account', 'Hallo ' + newuserform.cleaned_data.get('first_name') + ' ' + newuserform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://app.digitale-agentur.com/password-reset/ ein Passwort.','noreply@digitale-agentur.com',[newuserform.cleaned_data.get('email')],html_message=msg_html,fail_silently=True) newuser = newuserform.save(commit=False) newuser.username = newuser.email newprofile = Profile(agency=request.user.profile.agency, parent=None) newprofile.save() newuser.profile = newprofile newuser.save() + + # NEW USER IN DJANGO - ADD USER TO NC + # Data for the new User + try: + data_nc = { + "userid": newuser.username, + "password": "", + "displayName": newuser.first_name + " " + newuser.last_name, + "email": newuser.email, + "groups[]": "agencymaingroupid_" + str(request.user.profile.agency.pk) + } + + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + + # Request for adding the new User + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + except: + pass # USERTIME user_time = UserTime(user=newuser) user_time.save() # USER NOTIFICATIONS - user_notifications = UserNotifications(user=newuser) - user_notifications.save() - - newuser.usernotifications = user_notifications + #user_notifications = UserNotifications.objects.create(user=newuser) + #user_notifications.save() + #newuser.usernotifications = user_notifications newuser.usertime = user_time diff --git a/digitaleagentur/asgi.py b/digitaleagentur/asgi.py index 27056c6..25e5156 100644 --- a/digitaleagentur/asgi.py +++ b/digitaleagentur/asgi.py @@ -2,11 +2,11 @@ ASGI entrypoint. Configures Django and then runs the application defined in the ASGI_APPLICATION setting. """ - +''' import os import django from channels.routing import get_default_application - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "digitaleagentur.settings") -django.setup() -application = get_default_application() \ No newline at end of file +''' +#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "digitaleagentur.settings") +#django.setup() +#application = get_default_application() \ No newline at end of file diff --git a/digitaleagentur/routing.py b/digitaleagentur/routing.py index f67ce3e..93b4e87 100644 --- a/digitaleagentur/routing.py +++ b/digitaleagentur/routing.py @@ -1,7 +1,9 @@ +''' from channels.auth import AuthMiddlewareStack from channels.routing import ProtocolTypeRouter, URLRouter import users.routing + application = ProtocolTypeRouter({ # Empty for now (http->django views is added by default) 'websocket': AuthMiddlewareStack( @@ -9,4 +11,6 @@ application = ProtocolTypeRouter({ users.routing.websocket_urlpatterns ) ), -}) \ No newline at end of file +}) + +''' \ No newline at end of file diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 06c63b4..67da986 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -25,14 +25,15 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Nach zehn Stunden läuft der Cookie ab! # TASK: Zehn stunden auto-auslog einmal checken Sekunden! -SESSION_COOKIE_AGE = 8*60*60 +SESSION_COOKIE_AGE = 100*60*60 +SESSION_COOKIE_SECURE = False - -CHANNELS_PRESENCE_MAX_AGE = 30 +#CHANNELS_PRESENCE_MAX_AGE = 30 # FOR SUMMERNOTE ORIGIN -X_FRAME_OPTIONS = 'SAMEORIGIN' +#X_FRAME_OPTIONS = 'SAMEORIGIN' #X_FRAME_OPTIONS = 'ALLOWALL' +X_FRAME_OPTIONS = 'allow-from *cloud.digitale-agentur.com' # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ @@ -47,10 +48,8 @@ MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" #ALTER ZUM TESTEN #LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19" -# Neuer KEY -LEX_API = "p6xxyzOul0BaLDr-xuhVNYNzZ5s" # Gültig bis 17.10.2022 -#LEX_API = "8dcbd7a5-9447-417f-a4a4-989818742a36" +LEX_API = "8dcbd7a5-9447-417f-a4a4-989818742a36" # KEYS FOR ENCRYPTED FILE FIELDS DEFF_SALT = 'A-!GDtuKp?H/H5-UUatEh6ZcG/6h-VQf1OkDORRkK0(:(qCf//' @@ -62,6 +61,8 @@ DEFF_FETCH_URL_NAME = 'getdoc' USE_X_FORWARDED_HOST = True SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +NC_SECRETKEY = "lkjahstaszd76uhjNJABHM65rftzvb323ADSD567tzu9ztz" + # Application definition INSTALLED_APPS = [ 'django.contrib.contenttypes', @@ -95,8 +96,8 @@ INSTALLED_APPS = [ 'django_user_agents', 'rest_framework', 'rest_framework.authtoken', - 'channels', - 'channels_presence', + #'channels', + #'channels_presence', 'simple_history', 'captcha', 'auditlog', @@ -112,11 +113,14 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django_user_agents.middleware.UserAgentMiddleware', 'simple_history.middleware.HistoryRequestMiddleware', - 'auditlog.middleware.AuditlogMiddleware' + 'auditlog.middleware.AuditlogMiddleware', + #'users.middleware.oauth.OAuthMiddleware' ] ROOT_URLCONF = 'digitaleagentur.urls' +#CSRF_COOKIE_SECURE = False + TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -134,16 +138,20 @@ TEMPLATES = [ ] REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': ( - 'rest_framework.authentication.TokenAuthentication', - ), - 'DEFAULT_PERMISSION_CLASSES': [ - 'rest_framework.permissions.IsAuthenticated', - ], + #'DEFAULT_AUTHENTICATION_CLASSES': ( + #'rest_framework.authentication.TokenAuthentication', + #'rest_framework.permissions.AllowAny', + #), + #'DEFAULT_PERMISSION_CLASSES': [ + # 'rest_framework.permissions.IsAuthenticated', + #], } -#WSGI_APPLICATION = 'digitaleagentur.wsgi.application' +WSGI_APPLICATION = 'digitaleagentur.wsgi.application' ASGI_APPLICATION = "digitaleagentur.routing.application" + + +''' CHANNEL_LAYERS = { 'default': { 'BACKEND': 'channels_redis.core.RedisChannelLayer', @@ -152,6 +160,7 @@ CHANNEL_LAYERS = { }, }, } +''' @@ -205,11 +214,11 @@ LOGIN_REDIRECT_URL = 'users-dashboard' # LOGIN PAGE FOR LOGIN-REDIRECT LOGIN_URL = 'login' +# NC Default Login findet im Dashboard statt! +#LOGIN_URL = NEXTCLOUD_URL STATIC_URL = '/static/' - - ''' SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' diff --git a/digitaleagentur/utils.py b/digitaleagentur/utils.py index 1e461f2..2750adf 100644 --- a/digitaleagentur/utils.py +++ b/digitaleagentur/utils.py @@ -1,5 +1,7 @@ from timemanagement.models import * from digitaleagentur.timemanagement_utils import * +from django.conf import settings +from django.shortcuts import redirect ''' Hier sind Funktion implementiert, die in verschiedenen Module benötigt werden @@ -44,6 +46,35 @@ def getAbsenceForOneDay(user, day): - Abwesenheit ist der komplette Tag, dann wird dieser Arbeitstag gelöscht, wenn es is_time false ist, sprich die Zeiterfassung soll nicht angefasst werden - Abwesenheit ist kompletter Tag und die Abwesenheit soll Zeiterfassung beeinflussen (z.B. Gleitzeit) dann wird der Arbeitstag nicht verändert. Ist die Gleitzeit ein halber Tag, wird die Zielarbeitszeit halbiert. ''' +''' +def checkAbsenceWorkdayCollide(absence): + # Alle einzelnen Tage der Abwesenheit werden durchgegangen: + # TODO: Hier einmal testen ob das korrekto ist + for day in daterange(absence.start, absence.end): + # Arbeitstage an diesem Tag werden geladen + #workdays = Workday.objects.filter(user=absence.user, start__day=absence.start.day, start__month=absence.start.month, start__year=absence.start.year) + workdays = Workday.objects.filter(user=absence.user, start__day=day.day, start__month=day.month, start__year=day.year) + # Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat. + for workday in workdays: + # Arbeitstag in Tag ohne Zeit umwandeln + # Wenn die Abwesenheit die Zeiterfassung NICHT ändert, muss diese ggf. geändert werden. Ansonsten bleibt sie gleich. + #if absence.reason.is_time == False: + if absence.reason.is_time == True: + # Prüfung, ob der Tag halb ist oder nicht. Wenn ja, dann Zielarbeitszeit des Tages um die Hälfte reduzieren. + #if (workday.start.day == absence.start.day and workday.start.month == absence.start.month and workday.start.year == absence.start.year) or (workday.end.day == absence.end.day and workday.end.month == absence.end.month and workday.end.year == absence.end.year): + if(getIsAbsenceStartEndHalf(absence)): + workday.target = workday.target / 2 + workday.save() + # Ganzer Tag vorhanden, Arbeitstag wird als löschen markiert, aber nicht gelöscht + else: + if workday.delflag == True: + workday.delflag = False + workday.save() + else: + workday.delflag = True + workday.save() + +''' def checkAbsenceWorkdayCollide(absence): # Alle einzelnen Tage der Abwesenheit werden durchgegangen: for day in daterange(absence.start, absence.end): @@ -68,6 +99,33 @@ def checkAbsenceWorkdayCollide(absence): workday.delflag = True workday.save() +''' +def checkAbsenceWorkdayCollideDelete(absence): + # Alle einzelnen Tage der Abwesenheit werden durchgegangen: + for day in daterange(absence.start, absence.end): + # Arbeitstage an diesem Tag werden geladen + workdays = Workday.objects.filter(user=absence.user, start__day=absence.start.day, start__month=absence.start.month, start__year=absence.start.year) + + # Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat. + for workday in workdays: + # Arbeitstag in Tag ohne Zeit umwandeln + # Wenn die Abwesenheit die Zeiterfassung NICHT ändert, muss diese ggf. geändert werden. Ansonsten bleibt sie gleich. + if absence.reason.is_time == False: + # Prüfung, ob der Tag halb ist oder nicht. Wenn ja, dann Zielarbeitszeit des Tages um die Hälfte reduzieren. + if (workday.start.day == absence.start.day and workday.start.month == absence.start.month and workday.start.year == absence.start.year) or (workday.end.day == absence.end.day and workday.end.month == absence.end.month and workday.end.year == absence.end.year): + if(getIsAbsenceStartEndHalf(absence)): + workday.target = workday.target / 2 + workday.save() + # Ganzer Tag vorhanden, Arbeitstag wird als löschen markiert, aber nicht gelöscht + else: + workday.delflag = False + workday.save() + else: + # Sollte der ganze Tag mal als zu löschen markiert worden sein, wird dies hier zurückgenommen + if workday.delflag == True: + workday.delflag = False + workday.save() +''' def checkAbsenceWorkdayCollideDelete(absence): # Alle einzelnen Tage der Abwesenheit werden durchgegangen: for day in daterange(absence.start, absence.end): @@ -94,10 +152,38 @@ def checkAbsenceWorkdayCollideDelete(absence): - - - - + +# NC LOGIN +''' + + A User has to be logged in in NC. If yes, we check the user-status and retrieving the userId. If the logged user by this session is the same we want to see in Django, than the user will logged in. + + Double-Check: Logged-Session from NC (session-id cannot be hacked cause it is serverside) and we check userId local, django and NC + +''' + +import xmltodict, json, requests +''' + getNCLoggedUserBySession + + Returns the UserId of the user in the given session + + @params: + - sid (string) from nc_session_id, saved in the server and cookie +''' +from django.core.mail import send_mail +def getNCLoggedUserBySession(sid): + nc_login_headers = {'Authorization' : 'Bearer ' + sid} + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) + xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) + + final_json = json.loads(js) + return final_json['ocs']['data']['userId'] + #except: + # return redirect('users-dashboard') + + diff --git a/firstrun.py b/firstrun.py index 49b4e97..2de5e3e 100644 --- a/firstrun.py +++ b/firstrun.py @@ -1,6 +1,3 @@ -from django.conf import settings -settings.configure() - from django.contrib.auth.models import User from users.models import Profile,Agency diff --git a/news/urls.py b/news/urls.py index 13be753..de5e098 100644 --- a/news/urls.py +++ b/news/urls.py @@ -17,5 +17,5 @@ urlpatterns = [ 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") + #path('standard//task', views.StandardTask, name="standard-task") ] diff --git a/news/views.py b/news/views.py index 0835f29..7dadf33 100644 --- a/news/views.py +++ b/news/views.py @@ -1,3 +1,4 @@ +from django.http.response import JsonResponse from django.shortcuts import render, redirect from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView @@ -17,6 +18,7 @@ class NewsManagement(LoginRequiredMixin, ListView): # Loading only user same agency # 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.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') @@ -134,8 +136,3 @@ def NewsSingle(request, pk): return render(request, 'news/news_single.html', context) - - - - - diff --git a/recoverdir/views.py b/recoverdir/views.py index a171fae..93ab0a6 100644 --- a/recoverdir/views.py +++ b/recoverdir/views.py @@ -465,7 +465,7 @@ class RecoverDirAddPL(CreateView): template_name = "recoverdir/rd_pers_add.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -513,7 +513,7 @@ class RDAoneAddDoc(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -544,7 +544,7 @@ class RDAoneViewDoc(DetailView): context_object_name = 'document' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -556,7 +556,7 @@ class RDAoneDelDoc(DeleteView): context_object_name = 'document' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -573,7 +573,7 @@ class RDAoneUpdateDoc(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -625,7 +625,7 @@ class RDAoneUpdateHL(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addhl.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -643,7 +643,7 @@ class RDAoneAddFC(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -664,7 +664,7 @@ class RDAoneUpdateContact(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -681,7 +681,7 @@ class RDAoneViewContact(DetailView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -693,7 +693,7 @@ class RDAoneDelContact(DeleteView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -711,7 +711,7 @@ class RDAoneViewTrust(DetailView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -723,7 +723,7 @@ class RDAoneDelTrust(DeleteView): context_object_name = 'contact' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -740,7 +740,7 @@ class RDAoneAddTrust(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -761,7 +761,7 @@ class RDAoneUpdateTrust(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -780,7 +780,7 @@ class RDAtwoAddHLFV(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -801,7 +801,7 @@ class RDAtwoUpdateFV(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -819,7 +819,7 @@ class RDAtwoViewdeposit(DetailView): context_object_name = 'deposit' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -831,7 +831,7 @@ class RDAtwoDeldeposit(DeleteView): context_object_name = 'deposit' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -848,7 +848,7 @@ class RDAtwoAdddeposit(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -877,7 +877,7 @@ class RDAtwoUpdatedeposit(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -899,7 +899,7 @@ class RDAtwoViewergo(DetailView): context_object_name = 'ergo' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -911,7 +911,7 @@ class RDAtwoDelergo(DeleteView): context_object_name = 'ergo' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -928,7 +928,7 @@ class RDAtwoAddergo(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -949,7 +949,7 @@ class RDAtwoUpdateergo(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -971,7 +971,7 @@ class RDAtwoViewonlinebank(DetailView): context_object_name = 'onlinebank' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -983,7 +983,7 @@ class RDAtwoDelonlinebank(DeleteView): context_object_name = 'onlinebank' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1000,7 +1000,7 @@ class RDAtwoAddonlinebank(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1030,7 +1030,7 @@ class RDAtwoUpdateonlinebank(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1059,7 +1059,7 @@ class RDAthreeViewstreaming(DetailView): context_object_name = 'streaming' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1071,7 +1071,7 @@ class RDAthreeDelstreaming(DeleteView): context_object_name = 'streaming' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1088,7 +1088,7 @@ class RDAthreeAddstreaming(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1117,7 +1117,7 @@ class RDAthreeUpdatestreaming(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1146,7 +1146,7 @@ class RDAfourViewdigitalaccount(DetailView): context_object_name = 'account' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1159,7 +1159,7 @@ class RDAfourDeldigitalaccount(DeleteView): def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1176,7 +1176,7 @@ class RDAfourAdddigitalaccount(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1206,7 +1206,7 @@ class RDAfourUpdatedigitalaccount(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1235,7 +1235,7 @@ class RDAfiveViewpersonal(DetailView): context_object_name = 'personal' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1247,7 +1247,7 @@ class RDAfiveDelpersonal(DeleteView): context_object_name = 'personal' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1264,7 +1264,7 @@ class RDAfiveAddpersonal(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1286,7 +1286,7 @@ class RDAfiveUpdatepersonal(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1308,7 +1308,7 @@ class RDAnineViewelse(DetailView): context_object_name = 'else' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1320,7 +1320,7 @@ class RDAnineDelelse(DeleteView): context_object_name = 'ele' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1337,7 +1337,7 @@ class RDAnineAddelse(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1359,7 +1359,7 @@ class RDAnineUpdateelse(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1381,7 +1381,7 @@ class RDAsevenViewcontract(DetailView): context_object_name = 'contract' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1393,7 +1393,7 @@ class RDAsevenDelcontract(DeleteView): context_object_name = 'ele' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1410,7 +1410,7 @@ class RDAsevenAddcontract(CreateView): template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self)): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1431,7 +1431,7 @@ class RDAsevenUpdatecontract(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html" def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1454,7 +1454,7 @@ class PLSingleHistory(DetailView): context_object_name = 'persletter' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1481,7 +1481,7 @@ class HLSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_hl_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1510,7 +1510,7 @@ class HLVFSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_hl_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1539,7 +1539,7 @@ class ContactSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1568,7 +1568,7 @@ class TrustSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1597,7 +1597,7 @@ class DepositSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_deposit_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1626,7 +1626,7 @@ class DocumentSingleHistory(DetailView): template_name = 'recoverdir/rd_doc_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1655,7 +1655,7 @@ class ErgoSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_ergo_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1684,7 +1684,7 @@ class OnlinebankSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_2_onlinebank_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1713,7 +1713,7 @@ class StreamingSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_3_streamingabo_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1742,7 +1742,7 @@ class DigitalAccountSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1771,7 +1771,7 @@ class PersonalSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_5_personal_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1800,7 +1800,7 @@ class ContractSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_7_contract_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') @@ -1829,7 +1829,7 @@ class ElseSingleHistory(DetailView): template_name = 'recoverdir/rd_elements_forms/rd_area_9_else_single.html' def dispatch(self, *args, **kwargs): - if(checkForLogin(self) and self.get_object().agency == self.request.user.profile.agency): + if(checkForLogin(self) and self.instance.agency == self.request.user.profile.agency): return super().dispatch(*args, **kwargs) else: return redirect('recoverdir-login') diff --git a/requirements.txt b/requirements.txt index 684c26e..80ab509 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,3 +36,6 @@ xhtml2pdf==0.2.5 django-simple-captcha==0.5.13 auditlog3==1.0.1 filetype==1.0.7 +Authlib==0.15.3 +xmltodict==0.12.0 +django-user-sessions==1.7.1 \ No newline at end of file diff --git a/standards/models.py b/standards/models.py index 13dcfeb..e6fc628 100644 --- a/standards/models.py +++ b/standards/models.py @@ -22,7 +22,7 @@ class StandardComments(models.Model): comment_by = models.ForeignKey(User, on_delete=models.CASCADE) comment_on = models.DateTimeField(default=timezone.now, blank=True) last_modified_on = models.DateTimeField(default=timezone.now, blank=True) - + class Standards(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE) area = models.ForeignKey(Areas, on_delete=models.SET_NULL, blank=True, null=True) @@ -66,6 +66,8 @@ class Standards(models.Model): # FILES addedfiles = models.ManyToManyField(DataFile, blank=True) + addedfiles_nc = models.ManyToManyField('NCFile', blank=True) + # VERLINKTE STANDARDS linked_standards = models.ManyToManyField('Standards', blank=True) # GORUPS @@ -94,3 +96,8 @@ class Standards(models.Model): # Hier Path für Templates des Models mit Parametern def get_absolute_url(self): return reverse('standards-add', kwargs={'pk':self.pk}) + +class NCFile(models.Model): + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) + nc_id = models.IntegerField(default=0) + file_id = models.ForeignKey(DataFile, on_delete=models.CASCADE, null=True, blank=True, default=None) diff --git a/standards/templates/standards/jscode_icon.js b/standards/templates/standards/jscode_icon.js new file mode 100644 index 0000000..738f482 --- /dev/null +++ b/standards/templates/standards/jscode_icon.js @@ -0,0 +1,15 @@ +var button = document.createElement("a"); +button.innerHTML = ''; + +// ICON +button.classList.add("header-menu"); + +var header = document.getElementsByClassName("header-right")[0]; +header.prepend(button); + +button.style.padding = "20px"; + + +button.addEventListener ("click", function() { + alert("did something"); +}); \ No newline at end of file diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 264876e..e3f2d5f 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -5,7 +5,7 @@
    {% if update == True %} -

    Standard Bearbeiten{% if request.user.profile.showtooltips %} {% endif %}

    +

    Standard Bearbeiten {% if request.user.profile.showtooltips %} {% endif %}

    {% else %}

    Neuen Standard anlegen{% if request.user.profile.showtooltips %} {% endif %}

    {% endif %} @@ -144,24 +144,29 @@
    - {% for f in files %} - + {% for f in files %} + {% getNCFileInfos request f as filename %} + {% if filename != "FAIL_TO_LOAD_NC_FILE_DATA" %} + + {% endif %} {% endfor %}
    Verlinkte Dateien: {% if update == True %} - {% for f in standard.addedfiles.all %} - + {% for f in standard.addedfiles_nc.all %} + {% getNCFileInfos request f.nc_id as filename %} + {% endfor %} {% endif %}
    {{f.name}}
    {{filename}}
    + {% if user|usergperm:"filesmanager" %} {% endif %} @@ -717,8 +722,9 @@ var ua = window.navigator.userAgent; var isIE = /MSIE|Trident/.test(ua); var isSafari = /Safari/.test(ua); - -if ( isIE || isSafari) { +var isChrome = /Chrome/.test(ua); +if ( isIE || (isSafari && !isChrome)) { + //IE specific code goes here setInterval(function() { @@ -762,7 +768,7 @@ function checkGroupVerant(){ $("#id_group_verant").val(act_verant_group); } - console.log($("#id_group_verant").val()); + //console.log($("#id_group_verant").val()); } function removeGroupFromVeran(id, name){ @@ -772,7 +778,7 @@ function removeGroupFromVeran(id, name){ $("#id_group_verant").val(act_verant_group); $("#span_btn_verant_group_" + id).remove(); - console.log($("#id_group_verant").val()); + //console.log($("#id_group_verant").val()); } //AUSFÜHRENDER @@ -798,7 +804,7 @@ function checkGroupEx(){ $("#id_group_ex").val(act_ex_group); } - console.log($("#id_group_ex").val()); + //console.log($("#id_group_ex").val()); } function removeGroupFromEx(id, name){ @@ -808,7 +814,7 @@ function removeGroupFromEx(id, name){ $("#id_group_ex").val(act_ex_group); $("#span_btn_ex_group_" + id).remove(); - console.log($("#id_group_ex").val()); + //console.log($("#id_group_ex").val()); } //VERTRETER @@ -1005,8 +1011,8 @@ actualStandards = []; actualFiles = []; {% if update == True %} actualFiles = [ - {% for f in standard.addedfiles.all %} - '{{f.pk}}', + {% for f in standard.addedfiles_nc.all %} + '{{f.nc_id}}', {% endfor %} ]; $("#id_added_files").val(actualFiles); @@ -1054,8 +1060,7 @@ function clearSearchField(type){ function updateLinkedElements(type){ var g = $('#searchfield_' + type).val(); var id = $('#poss_' + type).find('option[value="' + g + '"]').attr('id'); - - if(id != undefined && id.length > 0){ + if((id != undefined || id != "undefined") && id.length > 0){ clearSearchField(type); tempid = id.split("_")[1]; @@ -1100,6 +1105,7 @@ function remEle(type, id, name){ index_to_rem = actualFiles.indexOf(id); actualFiles.splice(index_to_rem,1); $("#id_added_" + type).val(actualFiles); + } else if(type == 'quicklinks'){ index_to_rem = actualQuicklinks.indexOf(id); @@ -1176,6 +1182,7 @@ function replaceFileDirectChoice(filetodo, choice){ doUploadAction(filetodo_ex, choice); } + function uploadAction(filetodo){ filetodo_ex = filetodo; @@ -1183,7 +1190,7 @@ function uploadAction(filetodo){ $.ajax( { type: "GET", - url: "{% url 'cloud-adddir' parentid %}", + url: "{% url 'cloud-adddir' 0 %}", data:{ action : "check_doublefile", name : filetodo.name @@ -1223,7 +1230,7 @@ function doUploadAction(filetodo, replacestat){ if(c && filetodo.type.length > 0){ $.ajax({ - url: "{% url 'cloud-adddir' parentid %}", + url: "{% url 'standard-uploadfile' %}", headers: { "X-CSRFTOKEN": "{{ csrf_token }}" }, @@ -1246,6 +1253,7 @@ function doUploadAction(filetodo, replacestat){ return xhr; }, success: function(data) { + console.log(data); if(data["success"] == true){ setTimeout(function(){ hideUpload(); diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html index d5ffc01..602502d 100644 --- a/standards/templates/standards/standards_single.html +++ b/standards/templates/standards/standards_single.html @@ -27,7 +27,7 @@
    - {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 or standard.authority_group.count > 0 or standard.executor_group.count > 0 or standard.representative_group.count > 0 %} + {% if standard.addedfiles_nc.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles_nc.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 or standard.authority_group.count > 0 or standard.executor_group.count > 0 or standard.representative_group.count > 0 %}
    {% else %}
    @@ -42,7 +42,7 @@
    - {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 or standard.authority_group.count > 0 or standard.executor_group.count > 0 or standard.representative_group.count > 0 %} + {% if standard.addedfiles_nc.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles_nc.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 or standard.addedcontacts.all|length > 0 or standard.addedpasswords.all|length > 0 or standard.addedquicklinks.all|length > 0 or standard.authority_group.count > 0 or standard.executor_group.count > 0 or standard.representative_group.count > 0 %}
    @@ -131,19 +131,26 @@ - {% if standard.addedfiles.all|length > 0 %} + {% if standard.addedfiles_nc.all|length > 0 %}
    Dateien

    - {% for files in standard.addedfiles.all %} - {{files.name|truncatechars:30}}
    + {% for file in standard.addedfiles_nc.all %} + {% getNCFileInfos request file.nc_id as filename %} + {% getNCFileInfosURL request file.nc_id as filelink %} + {% getNCDirInfosURL request file.nc_id as dirlink %} + {% getNextcloudURL as nc_url %} + {{filename|truncatechars:30}} +
    {% endfor %}

    {% endif %} + + {% if standard.addedquicklinks.all|length > 0 %}
    diff --git a/standards/templates/standards/standards_single_agn.html b/standards/templates/standards/standards_single_agn.html index 016cb57..e5e6aa9 100644 --- a/standards/templates/standards/standards_single_agn.html +++ b/standards/templates/standards/standards_single_agn.html @@ -72,13 +72,14 @@ - {% if standard.addedfiles.all|length > 0 %} + {% if standard.addedfiles_nc.all|length > 0 %}
    Dateien

    - {% for files in standard.addedfiles.all %} - {{files.name|truncatechars:30}}
    + {% for files in standard.addedfiles_nc.all %} + {% getNCFileInfos request files.nc_id as filename %} + {{filename|truncatechars:30}}
    {% endfor %}

    diff --git a/standards/templatetags/__pycache__/__init__.cpython-38.pyc b/standards/templatetags/__pycache__/__init__.cpython-38.pyc index 266eeb3a2ad05b97ac48e684ce3a355d27531bc7..028f00deb797a644419322a01ff5d1b035e5a56b 100644 GIT binary patch delta 45 zcmdnZxP_5Bl$V!_0SIb(eoo}JVT_#Up(>b}o>`KZlbV>GnpaX<6rYzovDFL!A`T9T delta 52 zcmdnOxSNqXl$V!_0SFvz4^QN_VN96lp(>FWpOTfBm!7Yml9`@al9-d4n4X$fQd%^z G&I|x>k`QJ9 diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 0e7989f61b32efda97afc45f836acc890e2aabc4..c62ecafdc2b4d882fa40b7014eda1efa2161e50c 100644 GIT binary patch delta 3737 zcmbtWYj9J?6~22dOR{9ic8xH0O$>$-%fgo3q!5g;Ez7t#2-#p8Y(c9E-D~?A`AV#= zz&27u!XwRVI%Jy%Q_7<>(_z{)1QiUFG-*p=LQ4Xq4egz2o8(6_ZIkJAI@2GX&a~&O z{32!2G?nIlI*&a^XZP%WcmH~o{OK)X@3q-10(?$3$f4E)hwSC#^vf=q>orBj1AF9( z;Y#VObZ)<}j|7rjn~=_PEycA9(nYR4#I+wwm$;UeOx=R>mCWT_A0gXVk?9LX%Alf! zB64U@R<#5Ts^N^^bmblrV2))TawfB7**uY4W|6A5$W_+j{2uuQbGfQmVRZ$$!s@E~ z$#t+k%&e|5SA`#bsu}Ix`@5xu(8{&ACe2~ z;PN23$=+Xnp1jG9)zpIJjhY3E&O?aPNZlCu1B4e5ZXomn=*(EFlUwZF+NG`wXskit zfA)Qpc(`Fs_-kk_?FLyvx0C@zP5g) z*i6_vmJ)V){X)_ThK1~g#XfC(XO)4?_c@4{E%)svm)LiGjiiIU>(j+9!aUAmc4Na= z$$IAYFDu>vg+p8MyaWs*yW<+|WJCV@#h&SbdF-NpoqIh_@-J8}2m<{OVIzoxmfI&| zYb<|nrgIWOiu%qram#E9*6AU=>^Gf@jh&ciGy7*}3+aQ37P3IsD(i!2#01pOj&?PW ze(=m=A9WoTxAGjBZ*6=ahb(8m?r9=5tho1Wl3{=D{gA{mw>RHQ$O!w_7DqWh1s}~+ zw*=Gmg6g!;c2?I{Pgb+-edov+JG5;c3)=G7ivB1`&e6)*AN%vfal&H#C5!|Xlhll} zCD20lu!jRawts68`$M4J_7J3pgH??Gw};hl?Iw?~ms{tt!&@Wnomrm)eJ>%jgF(-Y zQAO40>a6qL8Rsr`|F&&pKm1obeE^(c5nR(BGYBSlyzs=20*pT{k)$vz43iQ;5=#V4 zOp<*l=adL3QOg-NNCqu;*eKgN+v$qG;D@3<|Cq%_mm-(lgt^;J8qFICrHYW zG)UG`0kr%RX_CrK=1MlM+QDf|8Z~RuxQ|HI1wyHiGHLn4w&V7s=>*v#bPI%k`vs|> zTj&!cus93-lh+%YM@J%ycF8oZMAbEw^|f`Ci)1w%l@xVwO=WLSd(8ut%}tF`LtGBg z@DP=ECSdn38XZYT)Odrmrn1emxuFttRHNZFl|z~qYjC@xyVY23P zP+SRT^JFtd)P|qv2;N8%TFd8}vI?vPm~~uk~#5uA3~N@<>#ZYhyz(w-nmt zo-}LnsOE;1oiw$=;>&c=DRDgC8&x%Uq1U8)#$vK=^CYyPC{@No8uag!h?Jy-bkmR= zf_Gee(mcIBoKh$Aurj_nS#H3S5h!iqb2cw;|TG(NXR9w!@GPbs!oK8Q`?egXDrJl5$cd<`X-73*j*m zdK~Gx)CgV;j&V1H!kDSX5onzFIT4!n9f-Munenzgv*`Z-W&FL*u;^)F_|s7{EV^V%86|tl z1PpEG3|#;WZBCkxTP5IXB7AzOP54SxDlZ9ao=%#xp`fQu&bJ1t-Gf6`yu*I{~!7po0TlNb6KX+WuiA7_a5#Y7|3B3o3$_EAy zeLf;7G@__GbW=E*02ZVHBUoaP8SApZuD4AT<; delta 2154 zcmb`IdrVVT7{L48KCnelDad08V?m$=srVYrQ0U}QdHMi_;?mUiuC$gSrl;y?qQ1B-8q28sy}lm6i_7Acrg_}HpeO9_viSo3faD2@9={ltdYJ5uyPO3v zwB|WLmP2{T0$jrV1=DZ^-?Hw!xwyJjEt7- zNfN&#JV7{07$Qs%zQUX}W;|B75~gsfa1zepu_8Czz`I2w@n3U?nV+;8jV0lTEdvi1 zne68%W*H%w&_;NlFv?*uFdNAq5I!VaCy+INdPeyk7H`Ij zE8b3^_y^{qEP;)XTC2w1q6FjgGUU@McLPky*41z7U_`!Z4+}7Pvb0PK6SBQLg-lHq zn*fIKgrh)hCXC{Dj!YQAyN+VRIAyvZ+ny{ZpRV;8g|ue2gf~^KsE-Mfk1giUF(VT@ zJ%KRqEK4W*s4{_x^*=xgy?mBN$}*BtNE*iTRq4Fgt*S<~aJz1oT8MDW|29Yki+4^cdEl+kyC0I7?i!)q-??C&IVW||LRNySdE6-l7(ZGKyhd# zX#{I(AB9rvsC^B}5b7dO&Y6tgnv8g)E(6x$g8DSPRJQ~wX7#Cxt^^$DsPBa_9IY=C zY5-5nH)Axzh~|bdXvFIc3^rh8W1hK=PmaG0+QBYeXKzGe4Y+8d84ow+z-I2Z1g9FE zwhgq7UuZ&H(6HNtCNBC--<;gF)^w+w-Is@FsBWr+7A5-KCI@W6pPOmOt85ss$^~G_Qj~ENHn2ALE}bw;?Rw z-kJ}oJ1JV?)2eQs$>O&eAYikBnVpVGi*s-^DSm*`xBxGV;TbHosZ!yyp7w|?r zp^%O3#y{HZLcd};(r(2;*J9|yqpo^k@2t+A5ap#TdS<2`^kH@T7TAYxwC}TZsrnSs zE8k}&SH$$YSRgDhyK2mzGfKE&`*z_O%4)`Q+uef)xQCaIxy!&MBOmMei0t6-YX(5l z1R*FyH9j~5m71q&2LwqQ6@ofG^alj4Su>!O42q8sjEic6^Y}3GVe$z+?IHbuE~?{R zi39p59FLFcPXK7TYrAv12a}?}PiS4Evhk~jW)GUHye>P#5sQyV9wxcneWHi4_qb+g zK3haq3&Bb*MxRF#89&oS^>kFu+XZB%?WOK&Wq+^c>ttT88&c0sS7L8g7u)Ic^hMlH z2g05ZtD6g;Z;LtUV;M~Gi;|?@uE4(g-?8f+QhJI}a8Dd*T0X zsPn&d^nr#pvxBte=LpZ!CNE8Y=wg~#kJ#}q3wn_UTL$C`@djkb)RjwwD}-x=DZ&jb z^0RCU)mcR-BdjBo6DkM}9P?)m){xjp*i2|4Y$a?Xv=PFDUcw$iKVdInAK@7SZQEGx zKYroGQlOI`v0?s4@8thinfinity' + str(ncid) + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + + split_response = r.text.split("") + split_fileele = split_response[1].split("") + split_filename = split_fileele[0].split("/") + split_filenameclear = split_filename[len(split_filename)-1] + return urllib.parse.unquote(split_filenameclear) + except: + return "FAIL_TO_LOAD_NC_FILE_DATA" + +@register.simple_tag +def getNextcloudURL(): + return settings.NEXTCLOUD_URL @register.simple_tag -def getADMAbsenceWorkdaysTrue(user): - workdays_final = [] - for absence in Absence.objects.filter(user=user): - for day in daterange(absence.start, absence.end): - # Arbeitstage an diesem Tag werden geladen - workdays = Workday.objects.filter(user=absence.user, start__day=day.day, start__month=day.month, start__year=day.year, delflag=True) +def getNCFileInfosURL(request, ncid): + try: + filesearchdata = '/files/' + request.user.username + 'infinity' + str(ncid) + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + split_response = r.text.split("") + split_fileele = split_response[1].split("") + # Return file-link except first slash in string + return split_fileele[0][1:] + #return urllib.parse.unquote(split_filenameclear) + except: + return "" + +@register.simple_tag +def getNCDirInfosURL(request, ncid): + try: + filesearchdata = '/files/' + request.user.username + 'infinity' + str(ncid) + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + split_response = r.text.split("") + split_fileele = split_response[1].split("") + + # Generating Dir-Link + finaldirlink = "" + counter = 0 + dirpre = split_fileele[0].split("/") + dirpre.pop(0) + dirpre.pop(0) + dirpre.pop(0) + dirpre.pop(0) + dirpre.pop(0) + for ele in dirpre: + if counter < len(dirpre) - 1: + finaldirlink += ele + "/" + counter += 1 + # Return file-link except first slash in string + return finaldirlink[:-1] + #return urllib.parse.unquote(split_filenameclear) + except: + return "" + - # Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat. - for workday in workdays: - workdays_final.append(workday) - return workdays_final \ No newline at end of file diff --git a/standards/urls.py b/standards/urls.py index 041839c..9e45802 100644 --- a/standards/urls.py +++ b/standards/urls.py @@ -26,6 +26,8 @@ urlpatterns = [ path('standardsagn/', views.StandardFromAgn, name="standard-agn"), path('standardcopy/', views.CopyStandard, name="standard-copyagn"), path('loadaggroupm/', views.LoadAGGroupMembers, name="standard-loadaggroupmembers"), - path('standard/update/', views.UpdateStandardBeforeUserDel, name="standard-update-before-user-del") + path('standard/update/', views.UpdateStandardBeforeUserDel, name="standard-update-before-user-del"), + path('standard/download/', views.getFileFromStandard, name="standard-loadfile"), + path('standard/upload/', views.uploadFileFromStandard, name="standard-uploadfile") ] \ No newline at end of file diff --git a/standards/views.py b/standards/views.py index 9394383..a7e6853 100644 --- a/standards/views.py +++ b/standards/views.py @@ -1,8 +1,9 @@ +from os import SEEK_CUR from django.shortcuts import render, redirect from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView, View -from .models import Standards, StandardComments, StandardCommentRate +from .models import NCFile, Standards, StandardComments, StandardCommentRate from django.contrib import messages from django.http import HttpResponse, JsonResponse from .forms import StandardAddStandard, StandardAddStandardEditor, StandardUpdateStandard, StandardUpdateStandardEditor @@ -77,6 +78,11 @@ class StandardsManagement(LoginRequiredMixin, ListView): return context +@login_required +def getFileFromStandard(request, nc_id): + print(nc_id) + return JsonResponse({}) + @login_required def checkUserDirRights(request, startdir, userid): @@ -109,6 +115,10 @@ def checkUserDirRights(request, startdir, userid): canview = False return canview +# NEW FOR NC +import requests +from django.conf import settings +from digitaleagentur.utils import * @login_required def StandardAdd(request, id=False): @@ -203,11 +213,24 @@ def StandardAdd(request, id=False): if(s.isdigit()): new_standard.linked_standards.add(Standards.objects.get(pk=s)) + # ADD FILES + #files = normalForm.cleaned_data['added_files'].split(",") + #for f in files: + # if(f.isdigit()): + # new_standard.addedfiles.add(DataFile.objects.get(pk=f)) + # ADD FILES files = normalForm.cleaned_data['added_files'].split(",") for f in files: if(f.isdigit()): - new_standard.addedfiles.add(DataFile.objects.get(pk=f)) + ncfile = NCFile.objects.filter(nc_id=f).first() + # Wenn die NC-File in Django nicht existiert, dann neu erstellen und hinzufügen. Trifft für Dateien zu, die zwar in den Dateien waren, aber noch nicht in der NC! + if(ncfile == None): + new_nc_file = NCFile(nc_id=f, agency=new_standard.agency) + new_nc_file.save() + new_standard.addedfiles_nc.add(new_nc_file) + else: + new_standard.addedfiles_nc.add(ncfile) # ADD QUICKLINKS quicklinks = normalForm.cleaned_data['added_quicklinks'].split(",") @@ -240,19 +263,50 @@ def StandardAdd(request, id=False): else: normalForm = StandardAddStandard(instance=request.user) editorForm = StandardAddStandardEditor(instance=request.user) - + + possibleFilesByVisible = [] + # NC FILE + # Data for the new User + if(request.user.is_authenticated and getNCLoggedUserBySession(request.user.profile.nc_sid)): - allfiles = DataFile.objects.filter(agency=request.user.profile.agency) + data_nc = { + "Depth" : 0 + } - for f in allfiles: - actParent = DataDir.objects.get(pk=f.parent.pk) - if actParent.is_root: - possibleFilesByVisible.append(f) - else: - if(checkUserDirRights(request, actParent, request.user.pk)): - possibleFilesByVisible.append(f) + nc_login_headers = {'Authorization' : 'Bearer ' + request.user.profile.nc_sid} + r = requests.request("PROPFIND", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten_1/", headers=nc_login_headers, data=data_nc) + print(r.text) + + #allfiles = DataFile.objects.filter(agency=request.user.profile.agency) + + #for f in allfiles: + # actParent = DataDir.objects.get(pk=f.parent.pk) + # if actParent.is_root: + # possibleFilesByVisible.append(f) + # else: + # if(checkUserDirRights(request, actParent, request.user.pk)): + # possibleFilesByVisible.append(f) + possibleFilesByVisible = [] + + filesearchdata = '/files/' + request.user.username + '/Agenturdaten/infinity1' + #filesearchdata = 'infinity' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + # IDs filtern aus XML-Response + try: + split_response = r.text.split("") + + # Header des XML-Response entfernen + split_response.pop(0) + + # IDs from the User + for ele in split_response: + new_id = ele.split("")[0] + possibleFilesByVisible.append(new_id) + + except: + pass context = { 'normalForm' : normalForm, @@ -261,7 +315,7 @@ def StandardAdd(request, id=False): 'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency), 'usersofagency' : User.objects.filter(profile__agency=request.user.profile.agency), 'files' : possibleFilesByVisible, - 'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk, + #'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk, 'standards' : Standards.objects.filter(agency=request.user.profile.agency, public=True), 'quicklinks' : QuickLinks.objects.filter(agency=request.user.profile.agency), 'contacts' : AGContacts.objects.filter(agency=request.user.profile.agency), @@ -271,14 +325,10 @@ def StandardAdd(request, id=False): return render(request, 'standards/standards_add.html', context) # UPDATE A STANDARD else: + standard = Standards.objects.get(pk=id, agency=request.user.profile.agency) # SAVE UPDATED STANDARD if request.method == 'POST': - - - - - # CHECK IF USER HAS RIGHTS TO SEE THIS DIR groupsofstandard = standard @@ -320,7 +370,7 @@ def StandardAdd(request, id=False): standard.visibleby.clear() standard.linked_standards.clear() - standard.addedfiles.clear() + standard.addedfiles_nc.clear() standard.addedquicklinks.clear() standard.addedpasswords.clear() standard.addedcontacts.clear() @@ -379,7 +429,14 @@ def StandardAdd(request, id=False): files = normalForm.cleaned_data['added_files'].split(",") for f in files: if(f.isdigit()): - standard.addedfiles.add(DataFile.objects.get(pk=f)) + ncfile = NCFile.objects.filter(nc_id=f).first() + # Wenn die NC-File in Django nicht existiert, dann neu erstellen und hinzufügen. Trifft für Dateien zu, die zwar in den Dateien waren, aber noch nicht in der NC! + if(ncfile == None): + new_nc_file = NCFile(nc_id=f, agency=standard.agency) + new_nc_file.save() + standard.addedfiles_nc.add(new_nc_file) + else: + standard.addedfiles_nc.add(ncfile) # ADD QUICKLINKS quicklinks = normalForm.cleaned_data['added_quicklinks'].split(",") @@ -502,8 +559,6 @@ def StandardAdd(request, id=False): return redirect('/standards') # SHOW EXISTING STANDARD else: - - # CHECK IF USER HAS RIGHTS TO SEE THIS DIR groupsofstandard = standard @@ -518,33 +573,54 @@ def StandardAdd(request, id=False): userisingroup = True if userisingroup: - - - - - normalForm = StandardUpdateStandard(instance=standard) editorForm = StandardUpdateStandardEditor(instance=standard) + + # TODO: Hier ändern, dass NC die Dateien anbietet! # GET ALL DATAS FROM STANDARD # FILES possibleFilesByVisible = [] - allfiles = DataFile.objects.filter(agency=request.user.profile.agency) + #allfiles = DataFile.objects.filter(agency=request.user.profile.agency) # Get all files by view - for f in allfiles: - actParent = DataDir.objects.get(pk=f.parent.pk) - if actParent.is_root: - possibleFilesByVisible.append(f) - else: - if(checkUserDirRights(request, actParent, request.user.pk)): - possibleFilesByVisible.append(f) + #for f in allfiles: + # actParent = DataDir.objects.get(pk=f.parent.pk) + # if actParent.is_root: + # possibleFilesByVisible.append(f) + # else: + # if(checkUserDirRights(request, actParent, request.user.pk)): + # possibleFilesByVisible.append(f) # Remove files which are in standard - for f in possibleFilesByVisible: - if f in standard.addedfiles.all(): - possibleFilesByVisible.remove(f) + #for f in possibleFilesByVisible: + # if f in standard.addedfiles.all(): + # possibleFilesByVisible.remove(f) + filesearchdata = '/files/' + request.user.username + '/Agenturdaten/infinity1' + #filesearchdata = 'infinity' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + # IDs filtern aus XML-Response + try: + split_response = r.text.split("") + + # Header des XML-Response entfernen + split_response.pop(0) + + # IDs from the User + for ele in split_response: + new_id = ele.split("")[0] + + file_free = True + # Prüfen, dass diese IDs nicht im aktuellen Standard sind + for sf in standard.addedfiles_nc.all(): + if str(sf.nc_id) == str(new_id): + file_free = False + + if file_free == True: + possibleFilesByVisible.append(new_id) + except: + pass # STANDARDS possible_standards = [] @@ -652,7 +728,8 @@ def StandardAdd(request, id=False): 'possible_contacts' : possible_contacts, 'agencynetworks' : agencynetworks, 'agencygroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency), - 'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk, + #'parentid' : list(DataDir.objects.filter(agency=request.user.profile.agency, is_root=True))[0].pk, + 'parentid' : 0, 'active_link' : 'standards', 'update' : True, 'aggroups' : AgencyGroup.objects.filter(agency=request.user.profile.agency) @@ -748,6 +825,8 @@ def StandardChangePublic(request, pk): standard.save() return redirect('standards') +# TODO: Upload der Standard-Dateien passt noch nicht, BUG!!!! + @login_required def StandardSingle(request, pk): @@ -811,13 +890,11 @@ def CopyStandard(request, pk): new_standard.save() - datadir_parentid = list(DataDir.objects.filter(is_defaultstandard=True, agency__pk=request.user.profile.agency.pk))[0] - - for f in sc.addedfiles.all(): - tempdatafile = DataFile(file=f.file, name=f.name, owner=request.user, parent=datadir_parentid, agency=request.user.profile.agency) + #datadir_parentid = list(DataDir.objects.filter(is_defaultstandard=True, agency__pk=request.user.profile.agency.pk))[0] + for f in sc.addedfiles_nc.all(): + tempdatafile = NCFile(agency=request.user.profile.agency, nc_id=f.nc_id) tempdatafile.save() - new_standard.addedfiles.add(tempdatafile) - # TASK: Hier das kopieren der Dateien auf dem Server noch einfügen + new_standard.addedfiles_nc.add(tempdatafile) # Sende Info, dass ein Standard übernommen wurde, an die Erstelleragentur usersofagency = User.objects.filter(profile__agency=sc.agency) @@ -1115,3 +1192,50 @@ def UpdateStandardBeforeUserDel(request): return JsonResponse({"success" : success}) + +''' + UPLOADING A FILE + + Replace the function in the App CLOUD +''' +@login_required +def uploadFileFromStandard(request): + success = True + if request.method == 'POST': + + request.decoding = 'utf-8' + + # VALIDATE FILE-TYPE + file_ext_arr = request.FILES['uploadedfile'].name.split(".") + file_ext = file_ext_arr[len(file_ext_arr)-1] + allowed_types = ["txt", "TXT", "png", "PNG", "jpeg", "JPEG", "jpg", "JPG", "PDF", "pdf", "csv", "CSV", "DOC", "doc", "DOCX", "docx", "ODT", "odt", "PPT", "ppt", "PPTX", "pptx", "XLS", "xls", "XLSX", "xlsx", "xlsm", "XLSM", "mov", "MOV", "SVG", "svg", "ZIP", "zip", "RAR", "rar", "EPS", "eps", "MP3", "mp3", "WAV", "wav", "avi", "AVI", "FLV", "flv", "MP4", "mp4", "PAGES", "pages", "NUMBERS", "numbers", "ics", "ICS"] + file_ok = False + + for t in allowed_types: + if t == file_ext: + file_ok = True + + if(file_ok): + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten/Standards Uploadbereich/" + request.FILES['uploadedfile'].name + + r = requests.put(final_file_path, data=request.FILES['uploadedfile'], headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + if(len(r.text) == 0): + try: + new_file_name = request.FILES['uploadedfile'].name + # Upload OK - get File-ID in NC + filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + #print(r.text) + split_response = r.text.split("") + new_id = split_response[1].split("")[0] + + tf = NCFile(agency=request.user.profile.agency, nc_id=new_id) + tf.save() + return JsonResponse({"success" : success, "data" : {'savedobj_id' : new_id, 'savedobj_name' : new_file_name}}) + except: + success = True + return JsonResponse({"success" : success, "data" : {'savedobj_id' : None, 'savedobj_name' : 'Datei hochgeladen, enthält aber falsche Zeichen. Bitte Seite neu laden und anschließend über Suchfeld hinzufügen.'}}) + + return JsonResponse({"success" : success, "data" : "DONE!"}) + + return JsonResponse({"success" : success, "data" : "DONE!"}) \ No newline at end of file diff --git a/timemanagement/templates/timemanagement/realtime_dropdown_nc_iframe.html b/timemanagement/templates/timemanagement/realtime_dropdown_nc_iframe.html new file mode 100644 index 0000000..69ed6ac --- /dev/null +++ b/timemanagement/templates/timemanagement/realtime_dropdown_nc_iframe.html @@ -0,0 +1,337 @@ + + +{% load counter_tag %} +{% load static %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + +
    + Arbeitsbeginn: 00:00:00
    + Arbeitsende: 00:00:00
    + Pausenzeit: 00:00:00 +
    +
    +
    + +
    +
    +{% loadaccounttime request.user as actualaccounttime %} +Gleitzeitkonto: +{% if actualaccounttime.1 == 0 %} + +{{actualaccounttime.0}} Stunden +{% else %} + -{{actualaccounttime.0}} Stunden +{% endif %} +
    + + + + + diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html index 21b7934..91b39cb 100644 --- a/timemanagement/templates/timemanagement/rendered_table.html +++ b/timemanagement/templates/timemanagement/rendered_table.html @@ -315,7 +315,6 @@ document.getElementById("choosenyear").addEventListener("change", function(){ choosenyear = $('#choosenyear :selected').val(); }) - var selectedElements = []; var active_row = ""; var sameday = false; @@ -689,7 +688,7 @@ $( function() { /* Functions for Kalendar */ -/* + function prevMonth(){ $.ajax( { @@ -751,7 +750,7 @@ function showNewAbsenceByUser(){ function goFastToMonth(month){ location.href = "/tm/abs/" + month +"/" + choosenyear } -*/ + diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html index 74d64b8..b7d067c 100644 --- a/timemanagement/templates/timemanagement/tm_ab_management.html +++ b/timemanagement/templates/timemanagement/tm_ab_management.html @@ -572,8 +572,7 @@ $('#absencetabs a').on('click', function (e) { } localStorage.setItem('activeTabAbsence', lastview_name); }); - - +/* function prevMonth(){ $.ajax( { @@ -589,6 +588,7 @@ $('#absencetabs a').on('click', function (e) { request.setRequestHeader("X-Requested-With", "XMLHttpRequest"); }, success : function(data){ + console.log(data); $("#overlay").fadeOut(); $("#rendered_table").html(data); } @@ -615,7 +615,7 @@ function nextMonth(){ } }); } - +*/ /* Functions for Kalender diff --git a/timemanagement/templates/timemanagement/tm_ab_update.html b/timemanagement/templates/timemanagement/tm_ab_update.html index a41c1c4..99d33d0 100644 --- a/timemanagement/templates/timemanagement/tm_ab_update.html +++ b/timemanagement/templates/timemanagement/tm_ab_update.html @@ -196,8 +196,10 @@ date_start = new Date(new_start[2], (parseInt(new_start[1])-1), new_start[0]); date_end = new Date(new_end[2], (parseInt(new_end[1])-1), new_end[0]); - $("#id_start").data("DateTimePicker").date(date_start); - $("#id_end").data("DateTimePicker").date(date_end); + if(date_start != undefined && date_end != undefined){ + $("#id_start").data("DateTimePicker").date(date_start); + $("#id_end").data("DateTimePicker").date(date_end); + } if(+new_start == +new_end){ sameday = true; diff --git a/timemanagement/urls.py b/timemanagement/urls.py index efa88ae..3015ede 100644 --- a/timemanagement/urls.py +++ b/timemanagement/urls.py @@ -1,6 +1,6 @@ from django.urls import path from django.contrib.auth.decorators import login_required, permission_required -from .views import TimeManagement, TimeAjax, AbsenceManagmenet, AbsenceUpdate, TimeUpdate, AddBreak, TimeAdd, TimeManagementTeamSingle +from .views import TimeManagement, TimeAjax, AbsenceManagmenet, AbsenceUpdate, TimeUpdate, AddBreak, TimeAdd, TimeManagementTeamSingle, GetRealtimeDropDown ''' Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben! ''' @@ -20,5 +20,5 @@ urlpatterns = [ path('abs//', AbsenceManagmenet, name='tma-management'), path('ajax/', TimeAjax, name='tm-ajax'), path('abs/update//', AbsenceUpdate, name='tma-update'), - + path('abs/getncdd/', GetRealtimeDropDown, name='tma-getrealtimedd'), ] diff --git a/timemanagement/views.py b/timemanagement/views.py index 8395fca..60a1c4a 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -23,6 +23,14 @@ from django.template.loader import render_to_string from django.core.mail import send_mail from digitaleagentur.utils import * +# LÖSCHEN? +from django.contrib.auth import login +def GetRealtimeDropDown(request, uid): + user = User.objects.get(username=uid) + if(getNCLoggedUserBySession(user.profile.nc_sid) == uid): + login(request, user) + return render(request, 'timemanagement/realtime_dropdown_nc_iframe.html', {}) + # Load freedays def loadingFreeDays(plz): # Getting land @@ -414,7 +422,7 @@ def TimeManagement(request, activemonth=False, activeyear=False): def TimeUpdate(request, pk, team=0): workday = Workday.objects.get(pk=pk) user = workday.user - if(request.user.profile.agency == workday.agency): + if(request.user.profile.agency == workday.agency and request.user.has_perm('users.usermanager')): if(request.method == "POST"): if(team == 0): form = UpdateWorkdayForm(request.POST, instance=request.user) @@ -786,6 +794,9 @@ def TimeAjax(request): nextmonth = "" activemonth = int(request.GET["activemonth"]) activeyear = int(request.GET["activeyear"]) + + print(activemonth) + print(activeyear) #MONTH if(not activemonth or activemonth > 12 or activemonth < 1): diff --git a/users/admin.py b/users/admin.py index d625cf5..dd29574 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,10 +1,10 @@ from django.contrib import admin from .models import Profile, Agency, AgencyGroup, AgencyJob, AgencyNetwork, AgencyNetworkPreperation, UserTime, UserYearAbsenceInfo, UserNotifications, AgencyBills, RegNotfallhilfe from .priomodel import Prio -from standards.models import StandardCommentRate, StandardComments +from standards.models import StandardCommentRate, StandardComments, NCFile from django.contrib.auth.models import Permission from message.models import Message -from cloud.models import DataFile +from cloud.models import DataFile, DataDir from organizer.models import AGContacts from timemanagement.models import Workday, Breaks, AbsenceReason, FreeDays, Absence from chat.models import ChatRoom @@ -26,6 +26,7 @@ admin.site.register(AgencyNetwork) admin.site.register(AGContacts) admin.site.register(AgencyNetworkPreperation) admin.site.register(DataFile) +admin.site.register(DataDir) admin.site.register(UserTime) admin.site.register(Workday) admin.site.register(Breaks) @@ -43,4 +44,5 @@ admin.site.register(RDContact) admin.site.register(RecoverDirSetting) admin.site.register(MainStatistic) admin.site.register(RegNotfallhilfe) -admin.site.register(AGBLog) \ No newline at end of file +admin.site.register(AGBLog) +admin.site.register(NCFile) \ No newline at end of file diff --git a/users/mainwebsocket.py b/users/mainwebsocket.py_DELETE similarity index 99% rename from users/mainwebsocket.py rename to users/mainwebsocket.py_DELETE index aa843ab..a1b0f08 100644 --- a/users/mainwebsocket.py +++ b/users/mainwebsocket.py_DELETE @@ -1,3 +1,4 @@ + import json from channels.generic.websocket import WebsocketConsumer from asgiref.sync import async_to_sync @@ -9,7 +10,7 @@ from django.contrib.auth.models import User from rest_framework.authtoken.models import Token class UsersConsumer(WebsocketConsumer): - + appconnect = False ''' diff --git a/users/middleware/__init__.py b/users/middleware/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/middleware/__pycache__/__init__.cpython-38.pyc b/users/middleware/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d713153003039236f82964d51084dc7cfb6c4504 GIT binary patch literal 174 zcmWIL<>g`k0+9(n6F~H15P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;x_;erR!OQL%nT zNl{{ML8`uAYDGzMPJU^Men3%XSz?L4yJv`gN@jXyNn%cFVtQ&`Noi4hUb22ESXXXl oN=i;@d16tjetdjpUS>&ryk0@&Ee@O9{FKt1R6CGmpMjVG08H*JAOHXW literal 0 HcmV?d00001 diff --git a/users/middleware/__pycache__/oauth.cpython-38.pyc b/users/middleware/__pycache__/oauth.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..af5e27b6586a80dbf7f4cbff1b1971cac7b41341 GIT binary patch literal 3569 zcma)9UvJ#T5#L?@J&N~7wqi?elNfm@as_fSjHX3e#jR_*u~GYC#4_v>C|HWSl6c}B z&$~R^I`H};1M!QCz7;5n-~{x=K!JXPJmy2}YoGEJiU!Wi@?^=XftCj@hr6@G-TBS@ zX77Hp84$Q0Z2adB|6C^IU-)wJvf<@daI1en!wIK3iSWsCI%E-}C|kKTv?JTdcJ2(_ z$ThN)dqY3+jqK))VGspI_VT4+7==dm^X9M>wTA7eZQdJsXSf_K8#&0&49`Yqhbz&F zd0)!k8J>&I8JXtiqw{7xtI_IbgonKOjPRxi53Fd7(|e@b`W9A9`Y);WqSsBODfhpQ467V5x)>b0l z*5QsQV=2_Q7%B0R>P8%=d7@Mtza;;@yN-@g>${~)hGVhb7f;JHFD88buFM`M<@#s0 zHrIK!la)y>5^!rdk?|;9pO{(0*REeT-|UU|B?Kwyz^#n`Xh^54r?%WXTJ9TL_hF6; zH*R13h~m}<;PSnOyoAzq^85E@>^T{*xmB@4DmxXK+t0}%WrTu59(4>b0L?RhW*Hga z0oks|z!|t;!vo*|sEmT_bFZ>8`WNd@bmr7nxer#q0jmwPN=fC+1C(HNi8nUD_4BX- z-9u(p^$qsVn*cHN%-qT~yodEf2Ptu>N}+KHV+T!%&WYk zvC6Kz1N{18cg6zldx;0I24~)Rj-K&(um%<}r1~kk?C3g*p0m)QTF_Lu1mJ}YU;CDl0}^ORj-t)RbZy0%bQg3OY>E6cp+=iJ>XaV}o(2!^xN@rKkrlK+gj2 zfKER?jrUj<#?T_odmDL?Cb_!OJ82^Y$X{O=2pG#|7hi!;kr@QTjA1AYSVcK~LFd*X zQ4dR-lhT1+7qjvO<@O6Uvnp%u9YSCjeZQiW#U1Ep6|1bcaWpz=nQ^zahoc6>zj7CR z7R({10U{Rz<2(Tf8$9@%HM27^bIPUXq+$n#U%{(OeWVghicvBY-{MxFgN^qv3$a_f zm^|rzm&tcwPmlc3zgxsl8p1aG(xtqt5B@IGgT@bniaw{MP6? zjBh1MybpHOMQ8}Ksm;#NbJV9D>e7Iix}| z@%=Au#}97a+Prc5*1gSp+8!t6t_~DMP$0VYCCk7C;U^wgT`6AO$coegA*J{YITYTEIZQ2Dkbf&7Y+862#pA&lAe*vCM$Gy9MBL-IQ^Vh?ND z_4>yNZcAx;Vi@x*Ep?EoSUerW>4%%R zl%JpiEB3TA26LsvvfFj!6`YK4*THT9uWKr5JYTc8`~@g{0k^`)BCG`n*=!XOlF?P_ zS}vf|p%>Wn;%S6V$KV_6jr51*+(6U=VY&kDg&OoJ@Hjl#r|7~Ja3KX3en^3*=}Bi< z{hE!iC;?%bsP}&>_RX>I1k)Vv!1J+lT>CIuh*izIOZac<43q2v`Fam{ONTpbnqA#;Q0;9 zMjY!Pj)w)G6ZHW!DxROGOP6L7zS zDwxBv4Gl7yIUV?{W&2kc4bH*snX&E#&7_Ec9?hX#^%96SjHKuy5=)+K^&rl~jx?o6 z^^n?+7zBea`rxfJo)<2`Vq$d##ert0Yni)ks;O$lGbB_3&+qIvc$3Z@du uCVsYk>I_`h1Yr2uN7}|ZZQOUl=f^SOZ`80}!PGDZdkoOyUk9lZZ}vSRt&4yF literal 0 HcmV?d00001 diff --git a/users/middleware/oauth.py b/users/middleware/oauth.py new file mode 100644 index 0000000..1630b00 --- /dev/null +++ b/users/middleware/oauth.py @@ -0,0 +1,116 @@ +import re +from requests.api import request +from authlib.integrations.base_client import OAuthError +from authlib.integrations.django_client import OAuth +from authlib.oauth2.rfc6749 import OAuth2Token +from django.shortcuts import redirect +from django.utils.deprecation import MiddlewareMixin +from users.models import Agency, Profile +from django.contrib.auth.models import User +from django.contrib.auth import login, logout +from digitaleagentur import settings +import requests, json + +class OAuthMiddleware(MiddlewareMixin): + + def __init__(self, get_response=None): + super().__init__(get_response) + self.oauth = OAuth() + + def process_request(self, request): + if settings.OAUTH_URL_WHITELISTS is not None: + for w in settings.OAUTH_URL_WHITELISTS: + if request.path.startswith(w): + return self.get_response(request) + + def update_token(token, refresh_token, access_token): + request.session['token'] = token + return None + + # Check, if logged user is in Database - if not, create and save by SUB + def checkUserInDatabase(userdata): + # Get sub of current user + sub = userdata + activeuser = None + # Check in Database, if user exist - if not, create new user + if not User.objects.filter(username = sub).exists(): + pr = Profile(user=None, agency=Agency.objects.get(pk=1)) + pr.save() + activeuser = User.objects.create(username=sub, profile=pr) + pr.user = activeuser + pr.save() + else: + activeuser = User.objects.get(username=sub) + + if activeuser is not None: + headers = { + 'Authorization': 'Bearer ' + request.session.get('token').get('access_token'), + 'Content-Type': 'application/json', + 'Accept': 'application/json', + } + data = {} + #response = requests.get("http://localhost:8080/apps/agency/getcurrentuser", data=data, headers=headers) + #print(response.text) + login(request, activeuser) + + sso_client = self.oauth.register( + settings.OAUTH_CLIENT_NAME, overwrite=True, **settings.OAUTH_CLIENT, update_token=update_token + ) + if request.path.startswith('/oauth/callback'): + self.clear_session(request) + request.session['token'] = sso_client.authorize_access_token(request) + if self.get_current_user(sso_client, request) is not None: + redirect_uri = request.session.pop('redirect_uri', None) + if redirect_uri is not None: + return redirect(redirect_uri) + return redirect('users-dashboard') + + if request.session.get('token', None) is not None: + #current_user = self.get_current_user(sso_client, request) + current_user = request.session.get('token').get('user_id') + if current_user is not None: + checkUserInDatabase(current_user) + return self.get_response(request) + + # remember redirect URI for redirecting to the original URL. + request.session['redirect_uri'] = request.path + return sso_client.authorize_redirect(request, settings.OAUTH_CLIENT['redirect_uri']) + + # fetch current login user info + # 1. check if it's in cache + # 2. fetch from remote API when it's not in cache + @staticmethod + def get_current_user(sso_client, request): + token = request.session.get('token', None) + if token is None or 'access_token' not in token: + return None + + if not OAuth2Token.from_dict(token).is_expired() and 'user' in request.session: + return request.session['user'] + + try: + res = sso_client.get(settings.OAUTH_CLIENT['userinfo_endpoint'], token=OAuth2Token(token)) + if res.ok: + #request.session['user'] = res.json() + #request.session['user'] = res + return True + #return res.json() + else: + print(res) + except OAuthError as e: + print(e) + + return None + + @staticmethod + def clear_session(request): + try: + del request.session['user'] + del request.session['token'] + except KeyError: + pass + + def __del__(self): + print('destroyed') + + diff --git a/users/models.py b/users/models.py index 3db38a3..5ee1d66 100644 --- a/users/models.py +++ b/users/models.py @@ -139,7 +139,8 @@ class Agency(models.Model): vve = models.CharField(default="", max_length=200, blank=True) - + # NC IMPORT + importid = models.CharField(default="", max_length=200, blank=True) # RECOVERDIR module_recoverdir = models.BooleanField(default=False) @@ -214,6 +215,8 @@ class Profile(models.Model): phonemobile = models.CharField(max_length=60, blank=True) phone_public = models.BooleanField(default=False) + nc_sid = models.CharField(max_length=200, blank=True) + # Wenn die Funktion gelöscht wird, wird die FUNC auf NULL gesetzt func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht @@ -479,6 +482,7 @@ class AgencyGroup(models.Model): group = models.OneToOneField(Group, on_delete=models.CASCADE) agency = models.ForeignKey(Agency, on_delete=models.CASCADE) agencygroupname = models.CharField(max_length=60, blank=True) + nc_name = models.CharField(max_length=200, blank=True) savefordel = models.BooleanField(default=False) is_admin = models.BooleanField(default=False) @@ -532,11 +536,11 @@ class UserFullName(User): return f'{self.first_name + " " + self.last_name}' # Hier Audit-Logeinträge einbauen für die versch. Models -from django.utils.six import python_2_unicode_compatible -from auditlog.registry import auditlog +#from django.utils.six import python_2_unicode_compatible +#from auditlog.registry import auditlog -auditlog.register(User) -auditlog.register(Agency) +#auditlog.register(User) +#auditlog.register(Agency) diff --git a/users/routing.py b/users/routing.py index d93fd31..1ec7fc8 100644 --- a/users/routing.py +++ b/users/routing.py @@ -1,3 +1,4 @@ +''' from django.urls import re_path from . import mainwebsocket @@ -7,4 +8,5 @@ websocket_urlpatterns = [ re_path(r'ws/groupchat/(?P\w+)/$', mainwebsocket.GroupChat, name="ws-groupchat"), re_path(r'ws/appchat/(?P\w+)/(?P\w+)/(?P\w+)/$', mainwebsocket.UsersChat, name="ws-appchat"), re_path(r'ws/', mainwebsocket.UsersConsumer, name="ws-default"), -] \ No newline at end of file +] +''' \ No newline at end of file diff --git a/users/signals.py b/users/signals.py index 8570cca..c8f8a83 100644 --- a/users/signals.py +++ b/users/signals.py @@ -27,14 +27,24 @@ from asgiref.sync import async_to_sync from django.contrib.auth.decorators import login_required from datetime import timedelta from django.core.signals import request_started -from channels_presence.models import Room -from channels_presence.models import Presence -from channels_presence.signals import presence_changed +#from channels_presence.models import Room +#from channels_presence.models import Presence +#from channels_presence.signals import presence_changed from organizer.models import * from chat.models import ChatMessage from digitaleagentur.utils import * +from django.core.signals import request_finished +from django.dispatch import receiver + + +@receiver(request_finished) +def loginController(sender, **kwargs): + pass + + + def loadingFreeDays(plz, year): # Getting land file_path = os.path.join(settings.STATIC_ROOT, 'users/extra/plz_short.csv') @@ -177,6 +187,7 @@ def save_profile(sender, instance, **kwargs): # SIGNALS FOR GROUPS # Signal für das Ändern von Gruppenrechten +''' @receiver(signal=m2m_changed, sender=Group.permissions.through) def adjust_group_notifications_permission(instance, action, reverse, model, pk_set, using, *args, **kwargs): group_touched = AgencyGroup.objects.get(group=instance) @@ -191,8 +202,8 @@ def adjust_group_notifications_permission(instance, action, reverse, model, pk_s newnotification = UserNotification(touser=user, notificationtext="Die Gruppe " + group_touched.agencygroupname + " hat neue Rechte erhalten.", notificationtype="groupchanges") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Die Gruppe " + group_touched.agencygroupname + " hat neue Rechte erhalten."}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Die Gruppe " + group_touched.agencygroupname + " hat neue Rechte erhalten."}) # Rechte wurden entfernt elif(action == "post_remove"): @@ -205,12 +216,14 @@ def adjust_group_notifications_permission(instance, action, reverse, model, pk_s newnotification = UserNotification(touser=user, notificationtext="Der Gruppe " + group_touched.agencygroupname + " wurden Rechte entzogen.", notificationtype="groupchanges") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Der Gruppe " + group_touched.agencygroupname + " wurden Rechte entzogen."}) - + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Der Gruppe " + group_touched.agencygroupname + " wurden Rechte entzogen."}) +''' # Signal, wenn ein Nutzer aus der Gruppe entfernt/hinzugefügt wird +''' @receiver(signal=m2m_changed, sender=User.groups.through) def adjust_group_notifications(instance, action, reverse, model, pk_set, using, *args, **kwargs): + if isinstance(instance, Group): group_touched = AgencyGroup.objects.get(group=instance) userid = list(pk_set)[0] @@ -221,8 +234,8 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using, newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden aus der Gruppe " + group_touched.agencygroupname + " entfernt.", notificationtype="groupchanges") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Sie wurden aus der Gruppe " + group_touched.agencygroupname + " entfernt."}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Sie wurden aus der Gruppe " + group_touched.agencygroupname + " entfernt."}) # A USER WAS ADDED TO A GROUP elif(action == 'post_add'): @@ -230,8 +243,8 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using, newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden zur Gruppe " + group_touched.agencygroupname + " hinzugefügt.", notificationtype="groupchanges") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Sie wurden zur Gruppe " + group_touched.agencygroupname + " hinzugefügt."}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Gruppenaktivität | Sie wurden zur Gruppe " + group_touched.agencygroupname + " hinzugefügt."}) # E-MAILNOTIFICATIONS FOR GROUPCHANGES if(user_touched.usernotifications.group_activity_mail): @@ -265,7 +278,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using, html_message=msg_html, fail_silently=True ) - +''' # SIGNALS FOR STANDARDS # DELETE @@ -274,6 +287,7 @@ def delete_standard(sender, instance, **kwargs): newNotifiyPush(2, instance, " es wurde ein neuer Agenturstandard gelöscht: ", "Agenturstandard gelöscht: ", "Standards | ", "", "") # SAVE AND UPDATE +''' @receiver(post_save, sender=Standards) def save_standard(sender, instance, **kwargs): targeturl = settings.BASE_URL + "standards/standard/" + str(instance.pk) + "/single" @@ -290,8 +304,8 @@ def save_standard(sender, instance, **kwargs): newnotification = UserNotification(touser=user, notificationtext="Neuer unveröffentlichter Agenturstandard: " + instance.name, notificationtype="newstandard", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Standards | Neuer unveröffentlichter Agenturstandard: " + instance.name}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Standards | Neuer unveröffentlichter Agenturstandard: " + instance.name}) if(user.has_perm("users.standardmanager") and user.usernotifications.standard_created_unpub_mail): notificationtext = " es wurde ein neuer unveröffentlichter Agenturstandard erstellt: " + instance.name @@ -299,9 +313,10 @@ def save_standard(sender, instance, **kwargs): # Standard wurde aktualisiert else: newNotifiyPush(1, instance, " es wurde ein neuer Agenturstandard aktualisiert: ", "Agenturstandard aktualisiert: ", "Standards | ", "newstandard", targeturl) - +''' # SIGNAL FOR NEWS +''' @receiver(post_save, sender=News) def save_news(sender, instance, **kwargs): if(kwargs["created"]): @@ -313,9 +328,10 @@ def save_news(sender, instance, **kwargs): else: instance.agnotify = False instance.save() - +''' # SIGNALS FOR TASK +''' @receiver(signal=m2m_changed, sender=Tasks.usersfield.through) def adjust_group_notifications_task(instance, action, reverse, model, pk_set, using, *args, **kwargs): @@ -329,16 +345,16 @@ def adjust_group_notifications_task(instance, action, reverse, model, pk_set, us newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden von der Tätigkeit " + taskname + " entfernt.", notificationtype="taskchange") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Tätigkeitsbereich | Sie wurden von der Tätigkeitn " + instance.name + " entfernt."}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Tätigkeitsbereich | Sie wurden von der Tätigkeitn " + instance.name + " entfernt."}) # A USER WAS ADDED TO A GROUP elif(action == 'post_add'): newnotification = UserNotification(touser=user_touched, notificationtext="Sie wurden der Tätigkeit " + taskname + " zugeordnet.", notificationtype="taskchange") newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Tätigkeitsbereich | Sie wurden der Tätigkeitn " + instance.name + " zugeordnet."}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user_touched.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Tätigkeitsbereich | Sie wurden der Tätigkeitn " + instance.name + " zugeordnet."}) # E-MAILNOTIFICATIONS FOR GROUPCHANGES if(user_touched.usernotifications.task_activity_mail): @@ -351,6 +367,7 @@ def adjust_group_notifications_task(instance, action, reverse, model, pk_set, us elif(action == 'post_add'): notificationtext = "Sie wurden der Tätigkeit " + taskname + " zugeordnet." sendMailNoti(notificationtext, user_touched) +''' @@ -374,10 +391,9 @@ def adjust_group_notifications_task(instance, action, reverse, model, pk_set, us ''' def newNotifiyPush(mode, instance, mailtext, notifytext, pushtext, notifytype, targeturl=""): usersofagency = User.objects.filter(profile__agency__pk=instance.agency.pk) - + ''' # CREATED for user in usersofagency: - # LOAD USERNOTIFICATIONS created_mail = False created_push = False @@ -439,8 +455,8 @@ def newNotifiyPush(mode, instance, mailtext, notifytext, pushtext, notifytype, t newnotification = UserNotification(touser=user, notificationtext=notifytext + instance.name, notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__"+ pushtext + notifytext + instance.name}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__"+ pushtext + notifytext + instance.name}) # UPDATED elif(mode == 1): if(update_mail): @@ -451,8 +467,8 @@ def newNotifiyPush(mode, instance, mailtext, notifytext, pushtext, notifytype, t newnotification = UserNotification(touser=user, notificationtext=notifytext + instance.name, notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__" + pushtext + notifytext + instance.name}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__" + pushtext + notifytext + instance.name}) #DELETE elif(mode == 2): if(delete_mail): @@ -464,9 +480,9 @@ def newNotifiyPush(mode, instance, mailtext, notifytext, pushtext, notifytype, t newnotification = UserNotification(touser=user, notificationtext=notifytext + instance.name, notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__" + pushtext + notifytext + instance.name}) - + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__" + pushtext + notifytext + instance.name}) + ''' # DIRS @receiver(post_save, sender=DataDir) def save_dir(sender, instance, **kwargs): @@ -544,7 +560,7 @@ def save_agjoin_prep(sender, instance, **kwargs): def receiver_function(sender, **kwargs): # DELETES ALL PRESENCE-OBJECTS LOWER THAN 15 MINUTES now_minus = datetime.datetime.now() - datetime.timedelta(minutes=2) - Presence.objects.filter(last_seen__lt=now_minus).delete() + #Presence.objects.filter(last_seen__lt=now_minus).delete() users = User.objects.all() @@ -559,17 +575,19 @@ def receiver_function(sender, **kwargs): # PRESENCE CHANGED +''' @receiver(signal=presence_changed) def update_presence_live(sender, **kwargs): channel_layer = channels.layers.get_channel_layer() async_to_sync(channel_layer.group_send)(str(kwargs["room"]), {'type' : 'update_presence_live'}) - +''' ''' ABWESENHEIT BERECHNUNG UND SPEICHERUNG DER NEUEN URLAUBSTAGE - VERWEIS AUF timemenagement.views ''' + @receiver(signal=post_save, sender=Absence) def save_newabsence(sender, instance, **kwargs): post_save.disconnect(save_newabsence, sender=sender) @@ -665,8 +683,8 @@ def save_newabsence(sender, instance, **kwargs): newnotification = UserNotification(touser=user, notificationtext="Neue Abwesenheit!", notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Neue Abwesenheit für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Neue Abwesenheit für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) # Benutzer ist Vertreter if(user == instance.representator): if(user.usernotifications.absence_user_is_rep_mail): @@ -676,8 +694,8 @@ def save_newabsence(sender, instance, **kwargs): newnotification = UserNotification(touser=user, notificationtext="Neue Abwesenheitsvertretung!", notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Sie wurden als Vertreter für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Sie wurden als Vertreter für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) # ABWESENHEIT GEÄNDERT else: @@ -698,8 +716,8 @@ def save_newabsence(sender, instance, **kwargs): newnotification = UserNotification(touser=user, notificationtext="Aktualisierte Abwesenheit!", notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Abwesenheit für " + instance.user.first_name + " " + instance.user.last_name + " wurde aktualisiert!"}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Abwesenheit für " + instance.user.first_name + " " + instance.user.last_name + " wurde aktualisiert!"}) # Benutzer ist Vertreter if(user == instance.representator): @@ -710,8 +728,8 @@ def save_newabsence(sender, instance, **kwargs): newnotification = UserNotification(touser=user, notificationtext="Neue Abwesenheitsvertretung!", notificationtype="", elementid=instance.pk) newnotification.save() - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Sie wurden als Vertreter für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | Sie wurden als Vertreter für " + instance.user.first_name + " " + instance.user.last_name + " eingetragen!"}) else: # Kein Urlaubsanspruch, dennoch prüfen ob bereits bestehende Arbeitstage involviert sind @@ -729,15 +747,15 @@ def new_chat_message(sender, instance, **kwargs): for u in instance.room.chatmembers.all(): if u != instance.author: if u.usernotifications.chat_received_push and u not in sended_users: - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht im Gruppenchat " + instance.room.roomname + " von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht im Gruppenchat " + instance.room.roomname + " von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) sended_users.append(u) for u in instance.room.chatmembers_admin.all(): if u != instance.author: if u.usernotifications.chat_received_push and u not in sended_users: - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht im Gruppenchat " + instance.room.roomname + " von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht im Gruppenchat " + instance.room.roomname + " von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) sended_users.append(u) @@ -746,8 +764,9 @@ def new_chat_message(sender, instance, **kwargs): u = instance.room.chatmember_single if u.usernotifications.chat_received_push and u != instance.author: - channel_layer = channels.layers.get_channel_layer() - async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) + pass + #channel_layer = channels.layers.get_channel_layer() + #async_to_sync(channel_layer.group_send)("user_" + str(u.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Chat | Neue Nachricht von " + instance.author.first_name + " " + instance.author.last_name + ": " + instance.content}) diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index 0523e77..9d8d38f 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -52,7 +52,6 @@ html h1 { } body{ background-color: #f8f9fc; - padding-top: 70px; } .modal-open {overflow-y: auto} diff --git a/users/static/users/js/nc_js.js b/users/static/users/js/nc_js.js new file mode 100644 index 0000000..49325f1 --- /dev/null +++ b/users/static/users/js/nc_js.js @@ -0,0 +1,38 @@ +window.onload = function () { + var button = document.createElement("a"); + button.innerHTML = ''; + + button.classList.add("header-menu"); + + // 2. Append somewhere + var header = document.getElementsByClassName("header-right")[0]; + header.prepend(button); + + button.style.padding = "20px"; + + // DIV + realtimediv = document.createElement("div"); + realtimediv.style.width = "300px"; + realtimediv.style.height = "250px"; + realtimediv.style.border = "solid black 1px"; + realtimediv.style.top = "50px"; + realtimediv.style.right = "50px"; + realtimediv.style.position = "fixed"; + realtimediv.style.overflow = "hidden"; + realtimediv.style.display = "none"; + realtimediv.innerHTML = ''; + + + + header.appendChild(realtimediv); + + + button.addEventListener ("click", function() { + if(realtimediv.style.display == "none"){ + realtimediv.style.display = "block"; + } + else { + realtimediv.style.display = "none"; + } + }); + } \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index a591827..e85134a 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -14,33 +14,20 @@ - - - - - - - - - - - - @@ -50,63 +37,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - -
    -
      - + {% if request.user.profile.agency.paymentplan == 0 and request.user.profile.agency.paymentstatus == 0 %} -
      + {% endif %} + - - + + -
      + - {% if active_link == 'dashboard' %} -
    • - {% else %} -
    • - {%endif%} - - - Dashboard -
      • - - -
      - - -
      - Agentur -
      - - {% getUnpubStandards request.user as standardUnPubCount %} - {% if active_link == 'standards' %} -
    • - {% else%} -
    • - {%endif%} - - - Standards - {% if standardUnPubCount > 0 %} - {{standardUnPubCount}}  - {% endif %} - - -
      • - - {% if active_link == 'orga' %} -
    • - {% else%} -
    • - {%endif%} - - - Organigramm - -
      • - {% if request.user.profile.agency.module_organizer %} - {% if active_link == 'organizer' %} -
    • - {% else%} -
    • - {%endif%} - - - Organizer - -
      • - {% endif %} - - {% if request.user.profile.agency.module_files and request.user|usergperm:"filesviewer" %} - {% if active_link == 'cloud' %} -
    • - {% else%} -
    • - {%endif%} - - - Dateien - -
      • - {% endif %} - - {% if request.user.profile.agency.module_messages %} - {% if active_link == 'messages' %} -
    • - {% else%} -
    • - {%endif%} - - {% getmesscounter request.user as gs %} - - - Mitteilungen - {% if gs > 0 %} - {{gs}}  - {% endif %} - - -
      • - {% endif %} - - {% if request.user.profile.agency.module_chat %} - - {% if active_link == 'chat' %} -
    • - {% else%} -
    • - {%endif%} - - - - Chat BETA - -
      • - {% endif %} - - - - {% if request.user.profile.agency.module_timemanagement %} - - {% getAbsenceAsks request.user as ab_ask %} - - {% if active_link == 'abscence' %} -
    • - {% else%} -
    • - {%endif%} - - - - Abwesenheiten  - {% if ab_ask > 0 and request.user|usergperm:"absencemanager" %} - {{ab_ask}}  - {% endif %} - - -
      • - {% endif %} - - {% if request.user.usertime.usetime or request.user|usergperm:"usermanager" and request.user.profile.agency.module_timemanagement %} - {% if active_link == 'timemanagement' %} -
    • - {% else%} -
    • - {%endif%} - - - Zeiterfassung - -
      • - {% endif %} - - {% if request.user.profile.agency.module_recoverdir and request.user|has_group_byname:"Notfallhilfe" %} - {% if active_link == 'recoverdir' %} -
    • - {% else%} -
    • - {%endif%} - - - Notfallhilfe - -
      • - {% endif %} - - -
      + -
      - {% if request.user.is_staff %} -
    • - - - Adminoberfläche - -
      • - {% endif %} - - - - {% if active_link == 'dasettings' %} -
    • - {% else%} -
    • - {%endif%} - - - Einstellungen - -
      • - - {% if active_link == 'support' %} -
    • - {% else%} -
    • - {%endif%} - - - Support - -
      • - -
      + - Datenschutz
      + -
      - + --> -
      @@ -447,7 +210,7 @@ background-color: #5a5c69 !important; border-color: #5a5c69 !important; } - + --> {% getUserIsRep request.user as repstring %} {% if repstring != False %} @@ -480,52 +243,31 @@ -
        + - {% getIsUserStartTime request.user as starttime %} - {% if request.user.usertime.usetime and starttime %} -
      • - - - - - -
        • - - {% endif %} -
      • + - - + + - + - Alle Benachrichtigungen ansehen -
      - + + -
      + + -
      + + + --> + + + + + -
      +
      -
      + -
      +
      {% if messages %} {% for message in messages %} @@ -610,26 +356,6 @@
       
      - {% if active_link != 'chat' %} - {% if request.user.profile.agency.module_chat %} -
      - - - - - - {% endif %} - - {% endif %}
      @@ -642,21 +368,7 @@ } - - - - - + @@ -741,18 +453,11 @@ $(document).ready(function(){ - if($( window ).width() < 768) - { - $("#accordionSidebar").addClass("toggled"); - $("#content-wrapper").css("margin-left" , "0px"); - - $("#topnavbarmain").css("margin-left" , "0px"); - - sidebar_hidden = false; - } + }); // Toggle the side navigation +/* function toggleSidebar(){ if(sidebar_hidden == false){ $("#accordionSidebar").removeClass("toggled"); @@ -785,7 +490,7 @@ $( window ).resize(function() { $("#topnavbarmain").css("margin-left" , "224px"); sidebar_hidden = true; } -}); +});*/ /* AJAX CALL FOR NOTIFICATIONS @@ -875,7 +580,7 @@ $(document).on('click', function (e) { diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index b662fca..546cb72 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -204,6 +204,4 @@ $(document).ready(function(){
      - - {% endblock content %} diff --git a/users/templates/users/login.html b/users/templates/users/login.html index d4d0cfa..df8cad8 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,56 +1,14 @@ -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} -{% block content %} - - - + -{% endblock content %} \ No newline at end of file + \ No newline at end of file diff --git a/users/templates/users/login.html_SAVE b/users/templates/users/login.html_SAVE new file mode 100644 index 0000000..d4d0cfa --- /dev/null +++ b/users/templates/users/login.html_SAVE @@ -0,0 +1,56 @@ +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} +{% block content %} + +
      +
      +
      + {% csrf_token %} +
      + + +

      Digitale Agentur Login

      +       + {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} + {{ form|crispy }} +
      +
      + + + + Passwort vergessen?
      +       +
      +
      +
      + + Probleme beim anmelden? + + + Agentur registrieren + +
      +
      +
      + +{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/nclog.html b/users/templates/users/nclog.html new file mode 100644 index 0000000..9a3dcd3 --- /dev/null +++ b/users/templates/users/nclog.html @@ -0,0 +1 @@ +

      {{error}}

      \ No newline at end of file diff --git a/users/templates/users/password_reset.html b/users/templates/users/password_reset.html index a3cfc37..73965aa 100644 --- a/users/templates/users/password_reset.html +++ b/users/templates/users/password_reset.html @@ -1,25 +1,8 @@ -{% extends "users/publicbase.html" %} -{% load crispy_forms_tags %} -{% block content %} - -
      -
      - - -

      Passwort anfordern

      -       -

      Bitte geben Sie ihre E-Mailadresse ein, mit der Sie sich bei der Digitalen Agentur registriert haben.

      -
      - {% csrf_token %} - {{ form|crispy }} -
      -   -
      -
      -
      -{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/password_reset.html_SAVE b/users/templates/users/password_reset.html_SAVE new file mode 100644 index 0000000..a3cfc37 --- /dev/null +++ b/users/templates/users/password_reset.html_SAVE @@ -0,0 +1,25 @@ +{% extends "users/publicbase.html" %} +{% load crispy_forms_tags %} +{% block content %} + +
      +
      + + +

      Passwort anfordern

      +       +

      Bitte geben Sie ihre E-Mailadresse ein, mit der Sie sich bei der Digitalen Agentur registriert haben.

      +
      + {% csrf_token %} + {{ form|crispy }} +
      +   +
      +
      +
      +{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/register.html b/users/templates/users/register.html index bdc5651..73965aa 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -1,67 +1,8 @@ - -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} - -{% block content %} -
      -
      - {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} -
      - {% csrf_token %} -
      - - -

      Registrieren Sie Ihre Agentur

      -       - {% for field in form %} - {% if field.name != 'captcha' %} - {{field.field_name}} - {% if field.name == 'agb' %} - {{field}}  AGB's*
      - {% elif field.name == 'av' %} - {{field}}  AV-Vertrag* - {% else %} - {{field|as_crispy_field}} - {% endif %} - {% endif %} - {% endfor %} - - -
      -
      - -
      -
      -
      -
      - -{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/register.html_SAVE b/users/templates/users/register.html_SAVE new file mode 100644 index 0000000..bdc5651 --- /dev/null +++ b/users/templates/users/register.html_SAVE @@ -0,0 +1,67 @@ + +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} + +{% block content %} +
      +
      + {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} +
      + {% csrf_token %} +
      + + +

      Registrieren Sie Ihre Agentur

      +       + {% for field in form %} + {% if field.name != 'captcha' %} + {{field.field_name}} + {% if field.name == 'agb' %} + {{field}}  AGB's*
      + {% elif field.name == 'av' %} + {{field}}  AV-Vertrag* + {% else %} + {{field|as_crispy_field}} + {% endif %} + {% endif %} + {% endfor %} + + +
      +
      + +
      +
      +
      +
      + +{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/registercomplete.html b/users/templates/users/registercomplete.html index d721e66..73965aa 100644 --- a/users/templates/users/registercomplete.html +++ b/users/templates/users/registercomplete.html @@ -1,24 +1,8 @@ - -{% extends "users/publicbase.html" %} - -{% load crispy_forms_tags %} - -{% block content %} - - -
      -
      - - -

      Registrierung abgeschlossen

      -       -

      Ihre Agentur wurde erfolgreich angelegt! Bitte prüfen Sie Ihre E-Mails, um sich ein Passwort für Ihren Account zu erstellen. Anschließend können Sie sich in Ihrer Agentur anmelden. -

      -
      -
      -{% endblock content %} \ No newline at end of file +{% load static %} + + \ No newline at end of file diff --git a/users/templates/users/registercomplete.html_SAVE b/users/templates/users/registercomplete.html_SAVE new file mode 100644 index 0000000..d721e66 --- /dev/null +++ b/users/templates/users/registercomplete.html_SAVE @@ -0,0 +1,24 @@ + +{% extends "users/publicbase.html" %} + +{% load crispy_forms_tags %} + +{% block content %} + + +
      +
      + + +

      Registrierung abgeschlossen

      +       +

      Ihre Agentur wurde erfolgreich angelegt! Bitte prüfen Sie Ihre E-Mails, um sich ein Passwort für Ihren Account zu erstellen. Anschließend können Sie sich in Ihrer Agentur anmelden. +

      +
      +
      +{% endblock content %} \ No newline at end of file diff --git a/users/urls.py b/users/urls.py index fcf564b..4131d2c 100644 --- a/users/urls.py +++ b/users/urls.py @@ -14,21 +14,16 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie ''' urlpatterns = [ + path('nclog/', views.ncLogin, name='nclog'), path('', views.dashboard, name='users-dashboard'), path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='users-logout'), path('usersman/', permission_required('users.usermanager')(UsersManagement.as_view(template_name="users/users_management.html")), name='users-management'), path('usersman/adduser/', permission_required('users.usermanager')(UsersCreateUser.as_view(template_name="users/users_adduser.html")), name='users-adduser'), - #path('usersman/profile/', views.profile, name='users-profile'), - #path('usersman//', views.ProfileUpdateView, name='users-update'), - #path('usersman//', permission_required('users.usermanager')(ProfileUpdateView.as_view()), name='users-update'), path('usersman//perms', permission_required('users.usermanager')(UsersPermUpdateView.as_view()), name='users-perm-update'), path('usersman//delete', permission_required('users.usermanager')(ProfileDeleteView.as_view()), name='users-delete'), path('usersman/gd/', views.getDataFromToDelUser, name="users-delete-getdata"), path('userlog/', views.showUserLog, name="users-log"), - #path('agencyinfo/', views.agency, name='agencyinfo'), - #path('agencyinfo//', permission_required('users.agency_change')(AgencyUpdateView.as_view()), name='agency-manage'), path('usersman//prio', views.UsersPrio, name='users-prio'), - #path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate"), path('areataskupdate//', views.UsersAreaTaskUpdate, name="users-areataskupdate"), path('globalsearch/', views.GlobalSearch, name="globalsearch"), path('standardrout/', views.searchStandardRouter, name="standardrouter"), @@ -46,9 +41,9 @@ urlpatterns = [ path('icsall/', views.getICSFileAll, name="geticsall"), path('icspublic//', views.getICSFileEx, name="getics"), path('icspublicall//', views.getICSFileExAll, name="geticsall"), - path('updateuserorga/', views.UpdateUserOrga, name="update-user-orga") - #path('recalculateabsence/', views.recalculateAbsence, name="recalculateabsence"), - + path('updateuserorga/', views.UpdateUserOrga, name="update-user-orga"), + # OAUTH + #path('oauth/callback/', views.oauthCallBack, name="oauthcallback"), ] diff --git a/users/views.py b/users/views.py index 1a9c7b5..bee1abf 100644 --- a/users/views.py +++ b/users/views.py @@ -36,17 +36,17 @@ from message.models import Message from notificsys.models import UserNotification from organizer.models import AGContacts, AGPassword import sys, os -from asgiref.sync import async_to_sync -from channels_presence.models import Room -from channels_presence.models import Presence -import channels.layers +#from asgiref.sync import async_to_sync +#from channels_presence.models import Room +#from channels_presence.models import Presence +#import channels.layers from datetime import date, timedelta from timemanagement.models import Workday, Absence, Breaks import base64 import filetype from django.db.models.signals import m2m_changed from django.contrib.auth.models import User, Group -from users.signals import adjust_group_notifications_permission +#from users.signals import adjust_group_notifications_permission from django.core.exceptions import ObjectDoesNotExist from digitaleagentur.utils import * from digitaleagentur.timemanagement_utils import * @@ -67,6 +67,175 @@ import base64 from django.http import HttpResponse + +# NC LOGIN +''' + + A User has to be logged in in NC. If yes, we check the user-status and retrieving the userId. If the logged user by this session is the same we want to see in Django, than the user will logged in. + + Double-Check: Logged-Session from NC (session-id cannot be hacked cause it is serverside) and we check userId local, django and NC + +''' +import xmltodict, json +import urllib.request as urllib2 +from django.contrib.auth import login, logout +from django.core.mail import send_mail +from django.views.generic import TemplateView + +def get_random_number(length = 6): + result_str = ''.join(random.choice("0123456789") for i in range(length)) + return result_str + +def create_group_id(agencygroupname, agency): + newgroupid = "" + pregroupstr = "agencymaingroupid_" + if(agencygroupname == "Mitarbeiter"): + newgroupid = pregroupstr + str(agency.pk) + # NORMAL GROUOPS + elif(agencygroupname == "Administratoren"): + newgroupid = pregroupstr + str(agency.pk) + "_defaultadmingroup" + elif(agencygroupname == "Notfallhilfe"): + newgroupid = pregroupstr + str(agency.pk) + "_recover" + else: + newgroupid = pregroupstr + str(agency.pk) + "_subgroup_" + get_random_number() + + return newgroupid + +def createNewAgencyByNC(request, uid): + print("CREATE NEW AGENCY") + # Creating Agency and prepare basic-Structure + email = uid + agency = Agency() + agency.name = email + "'s Agentur" + agency.vve = "" + agency.save() + pr=Profile() + pr.agency=agency + + # Create new User + try: + print("CREATE NEW USER IN DJANGO") + user=User.objects.create_user(email, email, randomString(30)) + + except: + print("PREDICTED EXCEPT - CONTINUE") + user = User.objects.get(username=email) + user.first_name = email + user.last_name = email + user.usernotification = UserNotification() + #user.usertime = UserTime() + pr.user=user + pr.save() + user.profile = pr + user.save() + print("USER DONE") + request.user = user + + # Creating all Standard-Django-Stuff + toUpdate(request) + loadPreStructure(agency) + + # Creating all NC-Stuff + # Agency-Groupfolder and Standard-Folder + data = { + "gid" : "agencymaingroupid_" + str(agency.pk), + "aid" : str(agency.pk), + "newagency" : True + } + + print("CREATING GROUPFOLDER") + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/creategf?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + print(r.text) + + + print("CREATING GROUPS IN NC FROM DJANGO") + groups = AgencyGroup.objects.filter(agency=agency) + for g in groups: + newgroupid = create_group_id(g.agencygroupname, agency) + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data = { + "groupid" : newgroupid + } + print("CREATE GROUP " + g.agencygroupname) + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/groups", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + print(r.text) + + r_status = json.loads(r.text) + if(r_status['ocs']['meta']['statuscode'] == 100): + # Group created, save new group id in Django + g.nc_name = newgroupid + g.save() + + # Group created, set display name in NC + data = { + "name": g.agencygroupname, + "id" : newgroupid + } + print("GROUP OK - CHANGE DISPLAY NAME") + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + print(r.text) + + # Add current user to all Groups! + print("ADDING CURRENT USER TO ALL GROUPS") + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "groupid" : g.nc_name, + } + r = requests.post(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + user.username + "/groups",headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) + print(r.text) + + print("CREATING STANDARDFOLDER") + r_2 = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + user.username + "/Agenturdaten/Standards Uploadbereich", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + print(r_2.text) + + print("DONE! Redirecting to nclogin") + #return redirect(settings.NEXTCLOUD_URL) + #return redirect('nclog', uid) + + + +# Entry-Point for NC +def ncLogin(request, uid): + logout(request) + #print(uid) + if(User.objects.filter(username=uid).exists()): + user = User.objects.get(username=uid) + if(len(user.profile.nc_sid) > 0 and getNCLoggedUserBySession(user.profile.nc_sid) == uid): + # Checking, if all necessary folders are created + #r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + user.username + '/Agenturdaten/Standards Uploadbereich/', auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + + headers = { + 'Authorization': 'Bearer ' + user.profile.nc_sid + } + # Groupfolder for Standards + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + user.username + '/Agenturdaten/Standards Uploadbereich/', headers=headers) + + login(request, user) + return redirect('users-dashboard') + else: + return render(request, 'users/nclog.html',{'error' : "Die Agenturdaten wurden aktualisiert. Bitte melden Sie sich ab und wieder an. Sollten Sie diese Meldung weiterhin sehen, kontaktieren Sie den Support."}) + else: + print("NO USER FOUND - NEW AGENCY REGISTRATION!") + createNewAgencyByNC(request, uid) + return render(request, 'users/nclog.html',{'error' : "Die Agenturdaten wurden aktualisiert. Bitte melden Sie sich ab und wieder an. Sollten Sie diese Meldung weiterhin sehen, kontaktieren Sie den Support."}) + + #return render(request, 'users/nclog.html',{'error' : "Die Agenturdaten wurden aktualisiert. Bitte melden Sie sich ab und wieder an. Sollten Sie diese Meldung weiterhin sehen, kontaktieren Sie den Support."}) + #except: + # + # try: + + # except: + # return render(request, 'users/nclog.html',{'error' : "Die Agenturdaten wurden aktualisiert. Bitte melden Sie sich ab und wieder an. Sollten Sie diese Meldung weiterhin sehen, kontaktieren Sie den Support."}) + #return render(request, 'users/nclog.html',{'error' : "Die Agenturdaten wurden aktualisiert. Bitte melden Sie sich ab und wieder an. Sollten Sie diese Meldung weiterhin sehen, kontaktieren Sie den Support."}) + def getICSFile(request, ag): if 'HTTP_AUTHORIZATION' in request.META: auth = request.META['HTTP_AUTHORIZATION'].split() @@ -222,45 +391,6 @@ def getICSFileExAll(request, code, ag): response.status_code = 404 return response -''' -def getICSFileExAll(request, code, ag): - if(request.method == "GET"): - #try: - agency = Agency.objects.get(pk=ag) - if agency != None and agency.agencycal_publicstatus == 1 and str(code) == str(agency.agencycalurl_all): - c = Calendar() - absencedays = Absence.objects.filter(agency=ag).exclude(confirm_status=2) - for ab in absencedays: - if ab.start != None and ab.end != None: - e = Event() - e.name = ab.user.first_name + " " + ab.user.last_name + " | " + ab.reason.name - e.uid = "da-ab-" + str(ab.pk) - if ab.start < ab.end: - e.begin = ab.start - e.end = ab.end - else: - e.begin = ab.start - e.end = ab.start + timedelta(minutes=1) - e.allday = True - c.events.add(e) - return HttpResponse(c, content_type='text/calendar') - else: - realm = "" - response = HttpResponse() - response.status_code = 400 - return response - except: - realm = "" - response = HttpResponse() - response.status_code = 403 - return response - else: - realm = "" - response = HttpResponse() - response.status_code = 404 - return response -''' - ''' @@ -391,6 +521,14 @@ def toUpdate(request): temgroup_verwaltung_ag = AgencyGroup(savefordel=True, is_admin=True, group=temgroup_verwaltung, agency=request.user.profile.agency, agencygroupname="Administratoren") temgroup_verwaltung_ag.save() + temgroup_Notfallhilfe = Group(name=str(request.user.profile.agency.pk) + "_" + randomString(8)) + temgroup_Notfallhilfe.save() + temgroup_Notfallhilfe_ag = AgencyGroup(savefordel=True, group=temgroup_Notfallhilfe, agency=request.user.profile.agency, agencygroupname="Notfallhilfe") + temgroup_Notfallhilfe_ag.save() + + recoverdirmanagingperm = Permission.objects.get(codename='recoverdirmanager') + temgroup_Notfallhilfe_ag.group.permissions.add(recoverdirmanagingperm) + #print("default groups created...adding users...") users_of_agency = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk) for user in users_of_agency: @@ -425,7 +563,7 @@ def toUpdate(request): #print("recoverdirgroup added and perms set") # CHECK FOR ALL POSSIBLE RIGHTS ON ADMINGROUP - m2m_changed.disconnect(adjust_group_notifications_permission, sender=Group.permissions.through) + #m2m_changed.disconnect(adjust_group_notifications_permission, sender=Group.permissions.through) ag_admingroup = list(AgencyGroup.objects.filter(agency=request.user.profile.agency, is_admin=True))[0] perms = AgencyGroup._meta.permissions @@ -434,7 +572,7 @@ def toUpdate(request): ag_admingroup.group.permissions.add(tempperm) - + ''' # INITIAL ROOT DIR rootdir = DataDir.objects.filter(is_root=True, agency__pk=request.user.profile.agency.pk) @@ -470,7 +608,7 @@ def toUpdate(request): #print("AGENCY DEF STANDARD DIR - FILESMODULE READY") pass - + ''' # CHANGE RIGHTS ORGNAIZER admingroups = AgencyGroup.objects.filter(is_admin=True) for a in admingroups: @@ -478,7 +616,7 @@ def toUpdate(request): a.group.permissions.add(Permission.objects.get(codename="agencynetwork")) - m2m_changed.connect(adjust_group_notifications_permission, sender=Group.permissions.through) + #m2m_changed.connect(adjust_group_notifications_permission, sender=Group.permissions.through) # USER TIME MODEL usersofagency = User.objects.filter(profile__agency=request.user.profile.agency) @@ -757,6 +895,7 @@ def showUserLog(request, pk): context = {} return render(request, 'users/userlog_forbidden.html', context) + @login_required def dashboard(request): # UPDATE FUNCTIONS BY NEW MODEL-CHANGES FOR COPIEN SOME DATA @@ -1119,10 +1258,19 @@ class ProfileDeleteView(LoginRequiredMixin, DeleteView): a.published_by = logged_user a.save() ''' + # NC DELETE USER IN NC TOO! + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + + r = requests.request("DELETE", settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + user.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) response = super(ProfileDeleteView, self).delete(request, *args, **kwargs) name = user.first_name + " " + user.last_name messages.success(request, f'Benutzer ' +name+ ' wurde gelöscht!') + return response # Saves a new User in parent of others Users. From f8b10b9ec89ee6fac1d5f51c1d89e180ff025d21 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 18 Oct 2021 09:16:38 +0200 Subject: [PATCH 02/11] Anmeldebug neue User fix Weiterleitungsseite und Nachname weg --- digitaleagentur/utils.py | 25 ++++++++++-------- users/templates/users/dashboard.html | 2 +- users/templates/users/login.html | 39 ++++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 14 deletions(-) diff --git a/digitaleagentur/utils.py b/digitaleagentur/utils.py index 2750adf..b6096cf 100644 --- a/digitaleagentur/utils.py +++ b/digitaleagentur/utils.py @@ -176,17 +176,20 @@ def getNCLoggedUserBySession(sid): nc_login_headers = {'Authorization' : 'Bearer ' + sid} r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) - final_json = json.loads(js) + + # New user login - set initial status + if(final_json['ocs']['meta']['status'] == 'failure'): + nc_login_headers = {'Authorization' : 'Bearer ' + sid, 'OCS-APIREQUEST' : 'true'} + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status/status", headers=nc_login_headers, data={'statusType' : 'dnd'}) + + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) + + xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) + final_json = json.loads(js) + return final_json['ocs']['data']['userId'] - #except: - # return redirect('users-dashboard') - - - - - - - - + \ No newline at end of file diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 546cb72..eb67271 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -3,7 +3,7 @@ {% block content %}
      {% gettimemessage as timemessage %} -

      {{timemessage}}, {{request.user.first_name}} {{request.user.last_name}}!

      +

      {{timemessage}}, {{request.user.first_name}}!

      Letzter Login: {{ request.user.last_login }} {% getlocalweather request.user as weatherdata %} {% if request.user.profile.agency.city|length > 0 and weatherdata.0 != None %} diff --git a/users/templates/users/login.html b/users/templates/users/login.html index df8cad8..14ad496 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,8 +1,43 @@ {% load static %} -

      Sie werden gleich zur neuen Login-Seite der Digitalen Agentur weitergeleitet. Sollte dies nicht gehen, klicken Sie auf folgenden Link:

      - https://cloud.digitale-agentur.com/ + +
      +
      +
      From 6977dc51f7e203267c67cc0bdc8fd7a012b8d754 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 18 Oct 2021 09:36:31 +0200 Subject: [PATCH 03/11] Uploaderror Large Type und Doppelt --- .../templates/standards/standards_add.html | 22 +++++--- standards/views.py | 50 +++++++++++-------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index e3f2d5f..35babec 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -164,12 +164,10 @@ - {% if user|usergperm:"filesmanager" %} - {% endif %}
      @@ -269,13 +267,13 @@
      - +
      - Diesen Dateitypen dürfen Sie nicht hochladen. + Die Datei wurde nicht hochgeladen! Bitte prüfen Sie die erlaubten Dateitypen, die maximale Dateigröße und ob die Datei im Ordner Standards Uploadbereich bereits vorhanden ist.
      @@ -1240,7 +1238,7 @@ function doUploadAction(filetodo, replacestat){ processData: false, contentType: false, beforeSend: function(){ - $("#uploadModalProgress").modal("toggle"); + $("#uploadModalProgress").modal("show"); }, xhr: function() { var xhr = new window.XMLHttpRequest(); @@ -1253,7 +1251,7 @@ function doUploadAction(filetodo, replacestat){ return xhr; }, success: function(data) { - console.log(data); + if(data["success"] == true){ setTimeout(function(){ hideUpload(); @@ -1264,12 +1262,22 @@ function doUploadAction(filetodo, replacestat){ }, 1000); } else{ - $("#forbiddenFileType").modal("toggle") + setTimeout(function(){ + hideUpload(); + $("#forbiddenFileType").modal("toggle"); + }, 1000); } + }, + error: function(){ + setTimeout(function(){ + hideUpload(); + $("#forbiddenFileType").modal("toggle"); + }, 1000); } }); } else{ + hideUpload(); $("#forbiddenFileType").modal("toggle") } } diff --git a/standards/views.py b/standards/views.py index a7e6853..dc71139 100644 --- a/standards/views.py +++ b/standards/views.py @@ -825,7 +825,6 @@ def StandardChangePublic(request, pk): standard.save() return redirect('standards') -# TODO: Upload der Standard-Dateien passt noch nicht, BUG!!!! @login_required def StandardSingle(request, pk): @@ -1217,25 +1216,36 @@ def uploadFileFromStandard(request): if(file_ok): final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten/Standards Uploadbereich/" + request.FILES['uploadedfile'].name - - r = requests.put(final_file_path, data=request.FILES['uploadedfile'], headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) - if(len(r.text) == 0): - try: - new_file_name = request.FILES['uploadedfile'].name - # Upload OK - get File-ID in NC - filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' - r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) - #print(r.text) - split_response = r.text.split("") - new_id = split_response[1].split("")[0] - - tf = NCFile(agency=request.user.profile.agency, nc_id=new_id) - tf.save() - return JsonResponse({"success" : success, "data" : {'savedobj_id' : new_id, 'savedobj_name' : new_file_name}}) - except: - success = True - return JsonResponse({"success" : success, "data" : {'savedobj_id' : None, 'savedobj_name' : 'Datei hochgeladen, enthält aber falsche Zeichen. Bitte Seite neu laden und anschließend über Suchfeld hinzufügen.'}}) - + + # Check if File already exist + try: + new_file_name = request.FILES['uploadedfile'].name + filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + #print(r.text) + split_response = r.text.split("") + new_id = split_response[1].split("")[0] + return JsonResponse({"success" : False, "data" : "file exist"}) + except: + # File will be uploaded + r = requests.put(final_file_path, data=request.FILES['uploadedfile'], headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + if(len(r.text) == 0): + try: + new_file_name = request.FILES['uploadedfile'].name + # Upload OK - get File-ID in NC + filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + #print(r.text) + split_response = r.text.split("") + new_id = split_response[1].split("")[0] + + tf = NCFile(agency=request.user.profile.agency, nc_id=new_id) + tf.save() + return JsonResponse({"success" : success, "data" : {'savedobj_id' : new_id, 'savedobj_name' : new_file_name}}) + except: + success = True + return JsonResponse({"success" : success, "data" : {'savedobj_id' : None, 'savedobj_name' : 'Datei hochgeladen, enthält aber falsche Zeichen. Bitte speichern Sie den Standard, laden die Seite ne und binden die Datei danach ein.'}}) + return JsonResponse({"success" : success, "data" : "DONE!"}) return JsonResponse({"success" : success, "data" : "DONE!"}) \ No newline at end of file From 80b3542a875574c52da59a5f5ac8d8d41bd14fd9 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 18:17:47 +0200 Subject: [PATCH 04/11] quotawahnsinn --- .../templates/dasettings/groups_content.html | 5 +- .../templates/dasettings/moduls_content.html | 43 ++++--- .../dasettings/moduls_content_SAVE.html | 37 +++--- .../dasettings/notifications_content.html | 4 +- .../templates/dasettings/quota_content.html | 106 ++++++++++++++++++ dasettings/templates/dasettings/settings.html | 35 ++++-- dasettings/views.py | 69 ++++++++++++ .../__pycache__/counter_tag.cpython-38.pyc | Bin 27113 -> 28666 bytes standards/templatetags/counter_tag.py | 39 +++++++ users/models.py | 7 ++ 10 files changed, 292 insertions(+), 53 deletions(-) create mode 100644 dasettings/templates/dasettings/quota_content.html diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index cd24382..2b69b6c 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -102,9 +102,9 @@ {% endif %} {% endfor %} {% endfor %} -
      +
      - +
    @@ -124,6 +124,7 @@
    +
    {% for aggroup in agencygroups %} {% for p in aggroup.group.permissions.all %} diff --git a/dasettings/templates/dasettings/moduls_content.html b/dasettings/templates/dasettings/moduls_content.html index ecc9803..91df90a 100644 --- a/dasettings/templates/dasettings/moduls_content.html +++ b/dasettings/templates/dasettings/moduls_content.html @@ -1,6 +1,5 @@ {% load crispy_forms_tags %} -
    -
    +
    @@ -13,26 +12,27 @@ {% csrf_token %} -{% for formfield in modulform %} + {% for formfield in modulform %} {% if formfield.name == 'module_organigramm' or formfield.name == 'module_timemanagement' %} - - - - + + + + {% endif %} -{% endfor %} + {% endfor %} +
    {{formfield.label_tag}} - {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %} - - {% elif formfield.name == 'module_timemanagement' and user.profile.agency.module_timemanagement %} - - {% endif %} -
    {{formfield.label_tag}} + {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %} + + {% elif formfield.name == 'module_timemanagement' and user.profile.agency.module_timemanagement %} + + {% endif %} +
    - -
    + {% for formfield in modulform %} +
    - {% endfor %} + diff --git a/dasettings/templates/dasettings/moduls_content_SAVE.html b/dasettings/templates/dasettings/moduls_content_SAVE.html index e016555..ca72b21 100644 --- a/dasettings/templates/dasettings/moduls_content_SAVE.html +++ b/dasettings/templates/dasettings/moduls_content_SAVE.html @@ -1,10 +1,10 @@ {% load crispy_forms_tags %} -
    + +
    - @@ -13,23 +13,24 @@ {% csrf_token %} -{% for formfield in modulform %} - - - - - -{% endfor %} + {% for formfield in modulform %} + {% if formfield.name == 'module_organigramm' or formfield.name == 'module_timemanagement' %} + + + + + {% endif %} + {% endfor %} +
    ModulAktiviert Einstellungen
    {{formfield.label_tag}}{{formfield}} - {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %} - - {% elif formfield.name == 'module_timemanagement' and user.profile.agency.module_timemanagement %} - - {% endif %} -
    {{formfield.label_tag}} + {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %} + + {% elif formfield.name == 'module_timemanagement' and user.profile.agency.module_timemanagement %} + + {% endif %} +
    - - +
    {% for formfield in modulform %} @@ -79,4 +80,6 @@
    + + {% endfor %} diff --git a/dasettings/templates/dasettings/notifications_content.html b/dasettings/templates/dasettings/notifications_content.html index 27542cb..dac3694 100644 --- a/dasettings/templates/dasettings/notifications_content.html +++ b/dasettings/templates/dasettings/notifications_content.html @@ -393,13 +393,13 @@ type: "GET", url: "/dasettings/ajax", data:{ - action : "update_notifications", + //action : "update_notifications", + action : "", fieldname : ele, new_stat : new_stat }, success: function( data ) { - console.log(data); if(data['success']){ $('#notchange_done').toast('show'); } diff --git a/dasettings/templates/dasettings/quota_content.html b/dasettings/templates/dasettings/quota_content.html new file mode 100644 index 0000000..d006350 --- /dev/null +++ b/dasettings/templates/dasettings/quota_content.html @@ -0,0 +1,106 @@ +{% load counter_tag %} +{% getAGGroupQuotaData request as agquota %} + +
    +
    +
    +     {{agquota.1|filesizeformat}} / {{agquota.0|filesizeformat}} +
    +Sie können mehr Speicherplatz für die Agentur dazubuchen und anschließend jedem Mitarbeiter ein bestimmtes Speicherkontingent zuweisen. Der Speicherplatz wird dann vom Agenturspeicher abgezogen. +

    + + + + + + + + + + +{% for item in usersofagency %} + + + + + + + {% endfor %} + +
    VornameNachnameSpeicherplatzKontingent in MB
    {{item.first_name }}{{ item.last_name }} + {% getUserQuotaData item as userquotadata %} +
    +
    +
    +     {{userquotadata.0|filesizeformat }} (davon {{userquotadata.1|filesizeformat }}) +
    +     		+ {% if request.user.profile.agency.agencypackage > 0 %} + + {% endif %} +
    + +
    +
    +   +
    + + + diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index 30852d9..ad65648 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -55,6 +55,11 @@  Abrechnung
    • {% endif %} + {% if user|usergperm:"agencyinfo" %} +
  • +  Speicherplatz +
    • + {% endif %} {% if user|usergperm:"agencynetwork" %}
  •  Agenturverbund @@ -77,7 +82,7 @@ {% endif %} {% if user|usergperm:"modulesconfig" %}
  • -  Module +  Module
    • {% endif %} @@ -93,6 +98,16 @@ endblock --> + + {% if user|usergperm:"modulesconfig" %} +
    +
    Module{% if request.user.profile.showtooltips %} {% endif %}
    + {% block moduls_content %} + {% include "dasettings/moduls_content.html" %} + {% endblock %} +
    + {% endif %} +
    Benachrichtigungen{% if request.user.profile.showtooltips %} {% endif %}
    @@ -120,6 +135,15 @@ {% endblock %}
    {% endif %} + {% if user|usergperm:"agencyinfo" %} +
    +
    Speicherplatz{% if request.user.profile.showtooltips %} {% endif %}
    +
    + {% block quota_content %} + {% include "dasettings/quota_content.html" %} + {% endblock %} +
    + {% endif %} {% if user|usergperm:"agencynetwork" %}
    Agenturverbünde{% if request.user.profile.showtooltips %} {% endif %} @@ -163,14 +187,6 @@ {% include "dasettings/groups_content.html" %} {% endblock %}
    - {% endif %} - {% if user|usergperm:"modulesconfig" %} -
    -
    Module{% if request.user.profile.showtooltips %} {% endif %}
    - {% block moduls_content %} - {% include "dasettings/moduls_content.html" %} - {% endblock %} -
    {% endif %} @@ -179,6 +195,7 @@ var defaultsettingsview = "notifications"; /* COOKIE FOR SAVING OPEN TAB */ $(document).ready(function(){ + $(".toast").hide(); $(".toast").toast({ autohide: true, diff --git a/dasettings/views.py b/dasettings/views.py index 8987cb2..8b4924b 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -624,6 +624,75 @@ def SettingsAjaxRouter(request): setattr(request.user.usernotifications, request.GET['fieldname'], False) request.user.usernotifications.save() success = True + + + + + + # QUOTA + elif request.method == 'GET' and request.GET['action'] == "quotaag_update" : + success = False + quotavalues = request.GET['quotavalues'] + + quotavalues_array = quotavalues.split("_SEPERATOR_") + + newsumquota = 0 + + for newquotavalue in quotavalues_array: + ele = newquotavalue.split("__") + + if("user" in ele[0]): + newsumquota += int(ele[1]) + + # CONVERTING MAX MB TO BYTES + newsumquota = newsumquota*1024 + newsumquota = newsumquota*1024 + + # GETTING POSSIBLE BYTES FROM AGENCY + r = requests.request("PROPFIND", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten", headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + + split_response = r.text.split("") + inuse = split_response[1].split("")[0] + + # QUOTA + split_response = r.text.split("") + quota = split_response[1].split("")[0] + + # TODO: Hier wird ja jedesmal die Agenturquota reduziert, dass ist natürlich doof! + + # Check if needed Quota is bigger than inuse + newagencyquota = int(quota) - int(newsumquota) + if( newagencyquota > int(inuse) ): + for newquotavalue in quotavalues_array: + ele = newquotavalue.split("__") + if("user" in ele[0]): + userid = ele[0].split("_")[1] + userquota = int(ele[1])*1024 + userquota = userquota*1024 + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + data_nc = { + "key" : "quota", + "value" : userquota + } + r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + User.objects.get(pk=userid).username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) + + # Updating the AgencyQuota + data = { + "quota" : newagencyquota, + "user" : request.user.username + } + + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/updategfquota?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) + + ag = request.user.profile.agency + ag.agencyquota = newagencyquota + ag.save() + success = True + # UPDATE TOOLTUP elif request.method == 'GET' and request.GET['action'] == "change_showtooltips" : newtooltipvalue = False diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index c62ecafdc2b4d882fa40b7014eda1efa2161e50c..252a0f6b87b99d5a5a9d4b57e2618dd89b430a24 100644 GIT binary patch delta 2886 zcma)8eN0@(5r4Dy1;-r*4#J1eA0()7HRfVls!ej?BOG8G%!e@vK4X!`?E?-S+_Cqt z)yt7H#<5hTc1t!NPMRiQM@rqab=q_4wvrpFs*&$n$5|NPW`&-t5fI?7ZFI&b|--05|>u#lv2&Tf^t24}|W0YPr}C@BMVg6~}I4+w{Hs zI{)<!?DSjsmG1>N$kywAYbq6`F<|y8s80<<=f4D@TpvJmCL{b zzlED}v7ubTgP$=5Quq4g$9oE8MQD;0+$dhJ#kcMVq~;INpAYvp5IdyBS_db^4vFLnuN%vE&T02*ZV{y)NA`N{rwQC>UH3Hzk; zpbihpse>1wRYFfn{;g-Le7dIw+T^C*D*3yfEzp7ba`~RSQt5U9fu`)0;l8i=`cMqmR8kT9%*m7~2Gr7ix33n4aqt%T`@a3bUUK*s zC60n7J|Z}b;-vdemy!>;|J^D+7Y8GB^@m|ZdHe@0cpE!NDDN{hT$cs%l&A$6<{v+(IfQ$ zv$A}o&Ra)8hB3Q>^Yi{dm~%%?RUFk(UcyK2gT#^zek(d z6KcfM$G$GJk$WH`pNsUe#dTe?H;Zut4&kHk&d9D~L$D-YJa#Hb%Ypg|(qAFyMup`_ zirB0vLV08ThVi64FgnVf%v1SSqhoM3S93hc;D&r^>=0z-pU2L_^K$C3SKy-BOTWGy zE~xz-*8Olv3jMO&K7L>JJO&oa1kVr<2gS1_VbeqSJbH7@0yle<7xI9$eWG+?8`WvsZ9e1lTF(=tJE^uw0+u9sc{=NJ9ntQ zbJ~SH=Sz&c&e;|q1Jea7g}h)D7FdSy!fFkB?p5GL)!Kq>-Rk**)w^!B^J3GTu`j`9 z4c}SY5|nETj*LBHGmA`5#=(o0*b=OG`6gbn$|h}CMoaswf`P;R16>FD!s!YuJqgoj zN=_w%Tt5+yV_R74dw zwXt_0SH2(;9W94Q%+GSmC5&WTj~an>+TA8w3r=P^)YnfRZChnidv`ZFCI{)G z!@8+|->zw?VhpIU-8K)DsaDR!PtY5S{y6KBu>tZnJ2`gUyS~@lsX zzRDIH=BB(kqBu^CY3aI2!=&GbjV){n#S>9Io@znimJ2dl z?R-l^(~j0aD46d=G2e}cq4d?sWxtf2_!)ZVlT{gSL4R=-b#Hzly|NG;rCakVS)G{} zO(s4jCpre=GJ!e>zPlZSte`VsmGyOw9O>xo9}bTV4|N_M!*#YwZtDgfRT?G?%Qb<& zA9x+*D>3~zSoRs+oU$Af@kBycws>OFvLzEI#Sdv_PKmruk}BE-Rsn4=)(TzK>xjQl zEtyiNlLRpflHwG({h039T_tz!!yB{?B{)E1jjRf)SPghsnayt(YdBBfOs>snWP_hl zgqsA6W_J)25EK&l2r3BZuS=-Eo<@@P60{Pu6Ff}NK@gVLC;i!jBn}b`6O0fXC5RA= z63h{#2^I*RAXp?=B6yPEEP~~k7x8#(yeX**T#@gQ{vyF8f>#M%BcK8yt`YnaG@B;Y Z)HORcRSc(dvr~_Q+wHf5yR-!C@IT(=;a&g$ delta 1514 zcmb7^T})eL7{~h@;85Ci#!)Cjnd2kCp|}H%4CS+Y*a?NU1S+Lq*lBxYjir>AGB=n& zwz10*dE9558!TQdSq95d*^Ti+O?Kgh#>FL#iN*^*;>9 z`@HY_yyrZpTi?RZU%_s_#bPq>>w2TAbS%BK+YTGI9qU;t3L z+;Rp)6S-#XZfh-wd$@cHdbgKTuZ?2@E=yl z4JjWN9EIkuDGm^du-)}SiJfw3d!`psL7~b+$--oE_u*w%gLyC6&k{=T8y5qI<~@`F zP>BOC--Cl#)%_*cTiq`~13G&YXvDRii$W`4ov{XwxLra!;A*`cKX(@jZGf`bhJU+@ zg${D7x1EjAOjLXGpcChM--m9j?Ms0VA9#wf%HtC&X>&Kudn$7KxRf&V@`9NYZ%ikd z7dJiiFvyct*-eSRQ0ZJ4*aJd8m*b}U*Ap$KM{Vqh`F!T0w+n{!ZNB%mgCEO%C8C$s zcm>@)Cw}UE8l8O>yy1J%+(S0aW*+?2*9gPBMk_Y=UlK>S8Rn;Xsz7_xFK0jvmib%Z zISlzvL7Dc0zYQRvRSZ=EOrR%FZYiTh{Jb>D#9X)#sDmcF9rzHA>s@xsl7mablW^jR z$d3DiIl?U9$HO-C1xxUc;k~#Vbiy2d5$uJRE=Q_-$Y|4#}ME!?($ekgE{RQK%p2JShix7f4+s=nX8UlinfY3gIuj*h8=qN(uVc>>zcJ&`NL;+6f(mPTZKV zFLaai5e5lEgaBcfK;6v}gyV!0gf|I`gp-8R1Zs)Yt{E1KMML`&3giF7m&m_HSS73x U=r}u1Km7{E;(2gPn~BfCKQWVlasU7T diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 54ddcda..bb7ac13 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1177,3 +1177,42 @@ def getNCDirInfosURL(request, ncid): return "" +# QUOTA +@register.simple_tag +def getAGGroupQuotaData(request): + r = requests.request("PROPFIND", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten", headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + + # IN USE + split_response = r.text.split("") + inuse = split_response[1].split("")[0] + + # QUOTA + split_response = r.text.split("") + quota = split_response[1].split("")[0] + + # PERCENT VALUE + percent = (100 / int(quota))*int(inuse) + + return [quota, inuse, str(round(percent, 0)).replace(",", ".")] + +# User QUOTA +import re, math +@register.simple_tag +def getUserQuotaData(userdata): + r = requests.request("GET", settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + userdata.username, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), headers={'Content-Type' : 'text/xml', 'OCS-APIRequest': "true"}) + + quotadata = [int(s) for s in re.findall('(.+?)', r.text)] + inuse = [int(s) for s in re.findall('(.+?)', r.text)] + + i = int(math.floor(math.log(quotadata[0], 1024))) + p = math.pow(1024, i) + # s for textlabel + s = round(quotadata[0] / p, 2) + + # PERCENT + percent = (100 / int(quotadata[0]))*int(inuse[0]) + + # TODO: Hier werden GB nicht korrekt umgerechnet in MB + + return [quotadata[0], inuse[0], str(round(percent, 0)).replace(",", "."), str(s).split(".")[0]] + diff --git a/users/models.py b/users/models.py index 5ee1d66..d608394 100644 --- a/users/models.py +++ b/users/models.py @@ -145,6 +145,11 @@ class Agency(models.Model): # RECOVERDIR module_recoverdir = models.BooleanField(default=False) + # QUOTA + agencyquota = models.BigIntegerField(default=2146274449) + agencypackage = models.IntegerField(default=0) + + def __str__(self): return f'{self.name}' @@ -260,6 +265,8 @@ class Profile(models.Model): user_messages_mail = models.BooleanField(default=True) user_messages_push = models.BooleanField(default=True) + userquota = models.BigIntegerField(default=104857600) + # ONLINESTATUS ''' From 6cfba1a0835353b7ff22f6392d309a60c8e144ab Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 18:26:49 +0200 Subject: [PATCH 05/11] quota done bis auf anzeigefehler --- dasettings/views.py | 9 ++++----- users/models.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dasettings/views.py b/dasettings/views.py index 8b4924b..2477eb9 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -679,17 +679,16 @@ def SettingsAjaxRouter(request): "value" : userquota } r = requests.put(settings.NEXTCLOUD_URL + "/ocs/v1.php/cloud/users/" + User.objects.get(pk=userid).username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc) - + + ag = request.user.profile.agency # Updating the AgencyQuota data = { - "quota" : newagencyquota, + "quota" : ag.agencypackage - int(newsumquota), "user" : request.user.username } r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/updategfquota?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) - - ag = request.user.profile.agency - ag.agencyquota = newagencyquota + ag.agencyquota = ag.agencypackage - int(newsumquota) ag.save() success = True diff --git a/users/models.py b/users/models.py index d608394..2d5eec5 100644 --- a/users/models.py +++ b/users/models.py @@ -147,7 +147,7 @@ class Agency(models.Model): # QUOTA agencyquota = models.BigIntegerField(default=2146274449) - agencypackage = models.IntegerField(default=0) + agencypackage = models.BigIntegerField(default=0) def __str__(self): From 40a19424ca30105cabb2acb70ab9eb0915e88893 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 18:38:41 +0200 Subject: [PATCH 06/11] newuserdata --- api/views.py | 3 ++- .../__pycache__/counter_tag.cpython-38.pyc | Bin 28666 -> 28692 bytes standards/templatetags/counter_tag.py | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/api/views.py b/api/views.py index 51a9003..18065cf 100644 --- a/api/views.py +++ b/api/views.py @@ -235,7 +235,8 @@ def NCAddUser(request): "password": password, "displayName": displayName, "email":email, - "groups[]":groups + "groups[]":groups, + "quota": 104857600 } headers = { diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 252a0f6b87b99d5a5a9d4b57e2618dd89b430a24..96a41b7bbb162c5dc8da2b6d19350b29c74baf11 100644 GIT binary patch delta 301 zcmex$pK;0qM&3|fUM>b8xbeIw(P|^_&UD5XlaHsz`_wR{@JKS$vZV0TvH~$%4ND4d zHcN3$4OI@7;Z-5TVWMBcZ zlz^FD%V3NlZyBNsKQ`%qdNc;ssM+ z(Rg2{qGgPeUuWscNdUDoFzGN!FiJ3SFtPxl03!z@7ZVq=3{%mr&3f6A%pA8^auZ83 KfIPpvHH-k};7b8nDe+Ok#{5S&UD5nlaHsz*OzdWa4+BiV%{326dp;26yAkQ z3mKakYgvF|d?~y&EDM=xSxfjKvNf#I3@LogOtow&{3Tovv1UeT1|XXmq`R3>grSxl zsunC#A^_COp2E}2)Xca*Fhw9ma3NEPKn)v^Cj?}3GlI0Gvjj6}3T@t!QN}36z{0># z^cLvSqF_cKu@XeY1G$>Qll`)S3HTa1~v7z>IT7$*P8(iIZ`YG7c}VUl2!V3K0wVG?4NVJSMW**#m5nWJbY$n*n@ Oll8g9H#g)>VFUmRsZTZl diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index bb7ac13..1500a18 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1203,16 +1203,18 @@ def getUserQuotaData(userdata): quotadata = [int(s) for s in re.findall('(.+?)', r.text)] inuse = [int(s) for s in re.findall('(.+?)', r.text)] - - i = int(math.floor(math.log(quotadata[0], 1024))) - p = math.pow(1024, i) - # s for textlabel - s = round(quotadata[0] / p, 2) + quotadata_value = quotadata[0] + valuequota_MB = 0 + counter = 0 + while(quotadata_value > 9999 or counter > 3): + quotadata_value = quotadata_value / 1024 + counter += 1 + + valuequota_MB = round(quotadata_value, 0) + # PERCENT percent = (100 / int(quotadata[0]))*int(inuse[0]) - # TODO: Hier werden GB nicht korrekt umgerechnet in MB - - return [quotadata[0], inuse[0], str(round(percent, 0)).replace(",", "."), str(s).split(".")[0]] + return [quotadata[0], inuse[0], str(round(percent, 0)).replace(",", "."), str(valuequota_MB).split(".")[0]] From 4a8ae1d5a57de7558542602d33cf44be4994e691 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 18:57:48 +0200 Subject: [PATCH 07/11] tralal --- users/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/users/views.py b/users/views.py index bee1abf..0d724c8 100644 --- a/users/views.py +++ b/users/views.py @@ -2057,6 +2057,7 @@ def cronactionsbill(request, code): # Alle Rechnungen laden, deren Letzter Tag HEUTE ist und bei ausgewähltem Paymentplan 1 eine neue Rechnung erstellen, Mailverschicken, Nutzeraccouns zählen und neue Rechnung in der Agentur hinterlegen new_bills = AgencyBills.objects.filter(end=today) + for bill in new_bills: if bill.agency.paymentstatus == 0 and bill.agency.paymentplan == 1: From 69f0994fa882f79926a24e88058f6f13aa52a11e Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 19:58:15 +0200 Subject: [PATCH 08/11] update MD in Nextcloud --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 08d67af..13e5ef2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ digitale agentur - README -Agenturstand zur Migration in Nextcloud. \ No newline at end of file +Agenturstand zur Migration in Nextcloud. + +UPDATE NEXTCLOUD \ No newline at end of file From 57a0ddc2f53430913b540bced45cb7ffc9d60893 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 20:12:43 +0200 Subject: [PATCH 09/11] final nextcloud --- README.md | 4 +--- .../__pycache__/counter_tag.cpython-38.pyc | Bin 28692 -> 28692 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 13e5ef2..08d67af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ digitale agentur - README -Agenturstand zur Migration in Nextcloud. - -UPDATE NEXTCLOUD \ No newline at end of file +Agenturstand zur Migration in Nextcloud. \ No newline at end of file diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 96a41b7bbb162c5dc8da2b6d19350b29c74baf11..31c27bce95c39b99cac924d6d4970b7ed6f14502 100644 GIT binary patch delta 21 bcmbR8fN{zLMy^m^UM>b8nE!ht7gqrQN*V?| delta 21 bcmbR8fN{zLMy^m^UM>b8xbb`=7gqrQOAH2L From 83f1fa4dfea78b324d3474ae49c9e8c6167e550a Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 20:37:53 +0200 Subject: [PATCH 10/11] gitignore angepasst --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 966ab60..2aeb9a0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ media/ag_default.jpg digitaleagentur/__pycache__/* digitaleagentur/sec.py +__pycache__/* + .DS_STORE .cred @@ -30,10 +32,14 @@ areas/__pycache__/* adm/migrations/* !adm/migrations/__init__.py adm/__pycache__/* +adm/templatetags/__pycache__/* + + standards/migrations/* !standards/migrations/__init__.py standards/__pycache__/* +standards/templatetags/__pycache__/* recoverdir/migrations/* !recoverdir/migrations/__init__.py From 21a31ee918d14c94080a0ae58010c3acb9728869 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Fri, 22 Oct 2021 20:56:20 +0200 Subject: [PATCH 11/11] =?UTF-8?q?readme=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 08d67af..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -digitale agentur - README - -Agenturstand zur Migration in Nextcloud. \ No newline at end of file