From a7764977f512575b4b098d0c2de272badc72ec7b Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 26 Mar 2021 11:29:57 +0100
Subject: [PATCH] Diverse Bugs

---
 adm/models.py                                 |   3 +++
 adm/views.py                                  |   7 +++----
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 24846 -> 24908 bytes
 standards/templatetags/counter_tag.py         |   8 +++++++-
 users/admin.py                                |   5 +++--
 users/views.py                                |  14 +++++++++++++-
 6 files changed, 29 insertions(+), 8 deletions(-)

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 35dc2a5cf178464701d7b7c49c2e89282df1fa28..65a38154811f254c7f606f7c188b94364e07ef66 100644
GIT binary patch
delta 240
zcmeA>#CYZqBVQ;lFBbz4#BYgB&@11_mlj<g2IQ77EMQ#7P|H}uki}HXRKrxmD8W$6
zoWfYkQo>xr)Xd1p0HhhAG;<aUh*blmQy8;Zirhe~T9!PX8pax?Y^I{16sB618kS%N
zO=iC$Mxg0M`9M;WwMZ1iUJoK%fC9Hz3yL!HN+$1*4w91q3NkQpFtPzL3nK>*axrm%
zX%?oUrpXJUL?-*$a87oL@!}0(VPGg`0;?}--aIqrJ`;Nr(6pjv#>pSp#WzojFJ)vF
HWMKpVSvE9K

delta 178
zcmX?eh_UYwBVQ;lFBbz4$l1gsoGRPMmlo}<2jrG8EMQ#7P|H}uki}HXRKrxmD8W$6
zoWfYkQp21Dq_bIyv_LE%pCy<<lgY1$5vWU(rAQP=6|DymE<lmVpQD3B_<%eHCJsh6
zAZB6Y0@6i|lNUsZO!l+koZJxO#p}nyz);KtR#nur`FhNKCiX_4=AtIX$sgFoH(!Y_
KWn|`NVFUpEyC?bp

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():