From c945c8d4f4d6c55f61534112a665b8eb9a4c93b2 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 1 May 2020 00:55:10 +0200 Subject: [PATCH] Abwesenheit Zwischencommit --- .gitignore | 6 ++- .../__pycache__/admin.cpython-38.pyc | Bin 204 -> 0 bytes .../__pycache__/apps.cpython-38.pyc | Bin 399 -> 0 bytes .../__pycache__/models.cpython-38.pyc | Bin 2286 -> 0 bytes .../__pycache__/urls.cpython-38.pyc | Bin 518 -> 0 bytes .../__pycache__/views.cpython-38.pyc | Bin 3164 -> 0 bytes timemanagement/migrations/0001_initial.py | 44 ------------------ .../migrations/0002_absence_absencereason.py | 44 ------------------ timemanagement/migrations/0003_freedays.py | 25 ---------- .../__pycache__/0001_initial.cpython-38.pyc | Bin 1423 -> 0 bytes .../0002_absence_absencereason.cpython-38.pyc | Bin 1652 -> 0 bytes .../__pycache__/0003_freedays.cpython-38.pyc | Bin 1012 -> 0 bytes 12 files changed, 5 insertions(+), 114 deletions(-) delete mode 100644 timemanagement/__pycache__/admin.cpython-38.pyc delete mode 100644 timemanagement/__pycache__/apps.cpython-38.pyc delete mode 100644 timemanagement/__pycache__/models.cpython-38.pyc delete mode 100644 timemanagement/__pycache__/urls.cpython-38.pyc delete mode 100644 timemanagement/__pycache__/views.cpython-38.pyc delete mode 100644 timemanagement/migrations/0001_initial.py delete mode 100644 timemanagement/migrations/0002_absence_absencereason.py delete mode 100644 timemanagement/migrations/0003_freedays.py delete mode 100644 timemanagement/migrations/__pycache__/0001_initial.cpython-38.pyc delete mode 100644 timemanagement/migrations/__pycache__/0002_absence_absencereason.cpython-38.pyc delete mode 100644 timemanagement/migrations/__pycache__/0003_freedays.cpython-38.pyc diff --git a/.gitignore b/.gitignore index 9d79368..f46a329 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,8 @@ message/__pycache__/* organizer/migrations/* !organizer/migrations/__init__.py -organizer/__pycache__/* \ No newline at end of file +organizer/__pycache__/* + +timemanagement/migrations/* +!timemanagement/migrations/__init__.py +timemanagement/__pycache__/* \ No newline at end of file diff --git a/timemanagement/__pycache__/admin.cpython-38.pyc b/timemanagement/__pycache__/admin.cpython-38.pyc deleted file mode 100644 index b9633948080e536782b512e8d3a0b242725d5369..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmWIL<>g`kf^Y3hV-N=!FabFZKwK;UBvKes7;_kM8KW2(8B&;n88n$+0!0}# z8E>&BrsQVk`Drpm@ug%X=B4NBCFkdr6lEqAfecv5P{a(Rz{D?CXRDad;?$zz7?1p% z^wgplm;B_?+|<01;uv?&keHOr^vsgPoYcg0pipU1Oi5;LYHng4kPA{11GY!6pz;=n TO>TZlX-=vgBhci}K+FIDbwxFS diff --git a/timemanagement/__pycache__/apps.cpython-38.pyc b/timemanagement/__pycache__/apps.cpython-38.pyc deleted file mode 100644 index 18fb3861f533e110e50324372d926659063b760a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmY*Vy-ve05VqqWrKLp-JOFE!J^(_fsFey!7uqGVu&kc3f@~+)$-oQ}Pr|?}Wo6<8 z7??OGNVF&2pTG0>oo+jwjtScL+xxx2{27~lOR<@whjR=-fEr?HK`B`gNPxW(V2Zx5 zB7yXd*5KZ06|U6oVoK1%kh6!5~2f)}3uitE_ZVE2~^H zuoNfF!RtCtyG#fttrDUe3t=m0O{^zEJhjsNA!*DX#Am40ho9x*f^UQJf!|a{E6-nK9mvtRx^|NQl7f%xs3>oeFH7XrcnOf&hdNg7S7F_T{r!P*>;s*=&I)qX~nQzqY=TYxrak?c+RA1ZFTZHx_1Wnl!d@YhlN>9^1LIaAVgr9vIAF?ym-Oxq00A#g0879p(Y? zTEqw9vo4Tsi*$hmtOummA_0()ML?n!>9PKSF<5(rbr=IvbruEVd5Mwpq~wy2of#L0 z%R`!Q@#iAh##v4fxDlJoh%Ig(JKRO=F!R)kJ)Qfjyo*u5EN0WkoZ4{@d5F)jad^n1 zOL?DlusC0NPYZd%(&d?{x`jxvLSAvz*_Av!DaUa%)q^Ch5=|R4m5@#bL&C7I&Ies%Rf;8fOcxVda)p zDl27k!Ojf%4j!SyKf}E*CnP~R`KHKcTu%0j!+OC*RZbo}98Xv_%c?Zz^tP&&lL`-9 zqyj0;nKUwPJzq-Fse`j5NBZV^duaT>MSX_JZy>6}NO}^|fs6shJ?27KI23t!DUX;- zvPx8jA!%)TF>&ysQ5otEEa?$WYaWed4}XKc>=U#`VVweLB5zS3G2{k?+Z0F#xrq>a z?IYzKg6>jyo5G6bW^|7*T1|xW0#O?vOXF9FS{3jJcicdf-?$yM(0CuDoSNGA0TF~T zk#jzdn5X?7?MzD)9si!EWg#?0%6Rn`UUg>45PvFIq%V`4i&-@vpP3pP-NcZlL^DLZ zsP5i8m5u)#a<~e2ivng6ja5UzQ8kB!ILhQA_H`!t^Ek-LWM1SMs_a?{-^H`(`6~+h zW{5))euY93ew!x$hHwLg4!^E}G)|)i(lnGNCoFdsd zHjs6xN5ZAIk#C|qk|=Mr*P`~?9cDq8zVcdOv?Q%Dhw?*wfd0mT-Po3Fq`ON^mfM-W z;E;39v#Ol(nf&t)!D=y+@8KHmpf04sAGw?sCD)xu%PCFZH93Fx^*w{TZ(anKz5fXw z8Hc*-Bw0C6^CJ|jVC`7>2lvOx=*go;s)Mcy`>F1jzpPrbWa6k$;X_ezw4}x?{njT5 z9$D389G>Si_gb5LiWQJ0O7hC9V}2sn$lmkN3zAD3BIf=Ko(~ns#MVseD9te@x+X1m!GwDz7Ex z3tavTXGy)NA*OFiLPvv8b=h$$X2lkpHrvs?HV5C8%%)puUCp3oouX diff --git a/timemanagement/__pycache__/urls.cpython-38.pyc b/timemanagement/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index d8e80d2fd6f6fd2f9fd6f632c544e7b1c629ce00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmYjN%}yIJ5Vo_M-OX>Q=$U&CgnLz0L_{ha=%sL3tw2sZ+8C|vbnNA4-+>3I`bNHT z;t7x{Rq9xvhOs>Q=6}AqoJ@v{O5uaDH`u3C*zpDt4K*EdBZd>Ighy4^mI}t zIxSPO6PY%Bot2r+%Ul;_!5MJbhfHQNe@qA$P{_d>9zrfh5!XpMkmDb0HhHEAY{o;n z6@D}8g=u4JWv&r^whBRp{VkwY&MCWdKJ!?Ugz1ISa4w9fL4)z3i1y+}+=q{gl>@VW z4N?qzVBN&)L;XKH&NMZV?cchRmdsLxTCQ%ywQXTva(H^S6*-eTjhM=OMb zH_zG{k7_j+t>4TgtSt&}(P2VKNC#%2f2-imVHO?nx>!W-h*}YE4`|#kh96=esz1w< z&();^bk(VCYQSn~*KOqJs&8i(l~lFzq5&dqe2bMQ-aBShTyVa92*np|W!u2lcrQ05 OHRgN#Q#R)G{{91umzGEX diff --git a/timemanagement/__pycache__/views.cpython-38.pyc b/timemanagement/__pycache__/views.cpython-38.pyc deleted file mode 100644 index c4e8005338367ea27e8f43cbbb35b621e24bf3b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3164 zcma)8&u<&Y72cU$?k<-UMg6dBxo!}+c3ZZvRJcgeszp)Nj$;?Gl1egCEYz|q&PdwT zE|;1eT9H7WoI@`{b0~W9fx0zmPdWB43HI7c{VxQF+wTo2+p+?rBxd&Qo40S?``(*3 z@6ps$VBz=o&42tcn6|8c)61(r8!x}cDE^5_Sc0Wi#zMx3<|)tY&^EN4I$0&GfObSB zbu%yYGC%aqnwwU$APfxcrM0kzZ@si0*3EM&oWj#j8`*R?ZDguxGn)x#3>~Di*<3gW zx+dzMSmC_1#gu4#Vm)EuCD7BNY3K#eGh)`zmxZ@swdS6|VyneUSIMrB3REM_cjInb z$%B5ZqyVS>+am9-%c7Te3;B%E2fXw?%GJJzj!O48N=Ewy1!>M)4Grwh}ht+D;t7PWg}tKIFPGV8VXF|MK?G)^6er zY(nsa51oN?*ZRY?VP#Me?xHoY_PM$Z+FP`SoLL7S9^C%OddvEqwQl|18gRk)ZS_~} zkE*9u5;)e-9eTna`U4kh)u((|)wQHP@CQ{9KzlFG&w->1>D_V_`=SAuCBE45SNgj6$~Ns0I%GuXK^O5tk7iPAtNc)1g;upls_jSX?}zS(tLv)|H%g{Hv()#%{_5R3 zD_f5Us;&EZx+~Sz-MrJ!WLFnk?>*Su67g=Vqf`QguI{TX%AG9g;+15!9>?;qSn3^> z(`g91N3a*FgxT zkuV8Mc!Femf;ZdXBiznf=ttW{M|L|B(Wpfo9Y2=sH16(){thexrp57% z^R_SRtQ~E)Uplk2r?a%>8k0(g(x>!#DknHgm;CP>De_2>iJ#$UO~O-poxH0l(FoA- zbOTg5v$|c7Ne>Axz$G<#TlknPkF&;e*HO1XU+|xD(fI!p5ad634-DXc0>2Ym@Do0A zg?-9|W6HsGBBsNIowirRi+5BY$P z{8I}Rxia8MbrcBqlo2Jor}mJ2$`8JHp~;74rWSNf^Q4|kk+w69sQJ|s8>tykJ;V2n z(e$Z>iudNw9@t4!P`&%xc;A8DZVv46t_Np44&Iq10jlLUX|UCo1BbL>RIgac%sbZ5 zIr!38-kezOh}yg*>KAOEGPeKu+ilmggKxsBapF+z9$Rg!n;TS4>E;9%XiZZRo7*T-@=l->ylVNAAW8>}_Pk>_zNg?=0*eV>U}3bpP}s z+H=PKFHEfGi94DX^EhsoPMC?XiM^2-!G3cn>2RKLMwd)hEr?3Ypw|}*;_`V)FW|T` z6t635rTyN!nT6>I4Ws3h-lTxMv{k(Y9jGrx)wGd&#kwk)G5(mTcV0@WpV7_@C9@p0`%LN2Nr08S zw{O(lYh5ngOzOQ{sGnlV)S%Z&j-mov+THxHbc*P)H0Gea(Q3yykH`rC&jU0ER^L5}h*>!M&$=`d1<1P3eXK07H%YU_|LZz|O;5*B53q0RO4$@i)ZNXO zOrzB4>%vs*@{I|bE;$u%FGYR5hi0ggt4QanP)HjzHxnUhoeVsPQVz6=aexet^@&Vh z$KX?t)OTpQOw%lBxjK>15-E!g6unomglt2Ds;VS#whe6A8Fy7ab*dCr(?6NJ+uW(< s&M=<60=l_(%+>7w66W<&`726&)2GydQ=K(2t{AG${i{H@j)A-Sf4Yw+i2wiq diff --git a/timemanagement/migrations/0001_initial.py b/timemanagement/migrations/0001_initial.py deleted file mode 100644 index 0df3b98..0000000 --- a/timemanagement/migrations/0001_initial.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 3.0.4 on 2020-04-26 15:22 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('users', '0022_auto_20200426_1522'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Breaks', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start', models.DateTimeField(blank=True, default=None, null=True)), - ('end', models.DateTimeField(blank=True, default=None, null=True)), - ('agency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Workday', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start', models.DateTimeField(blank=True, default=None, null=True)), - ('end', models.DateTimeField(blank=True, default=None, null=True)), - ('agency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency')), - ('breaks', models.ManyToManyField(blank=True, related_name='breaks_at_day', to='timemanagement.Breaks')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.AddField( - model_name='breaks', - name='workday', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workdayele', to='timemanagement.Workday'), - ), - ] diff --git a/timemanagement/migrations/0002_absence_absencereason.py b/timemanagement/migrations/0002_absence_absencereason.py deleted file mode 100644 index 16d0653..0000000 --- a/timemanagement/migrations/0002_absence_absencereason.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 3.0.4 on 2020-04-30 23:06 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('users', '0023_auto_20200430_2306'), - ('timemanagement', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='AbsenceReason', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=200)), - ('need_confirm', models.BooleanField(default=True)), - ('need_rep', models.BooleanField(default=True)), - ('is_holiday', models.BooleanField(default=True)), - ('agency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency')), - ], - ), - migrations.CreateModel( - name='Absence', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start', models.DateTimeField(blank=True, default=None, null=True)), - ('end', models.DateTimeField(blank=True, default=None, null=True)), - ('start_ishalf', models.BooleanField(default=False)), - ('end_ishalf', models.BooleanField(default=False)), - ('info', models.TextField(blank=True, default='', verbose_name='Abwesenheitsbegründung')), - ('confirm_status', models.IntegerField(default=0)), - ('confirm_info', models.TextField(blank=True, default='', verbose_name='Begründung')), - ('agency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency')), - ('reason', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='timemanagement.AbsenceReason')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/timemanagement/migrations/0003_freedays.py b/timemanagement/migrations/0003_freedays.py deleted file mode 100644 index 263b3a1..0000000 --- a/timemanagement/migrations/0003_freedays.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.0.4 on 2020-05-01 00:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0023_auto_20200430_2306'), - ('timemanagement', '0002_absence_absencereason'), - ] - - operations = [ - migrations.CreateModel( - name='FreeDays', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('day', models.DateTimeField(blank=True, default=None, null=True)), - ('name', models.CharField(default='', max_length=200)), - ('year', models.IntegerField(default=0)), - ('agency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency')), - ], - ), - ] diff --git a/timemanagement/migrations/__pycache__/0001_initial.cpython-38.pyc b/timemanagement/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 8cc0555dbc1f935898b7f818bae475d7a654fefa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1423 zcmb_c&2Aev5Z)#CPpehzD7NFc=mY3bK@pN3f}n_M*-6kk1!@@q7D5S1Loar{KMHr% zK)$xOLhq0qa>y(3+EaV#IYomGca_9$(OZ`wm-BHr^UVy&vrfl1@N<88^TQvmVf?Cv ztDl9!Bkbh^9KZlGH8L|aO+6N>NpD9+f?!{496{>s|diC_KVmj!nZ5MreW&5->vwL|CtE z;Uw;BGa{iUtfU1LEa4|@FtOR-fV;NN33!MFh_tZ#Yl=wwUr2yRN8CuZ5>&^e&YZtwCk?k$mf!&(%fAerQJZ?c3_O7#q+prIJ))Wrb zG@{`Sw6GSRsn*Gd#80pc_OcYRRJR9%;gIoVRj}b;I2ha;e#!3M9}boCwG{lKR3wID zMV^j(mI`XMIpUQ7)n3Rr<8s9=#7ec$Sj^M-QmEiZA!kJ?Sk5z{?6Tsrde)=Lo~1m$ zP%embzDz4+<;yfxROFx>9*KOux(sSg{ZTC;$5xRuJRhPGid2QN^fJO$ZP_`GMGB>I zpBM51_)0mmhHqFfb+}8%}nrUxWd8|emQ$Ay;wM+%h1IAt~d8&g# z$&K^4!c*% zsjU;9uO@{ao4wu$U}L3Nh|R@*Ysh=(vL4<&KYTDf(}!*Pq(~znr{iM2)TJn=kDpGa z5Jz#vQ=!j5wUpEAiJpFXEvAFP;4a&wr@vT98(nzV>u1U%7A2HH(S-;nIdY)=Gk@x3Ce%_?GwLxH3SEEVeosVF@dA<4{vLwII dF>6+zqHkvR5mVm7rsQAg%9aiefw^sZ^l!05ne_kw diff --git a/timemanagement/migrations/__pycache__/0002_absence_absencereason.cpython-38.pyc b/timemanagement/migrations/__pycache__/0002_absence_absencereason.cpython-38.pyc deleted file mode 100644 index e79a7ec9f10ce0831cca8ad904dff9a110068d1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1652 zcmZ`(OK;mo5avr1MNxhyb{w}!-{3`1?VyJs38MIs7`0s>mM?A3nDA8Eal#-6!^3xUm6E-(i4c;i1k-bB46^stKG+J%W;ZvBh1UU;&rC~nVC z8%QmquFKwG?-u%Zkh8+>R?_cXoxfk5|4*ds1C(r`rP@^%H`s^lqXL(Y)!7w)QQ=wT z*HrlhM*k*T#oB!$8;6&L!m8Es6htalJDtrfLh~#ko1M*0=iXL_Y;JWvLy5U8j3K6+ z1`q?!q}S>)oqez;-ne++)5~im#8cP>hmwPMZ<0M~2v)$oKK!{Eu z%+etQ;^&_@%X#3N;trk`CdGnsKUbwh&}f#Y0&j>Wy-Q|cuZgTD*EXb$;3Dkj8?!ZP z&lJVCN>6uDS*)w&HZIaqnE0#GAqDh=NS6@2w|NA(_Xznar;#cLA;MG&E9px*ozfwm zGnito3R+>PqxtSh?-@Bc-hECEzu4J5klvL<2&rst7fo=ehJsK-NH)6IYI_Q9+1Ng% zqTG5@F6Uu``8f++?qH;KAWPQ7PyxrZ|m8~7@u^#qmWwHma zvdZK>&me%xfpfguBS$9(2hvTZP)(~JH1QB)Dwa2}eSdJGuEgM35~1E;CmH3c@6*B4 z{oa6uL6}jD5j!c%#b6fq!Sx6n;4RrCw7eXb|FT-`>6xgZL!8iB`ao?=S2uLyFRO0p zhOweA=yS!p_Qv?zYL>hueW~E7bxB{-H}v&C@$`?vlJCf72~b<0LY}{z5oCK diff --git a/timemanagement/migrations/__pycache__/0003_freedays.cpython-38.pyc b/timemanagement/migrations/__pycache__/0003_freedays.cpython-38.pyc deleted file mode 100644 index 240bc221cf17d183c4ee0536399bd8825f8c141d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1012 zcmY*Y+invv5M6sOxwq*B3jF}22oyyL;sGJlC?TanEe~xaw2D|cnaOt3y#((Dk-mTg zulW$fkMIqC<*B~_5-{Ghw0PyQ&v58N&)2u8_(o{)P zf*P#B`jQi_6E4FBY%Uq0EkYHnPHR(Vx;9;hZMdVYd>igAxzF4>lqvQdRXV&5nliBG zDaussv|8v5;$wL7gRWU-b75k?{wK1LX4?rw{0Juyl#9^>^YQKU(% ziUWz*7mHN!08R#qAM_iRs^)&jWRoGN%1j24kPGh|7pg?J2O*E9wP0lp7(Ap zLLG%hfHRDN{0Epyt{qf*dA5hTB_y?qmjVn0zFMyi+xOiiZ>z3y?Z+kc_T$qcU=@v9*p(uKMB`KI@Dc&Zs5 zzDz=LJnSdqxu!84?jM{CA@GAtgs6*?&E@cas)sk-JtWdQ-h|jCUee}lA@%zy&`ftp z6iv?fZ_BY5=i6+P)!7=m_lq=ta=V73N~`#rFv<(Gs>%I-%I50vG_Nz04|EFpj+