diff --git a/message/views.py b/message/views.py index dbbe02a..7fe79ee 100644 --- a/message/views.py +++ b/message/views.py @@ -11,6 +11,7 @@ from .models import Message from django.contrib import messages from django.http import JsonResponse from notificsys.models import UserNotification +from django.urls import reverse_lazy # ALLE STANDARDS EINER AGENTUR @login_required @@ -117,5 +118,5 @@ def delsinglemessagefromsingle(request, pk): 'form' : MessageForm(request.user), 'usermessages' : Message.objects.filter(target_user=request.user, agency=request.user.profile.agency).order_by('-created_date') } - - return render (request, 'message/message.html', context) + + return redirect ("messages") diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 6d76602..1efc242 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -4,14 +4,14 @@

Bereiche und Aufgaben von {{user_first_name}} {{user_last_name}} {% if user|usergperm:"usermanager" %} - + + {% endif %}

-
- +
Name
@@ -120,6 +120,8 @@ var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}]; if(sortstatus == false){ sortstatus = true; for(i = 0; i < sortablearea_ids.length; i++){ + $("#changingorder").show(); + $("#activatechangingorder").hide(); $(".arrows_area_" + sortablearea_ids[i]).show(); $( "#sortarea_" + sortablearea_ids[i] ).sortable("enable"); } @@ -127,6 +129,8 @@ var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}]; else{ sortstatus = false; for(i = 0; i < sortablearea_ids.length; i++){ + $("#changingorder").hide(); + $("#activatechangingorder").show(); $(".arrows_area_" + sortablearea_ids[i]).hide(); $( "#sortarea_" + sortablearea_ids[i]).sortable("disable"); } @@ -136,6 +140,13 @@ var sortablearea_ids = [{% for area in areas %} {{area.pk}},{% endfor %}]; {% endif %} +$( document ).ready(function() { + for(i = 0; i < sortablearea_ids.length; i++){ + $(".arrows_area_" + sortablearea_ids[i]).hide(); + $( "#sortarea_" + sortablearea_ids[i]).sortable("disable"); + } +}); + diff --git a/organizer/forms.py b/organizer/forms.py index e335dab..daf371e 100644 --- a/organizer/forms.py +++ b/organizer/forms.py @@ -22,8 +22,8 @@ class OrganizerAddContact(forms.ModelForm): class Meta: model = AGContacts labels = { - 'first_name' : "Vorname", - 'last_name' : "Nachname", + 'personname' : "Ansprechpartner", + 'company' : "Organisation", 'mail' : "E-Mailadresse", 'phone1' : "Telefon 1", 'phone2' : "Telefon 2", @@ -33,12 +33,15 @@ class OrganizerAddContact(forms.ModelForm): 'desc' : "Anmerkungen" } - fields = ['first_name', 'last_name', 'mail', 'phone1', 'phone2', 'street', 'plz', 'city', 'desc'] - + fields = ['company', 'personname', 'mail', 'phone1', 'phone2', 'street', 'plz', 'city', 'desc'] + def __init__(self, *args, **kwargs): super(OrganizerAddContact, self).__init__(*args, **kwargs) + self.fields['company'].required = False + self.fields['personname'].required = False + self.fields['mail'].required = False self.fields['phone1'].required = False self.fields['phone2'].required = False self.fields['desc'].widget.attrs['rows'] = 4 @@ -50,8 +53,8 @@ class OrganizerUpdateContact(forms.ModelForm): class Meta: model = AGContacts labels = { - 'first_name' : "Vorname", - 'last_name' : "Nachname", + 'personname' : "Ansprechpartner", + 'company' : "Organisation", 'mail' : "E-Mailadresse", 'phone1' : "Telefon 1", 'phone2' : "Telefon 2", @@ -61,11 +64,14 @@ class OrganizerUpdateContact(forms.ModelForm): 'desc' : "Anmerkungen" } - fields = ['first_name', 'last_name', 'mail', 'phone1', 'phone2', 'street', 'plz', 'city', 'desc'] - + fields = ['company', 'personname', 'mail', 'phone1', 'phone2', 'street', 'plz', 'city', 'desc'] + def __init__(self, *args, **kwargs): super(OrganizerUpdateContact, self).__init__(*args, **kwargs) + self.fields['company'].required = False + self.fields['personname'].required = False + self.fields['mail'].required = False self.fields['phone1'].required = False self.fields['phone2'].required = False self.fields['desc'].widget.attrs['rows'] = 4 diff --git a/organizer/models.py b/organizer/models.py index 1e5b067..ec46e4d 100644 --- a/organizer/models.py +++ b/organizer/models.py @@ -40,8 +40,8 @@ class QuickLinks(models.Model): class AGContacts(models.Model): agency = models.ForeignKey(Agency, on_delete=models.PROTECT) - first_name = models.CharField(default="", max_length=200, blank=False) - last_name = models.CharField(default="", max_length=200, blank=False) + personname = models.CharField(default="", max_length=200, blank=False) + company = models.CharField(default="", max_length=200, blank=False) mail = models.CharField(default="", max_length=200, blank=False) phone1 = models.CharField(default="", max_length=200, blank=False) phone2 = models.CharField(default="", max_length=200, blank=False) @@ -51,7 +51,7 @@ class AGContacts(models.Model): desc = models.TextField(max_length=3000, blank=True) def __str__(self): - return f'{self.first_name + " " + self.last_name}' + return f'{self.first_name}' def get_absolute_url(self): return reverse('cont-update', kwargs={'pk':self.pk}) diff --git a/organizer/templates/organizer/contact_delete.html b/organizer/templates/organizer/contact_delete.html index bb3ebda..e802da4 100644 --- a/organizer/templates/organizer/contact_delete.html +++ b/organizer/templates/organizer/contact_delete.html @@ -5,7 +5,7 @@
- +
diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html index 5d1b872..cc8aadc 100644 --- a/organizer/templates/organizer/contacts_content.html +++ b/organizer/templates/organizer/contacts_content.html @@ -14,12 +14,15 @@ {% for agc in contacts %} -
+
-
{{agc.first_name}} {{agc.last_name}} +
{{agc.company}}

+ {% if agc.personname|length > 0 %} + Ansprechpartner: {{agc.personname}}
+ {% endif %} {% if agc.mail|length > 0 %} E-Mailadresse: {{agc.mail}}
{% endif %} @@ -44,13 +47,16 @@

- +
-
- {% if agc.mail|length > 0 %} +
+ {% if agc.personname|length > 0 %} + Ansprechpartner: {{agc.personname}}
+ {% endif %} + {% if agc.mail|length > 0 %} E-Mailadresse: {{agc.mail}}
{% endif %} {% if agc.phone1|length > 0 %} diff --git a/organizer/views.py b/organizer/views.py index 4832ff8..5c919ed 100644 --- a/organizer/views.py +++ b/organizer/views.py @@ -20,7 +20,7 @@ class OrganizerManagement(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) quicklinks = QuickLinks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name') - context.update({'active_link' : 'organizer', 'quicklinks' : quicklinks, 'contacts' : AGContacts.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('last_name'), 'agpass' : AGPassword.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name'), 'agencygroups' : AgencyGroup.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('agencygroupname') }) + context.update({'active_link' : 'organizer', 'quicklinks' : quicklinks, 'contacts' : AGContacts.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('personname'), 'agpass' : AGPassword.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name'), 'agencygroups' : AgencyGroup.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('agencygroupname') }) return context class OrganizerAdd(LoginRequiredMixin, CreateView):