From 9179e97be79d7f4618fc19a2ab2fc1a339afc92f Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 13 Dec 2020 14:32:15 +0100 Subject: [PATCH] Bug Rechnung und Abwesenheitscheck done --- adm/templates/adm/adm_bills.html | 2 +- .../__pycache__/settings.cpython-38.pyc | Bin 4722 -> 4729 bytes digitaleagentur/settings.py | 2 +- recoverdir/templates/.DS_Store | Bin 6148 -> 6148 bytes recoverdir/templates/recoverdir/.DS_Store | Bin 6148 -> 6148 bytes requirements.txt | 4 ++-- .../templates/standards/standards_add.html | 11 ++++++++++- .../__pycache__/counter_tag.cpython-38.pyc | Bin 19964 -> 20193 bytes standards/templatetags/counter_tag.py | 12 ++++++++++++ users/.DS_Store | Bin 6148 -> 6148 bytes users/static/.DS_Store | Bin 6148 -> 6148 bytes users/static/users/.DS_Store | Bin 6148 -> 6148 bytes users/views.py | 14 ++++++++------ 13 files changed, 34 insertions(+), 11 deletions(-) diff --git a/adm/templates/adm/adm_bills.html b/adm/templates/adm/adm_bills.html index e748658..bbd0ad6 100644 --- a/adm/templates/adm/adm_bills.html +++ b/adm/templates/adm/adm_bills.html @@ -25,7 +25,7 @@ {{ele.billnumber}} {{ele.billdate}} - {% loadFinalMoney user as fm %} + {% loadFinalMoneyByAgency ele.agency as fm %} {{fm|floatformat:2|intcomma}} € diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 67f397bb2fe7cff1d6f1986c0eb60a4c2ad87301..b25f3672f3c637eb7ca67fb572f28913335fa664 100644 GIT binary patch delta 72 zcmeyQ@>7L7l$V!_0SJ=$uWjUB!7}+Go9yPzEOJbn-?7PXDfsJ$7N-^!>t~b{CFT~S b>ieZulqBcmm!{|k6lInrmTXoQ^k)PBL>?E{ delta 90 zcmeyV@=1j|l$V!_0SL59W^CkM!Ls=RiyV`TbV^oYUV6S>a(-S(QDzdDPR%PRsVqn> o-u#wLmP^t@KeRZts8~Ovq$n}BAXVQbKe;p)sHAwamY_c)06&i&(*OVf diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 9cc2733..bbfdfe0 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -58,6 +58,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') # Application definition INSTALLED_APPS = [ + 'django.contrib.contenttypes', 'notificsys.apps.NotificsysConfig', 'users.apps.UsersConfig', 'dasettings.apps.DASettingsConfig', @@ -80,7 +81,6 @@ INSTALLED_APPS = [ 'mathfilters', 'django.contrib.humanize', 'django.contrib.auth', - 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', diff --git a/recoverdir/templates/.DS_Store b/recoverdir/templates/.DS_Store index 90c316d25d64b9edc97b6b9f4511d637cf5e1466..1c04afc749f79557a5709a3258fb81c0d69963cb 100644 GIT binary patch delta 154 zcmZoMXfc=|#>B`mu~2NHo+2ab!~pAw2O5BMkAy%@x?yl~er^E+2r!Gj0*Z;`=DWBg z<>V&;MK~B38dk|HKI8}yPr)WGP>_LS2I~QajXl9^o7p+|Ie>O<-1wb&GQWr}56FB* RAZ`HS%|0SKm?t){001VUDK-EA delta 72 zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>okc5}VI3TC;8bz^K8vnVo~51E^&4L&opS allet-IT;xk7!Ck2!(CG`BOPB%CI1;7+ diff --git a/recoverdir/templates/recoverdir/.DS_Store b/recoverdir/templates/recoverdir/.DS_Store index 75078b09a96bfed07f8c2daaa79be81e0c6fc544..e8154f319addc1385cb39449ea6ddb105357a530 100644 GIT binary patch delta 158 zcmZoMXfc=|#>B)qu~2NHo+2aL!~pA!9~u~ej2{1qYm^0Y(hY-?^K%Orz+lpgi7VAa za`RnWl5+BsfI=J$3=IpM7aVegh^Jr^=P$@WGK0xsCJ*u~2NHo+2aD!~pBb1|lqz`I&q+yD%SS*&M)}$+VfBgP#MaXtN{p Wcjn3bB8H3%lWlmUH^+#qU
- {% for g in agencygroups %} + {% for g in agencygroups %} + {% if g.agencygroupname == "Notfallhilfe" %} + {% if request.user.profile.agency.module_recoverdir %}
+ {% endif %} + {% else %} +
+ + +
+ {% endif %} {% endfor %}
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 57dfc97422c64c7a011d7d37b0e8e34b0f8542dc..5d253414860a62c4736e282618d831c62c5d1b10 100644 GIT binary patch delta 439 zcmX|+OD}6t6vy{}cc*RYai#SNhl;2=CFvLqJtAH~BtkH$#yP=hwX%DNdW@JD7|8ZY zL?mX0a$;iUBZx$V(ftB)8A%x2y$!5n{njJ@m9^IQIsRUte5$N0K%^bjJf&Fbuw290 zP5VBpw8D0?d2F8SkzLH$rf-tyr|umaMbm72s$lU#e97VIl~pS~Zf!UV+5DOrpWw^u zX~zwFuev|zJoFlmPHCUKc; z&hQoxqBGttrJO0~3NZ=Y!=oy1lnNeE&{X+@2ARE7XY*-uU^$o0j^%S!v9D+>TDgVd z8zrPrDg}fFsUKeIrxoB)h|8cRrVSfk;@$|+Hi(&eO?()ewLZ`91Or77UIf5n>WPqh z+V{v%FEWFRFxvaqC95XhW;IG^)_15K}M|lt{cM is{Z&BD|vG*YxT$mDRj6GqZ&db41rSVDu$%@GyDg=ooZhI delta 260 zcmaDjm+{YRM!ry9UM>b8NZxZMo-J-7pA2KyM(s`(wiNbY2Ft~b{CFT~S>bvA8m*%GCl@xC_VOwOys5$w%gDGRwWL`%HMwQ7MokS*|wd0&@7;HR~7!wC08xsdpkt$Hdbn)LH86J?uOe~B{j6#fTj9iRG>YL-8pR+LXPj>f6 zXSCbA-b0;{(R%WAPfbSi$&6lG8AB#-_p)SjWn^H`%-a0TtC~qv1;{Q^1rh2X!VW~Z pPQG9(!Ovlno1apelL``IDAw4#$ybJvpNEB!iyMfAf!KwG5dflOK;8fV diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index dc3d68d..8e8d408 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -747,6 +747,18 @@ def loadFinalMoney(user): finalMoney = (21.0 + usercount*3) * 1.16 return finalMoney +@register.simple_tag +def loadFinalMoneyByAgency(agency): + usercount = len(User.objects.filter(profile__agency=agency)) + + if(usercount < 4): + usercount = 0 + else: + usercount = usercount - 3 + + finalMoney = (21.0 + usercount*3) * 1.16 + return finalMoney + @register.simple_tag def loadUserCountMoney(user): diff --git a/users/.DS_Store b/users/.DS_Store index f12733d715e06052cdc12ae81349bab6e884428e..073fc41fb4bd99c40c9d29527dead3e4c7d53cfd 100644 GIT binary patch delta 72 zcmZoMXffC@iq!jK5WnGDGV8HT~h Y`MCu^aR#PK3m7KXvx#k%W_u|J0C_$Zy#N3J delta 72 zcmZoMXffC@iB`mu~3YagMono$PnRV0y02=bz;D7M%IZsQuVA1r3}RksSHI7#X0GQ z!O8i#1t0}X$|3(i>JYNI`7SO=Ir&LIQIK)_A1ylMh^``qfQo_)BpWUz0JU!{Nn)F9 kAi}bln}eGJ=-Q2i-!T&ghHP(*mMhsYjg08|q$-T(jq delta 77 zcmZoMXfc=|#>AjHu~3+iaWW616c+;%0|YQm4A{N-0HZtG