diff --git a/adm/models.py b/adm/models.py index bdbb16b..60a88b1 100644 --- a/adm/models.py +++ b/adm/models.py @@ -23,3 +23,6 @@ class MainSalesMonth(models.Model): salesmonthdate = models.DateField(default=timezone.now) value = models.FloatField(default=0.0) + +class AGBLog(models.Model): + entry = models.CharField(default="", max_length=5000) \ No newline at end of file diff --git a/adm/views.py b/adm/views.py index ad6af6d..7c7049c 100644 --- a/adm/views.py +++ b/adm/views.py @@ -74,10 +74,9 @@ class delAgency(DeleteView): template_name = "adm/adm_admdelconfirm.html" def delete(self, *args, **kwargs): - # Alle Abwesenheiten werden entfernt - # TODO: Hier prüfen, ob das nachher auch klappt! - Absence.objects.filter(agency=self.get_object).all().delete() - + # Alle Abwesenheiten werden entfernt und dann erst die Agentur + Absence.objects.filter(agency=self.get_object().pk).all().delete() + messages.success(self.request, f'Agentur erfolgreich gelöscht!') return super(delAgency, self).delete(*args, **kwargs) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 35dc2a5..65a3815 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 6fec9de..7ecf0b6 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1091,11 +1091,17 @@ def getBaseURLIcsExAll(agency): def getTrialDays(agency): today = date.today() regdate = agency.registerdate - + remainingdays = regdate - today finaldays = 0 + print(regdate) + print(today) + print(remainingdays.days) + if remainingdays.days > 0: finaldays = remainingdays.days + elif today == regdate: + finaldays = 30 return finaldays diff --git a/users/admin.py b/users/admin.py index 2a4e016..d625cf5 100644 --- a/users/admin.py +++ b/users/admin.py @@ -10,7 +10,7 @@ from timemanagement.models import Workday, Breaks, AbsenceReason, FreeDays, Abse from chat.models import ChatRoom from recoverdir.models import PersLetter, Documents, Handlungsleitfaden, RDContact, RecoverDirSetting from simple_history.admin import SimpleHistoryAdmin -from adm.models import MainStatistic +from adm.models import MainStatistic, AGBLog admin.site.register(StandardComments) @@ -42,4 +42,5 @@ admin.site.register(Handlungsleitfaden) admin.site.register(RDContact) admin.site.register(RecoverDirSetting) admin.site.register(MainStatistic) -admin.site.register(RegNotfallhilfe) \ No newline at end of file +admin.site.register(RegNotfallhilfe) +admin.site.register(AGBLog) \ No newline at end of file diff --git a/users/views.py b/users/views.py index 69de5cf..99ff3d3 100644 --- a/users/views.py +++ b/users/views.py @@ -523,6 +523,13 @@ def onlyRD(request): } return render (request, 'users/register_rd.html',context) +from adm.models import AGBLog + +def saveNewAGBLog(byuser, agname, usermail): + agblog = AGBLog(entry="Agentur von " + byuser + " mit Mail " + usermail + " am " + str(datetime.now()) + " für Agentur " + agname + " erstellt, AGBs und Vertragsdaten akzeptiert.") + agblog.save() + + ''' Neue Agentur UND Notfallhilfe bestellen @@ -541,7 +548,7 @@ def registerNewAgencyRD(request): mailset = User.objects.filter(email=email) if(len(mailset) == 0): - # AGENTURREGISTRIERUNG + # AGENTUREGISTRIERUNG newuser_name = newagencyform.cleaned_data.get('first_name') + ' ' + newagencyform.cleaned_data.get('last_name') agency = Agency() @@ -582,6 +589,9 @@ def registerNewAgencyRD(request): rd.rabatt = True rd.save() + # LOG AGB SAVER + saveNewAGBLog(newuser_name, agency.name, email) + # E-Mail für Passwort-Setzung! form = PasswordResetForm({'email': email}) if form.is_valid(): @@ -651,6 +661,8 @@ def registerNewAgency(request): msg_html = render_to_string('users/register_mail.html', {'username': newuser_name}) + # LOG AGB SAVER + saveNewAGBLog(newuser_name, agency.name, email) # E-Mail für Passwort-Setzung! form = PasswordResetForm({'email': email}) if form.is_valid():