diff --git a/dasettings/templates/dasettings/agency_content.html b/dasettings/templates/dasettings/agency_content.html index 32502a5..e071fe7 100644 --- a/dasettings/templates/dasettings/agency_content.html +++ b/dasettings/templates/dasettings/agency_content.html @@ -10,6 +10,7 @@ {% csrf_token %} + {{formfield.media}}
diff --git a/dasettings/views.py b/dasettings/views.py index 9e21ff9..90cbaa1 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -34,7 +34,7 @@ from django.urls import reverse_lazy import re import json from django.conf import settings # import the settings file - +from PIL import Image def randomString(stringLength=10): """Generate a random string of fixed length """ @@ -342,9 +342,26 @@ def SettingsAgency(request, context): if request.POST.get("form_type") == "agencyform": agencyform = AgencyUpdateForm(request.POST, instance=request.user.profile.agency) if agencyform.is_valid(): + + agency = request.user.profile.agency + if 'agencypic' in request.FILES: request.user.profile.agency.agencypic = request.FILES['agencypic'] - agencyform.save() + agencyform.save() + else: + ''' + SAVE ONLY AG-DATA + ''' + agency.name = agencyform.cleaned_data.get('name') + agency.inhaber = agencyform.cleaned_data.get('inhaber') + agency.agency_email = agencyform.cleaned_data.get('agency_email') + agency.phone = agencyform.cleaned_data.get('phone') + agency.street = agencyform.cleaned_data.get('street') + agency.plz = agencyform.cleaned_data.get('plz') + agency.city = agencyform.cleaned_data.get('city') + agency.save() + #agencyform.save() + context['agencyform'] = AgencyUpdateForm(instance=request.user.profile.agency) messages.success(request, f'Agenturdaten aktualisiert!') return render(request, 'dasettings/settings.html', context) diff --git a/media/.DS_Store b/media/.DS_Store index b744eb7..09a1383 100644 Binary files a/media/.DS_Store and b/media/.DS_Store differ diff --git a/users/usersforms.py b/users/usersforms.py index b55ae79..f423fbb 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -78,6 +78,7 @@ class AgencyUpdateForm(forms.ModelForm): width = forms.FloatField(widget=forms.HiddenInput()) height = forms.FloatField(widget=forms.HiddenInput()) rotation = forms.FloatField(widget=forms.HiddenInput()) + class Meta: model = Agency labels = { @@ -94,6 +95,7 @@ class AgencyUpdateForm(forms.ModelForm): def save(self): photo = super(AgencyUpdateForm, self).save() + try: x = self.cleaned_data.get('x') y = self.cleaned_data.get('y') @@ -103,11 +105,11 @@ class AgencyUpdateForm(forms.ModelForm): image = Image.open(photo.agencypic) rotatet_image = image.rotate(rotation, expand=True) cropped_image = rotatet_image.crop((x, y, w+x, h+y)) - #resized_image = cropped_image.resize((w, h), Image.ANTIALIAS) cropped_image.save(photo.agencypic.path) return photo except: print("no photo") + ######################## USERSPERMFORM LĂ–SCHEN WEIL IN AGENCYGROUP ################################