diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html index 6d03f8a..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 %} @@ -285,7 +295,7 @@
    -
    +
    {% if messages %} {% for message in messages %} @@ -532,7 +542,7 @@ function removeNotification(notifyid){ } - +/* $(document).on('click', function (e) { if(e.target["id"] != 'chatButton'){ @@ -540,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..6f5082b --- /dev/null +++ b/adm/templates/adm/adm_import_flow.html @@ -0,0 +1,9 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +
    +

    Agenturimport der Agentur {{agency.name}}

    + Die Seite nicht verlassen oder neu laden! +
    +
    +{% 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/urls.py b/adm/urls.py index 2f0acda..53d6453 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'), diff --git a/adm/views.py b/adm/views.py index 684f999..2ee00d6 100644 --- a/adm/views.py +++ b/adm/views.py @@ -677,3 +677,40 @@ class AdmAddBreak(CreateView): + +''' + 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 +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)}) + + # 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}) + + return context diff --git a/api/urls.py b/api/urls.py index 57c1c7f..8d4a954 100644 --- a/api/urls.py +++ b/api/urls.py @@ -14,5 +14,6 @@ urlpatterns = [ # MIGRATION path('migrateagencyusers/', views.migrateAgencyUsers, name="api-migrateagencyusers"), # EXTERNAL FROM NC - path('logout/', views.test, name="api-test"), + path('logout/', views.apilogout, name="api-logout"), + path('uschanged//', views.userChangedInNc, name="api-userchanged"), ] \ No newline at end of file diff --git a/api/views.py b/api/views.py index d8ad999..b69883d 100644 --- a/api/views.py +++ b/api/views.py @@ -12,9 +12,10 @@ 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 * class GetUserId(APIView): #permission_classes = (IsAuthenticated,) # <-- And here @@ -90,12 +91,34 @@ def migrateAgencyUsers(request, pk): return JsonResponse(datapackage) -from django.contrib.auth import login, logout -from django.contrib.auth import update_session_auth_hash -from django.contrib.sessions.models import Session + @api_view(['GET', ]) -def test(request, uid): +def apilogout(request, uid): + print("LOGOUT: " + str(uid)) user = User.objects.get(username=uid) [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) + 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(" ") + 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"}) \ No newline at end of file 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 @@