From cc99b4b34127febc01bb8df0cbb8a738c684c434 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Wed, 13 May 2020 21:49:55 +0200 Subject: [PATCH] =?UTF-8?q?Bugs=20gel=C3=B6st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dasettings/forms.py | 10 ++++++-- .../dasettings/agencynetwork_content.html | 8 +++--- .../templates/dasettings/groups_content.html | 10 +++----- .../dasettings/structure_content.html | 12 ++++----- .../__pycache__/settings.cpython-38.pyc | Bin 4093 -> 4069 bytes digitaleagentur/settings.py | 24 +++++++++--------- media/default.jpg | Bin 6068 -> 1939 bytes 7 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dasettings/forms.py b/dasettings/forms.py index a42438c..a6b8ff5 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -60,6 +60,8 @@ class UsersNotificationForm(forms.ModelForm): #fields = ['news_mail', 'news_push', 'user_standard_public_mail', 'user_standard_public_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push'] fields = ['news_mail', 'news_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push'] + + # Usertime Form class UserTimeForm(forms.ModelForm): class Meta: @@ -75,11 +77,15 @@ class UserTimeForm(forms.ModelForm): "wd_th" : "Donnerstag", "wd_fr" : "Freitag", } - fields = ["holiday", "loose_holidedate", "startdate", "holiday_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr"] + fields = ["startdate", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr", "holiday", "loose_holidedate", "holiday_start", ] widgets = { - 'loose_holidedate': DatePickerInput(options={"format":'DD.MM', "locale":'de'}), + 'loose_holidedate': DatePickerInput(options={"format":'DD.MM.', "locale":'de'}), "startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['startdate'].required = True # PERMISSION GROUPS FORM diff --git a/dasettings/templates/dasettings/agencynetwork_content.html b/dasettings/templates/dasettings/agencynetwork_content.html index 1282c57..25df9d6 100644 --- a/dasettings/templates/dasettings/agencynetwork_content.html +++ b/dasettings/templates/dasettings/agencynetwork_content.html @@ -41,10 +41,12 @@ {{agn.lastactivity}} {% if outstanding %} {% endif %}{{agsum}} {{agn.standards.all|length}} - + {% if is_adminag %} - - + + + + {% else %} {% endif %} diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index 4ab1de6..905667c 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -23,14 +23,12 @@ - {% if not aggroup.savefordel %} - - {% endif %} - {% if not aggroup.savefordel %} - + + {% endif %} + {% if not aggroup.savefordel %} + {% endif %} - diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 22d27cb..38e1a4b 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -39,8 +39,9 @@ noclickeffect:active { border-style: outset !important;} - - + + +
@@ -64,9 +65,9 @@ noclickeffect:active { border-style: outset !important;} {{ task.area.name }} {{ task.created_area_by.first_name }} {{ task.created_area_by.last_name }} {{ task.created_area_date }} - - - + + + {% endif %} @@ -76,7 +77,6 @@ noclickeffect:active { border-style: outset !important;}
- {% endfor %} diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index c0cb3e88874785265131879772c9763988e4f495..6e440fa308400b27b6fdcd0c6a94945d16deafb6 100644 GIT binary patch delta 369 zcmW+u$xgyx7^G5{f@KpBQLHE@6EO;I;DV@#ilRYC_)JXDY5q1rWciJu7cag5>6No5 zZ(Kb120n+6VPbVAGm}gv^P_w#a#@xgHVahzy#46OcWH@aILHMjxvlhI95P%M-SEKM zAJzr(!bd(#&;L)j3$w$5Vn~O5_YhQ zJ!G)YL|s6(FEW9qa6n-k;>cSseX z+qE&%cxaAPiga-`MUZZ@{PEjc+8Oz^JLP#83rtX*VYIV z%%f?Ukp&jA!b&#S$PPOMIN+2x65twsgr6lhIS@t!Ti8YvG3;Phnk6Up$c24r3VIwM zjsy;olsK6oHR2>ji#Q@T(#U8^8pji6C(OxAYxf{eODNDXinIbfd9_l9hU^S(loc+`XP;$)!Xp h10|O#-)8f*3lv-8X`#Q{kBH-0t~SH6^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<(iUwW$pkka<)WpdpCN3cY31zV>gMj@ z=@lFj8WtWA8I_!pnwFlCnN?g;T2@|BS=HRq+ScCD*)?hMl&RCE&zL!D(c&dbmn~nh za@D5ITefc7zGLUELx+zXJ$C%W$y1juU%7hi`i+~n9zJ^fI8~-!RTl=4(X4XY)LFBcve8ufs zJl5~(-|4Gud}lg)W&gVqowaSg0p;bEm9qQR&Pro=!T!|SRV2{0Y)c@BLO~(H{<3@0 zJY%%_qYmx4mNH*6f5zjNyLYZR_hg>utLj;hIMLpUY4s}cUsJ-ex4%DCrSNa-dH+J) zEAvv$?)WC#>I$_$^wvdGs{&nBQ?sHLG|Wg)INcY$=|98Q*Q}jsI!C72OsbmY1&jUN zQ7{%PL9Ce@9%%OZ$)WnH!;}AB{Ab#TFc!l{q1mUWZrN5Dz2QOCysM{-xAa}IRK4+J zvL_xb;nr*KRBrd?u-8def0bZBT2~q^1dr$Oy_WIc; zE^k_vt%qb8hRr)`L%+WY`p>YrbyWyH(@w_Ed1bEtcmK=K7f9~Ga9sZ`%iS~nGi=M! zLh=JfG(A?aURwO>_|MD8e#0=UJAdE(_wvt?;zJ}n8xc9+q#2WQdQ+wN#a^VS&_MU& z5)}qd3#OgkpW6PVx$!LB#IfoM9-k(?p6;_ycf#X>)5(`MT9qMr7Q^6mzcQj+%MnuKTOD; zjZfLC>nr!2N_{=WVx3P3vePiKT1!g87t><~T5p!GNdEH@DcUfT-qb6L46}@S63oxp zO%1}Asy1%DU3>9(!Q!db5x>J^k*tqhi^Ks1mQlpDh*{>6VG^dN?%q6|t{Kj<{KGyA z)A&_w2M^jJB@c`=q{+d);%v(66Rc}oco@DmBhm$W*oy>4&bsiQp)*_VVf*KGWe8{g GzX<^EIw-yX literal 6068 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 P_un@k<^VnSIqm-f0_)yP