Abwesenheit Zwischencommit

.gitignore

@@ -59,4 +59,8 @@ message/__pycache__/*
 
 organizer/migrations/*
 !organizer/migrations/__init__.py
-organizer/__pycache__/*
+organizer/__pycache__/*
+
+timemanagement/migrations/*
+!timemanagement/migrations/__init__.py
+timemanagement/__pycache__/*

timemanagement/migrations/0001_initial.py

@@ -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'),
-        ),
-    ]

timemanagement/migrations/0002_absence_absencereason.py

@@ -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)),
-            ],
-        ),
-    ]

timemanagement/migrations/0003_freedays.py

@@ -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')),
-            ],
-        ),
-    ]