Skip to content
Snippets Groups Projects
Commit c843a236 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

+++ WARNING +++ THE BIG MIGRATION RECREATION +++ WARNING +++ 

IN CASE OF MERGING THIS BRANCH YOU HAVE TO DELETE YOUR WHOLE DATABASE TO DO NEW MIGRATIONS!
parent fee41082
No related branches found
No related tags found
1 merge request!86Merge school-apps
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 303 deletions
.idea/school-apps.iml
+ 1
− 1
View file @ c843a236
......@@ -23,7 +23,7 @@
<excludeFolder url="file://$MODULE_DIR$/env" />
<excludeFolder url="file://$MODULE_DIR$/schoolapps/staticcollect" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="Python 3.7 (school-apps)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
......
schoolapps/aub/filters.py
+ 11
− 8
View file @ c843a236
from django import forms
from django.contrib.auth.models import User
import django_filters
from .models import Aub
from django.db.utils import ProgrammingError
class AUBFilter(django_filters.FilterSet):
def getAUBUsers():
''' Find all users who sends an AUB'''
def get_aub_users():
""" Find all users who sends an AUB """
try:
aub_users = Aub.objects.values_list('created_by')
users = list(User.objects.filter(id__in=aub_users))
# user_ids = [(str(user.id),user.username) for user in users]
user_ids = [(str(user.id),user.last_name+', '+user.first_name) for user in users]
user_ids = [(str(user.id), user.last_name + ', ' + user.first_name) for user in users]
user_ids_sorted = sorted(user_ids, key=lambda user: user[1])
return user_ids_sorted
except ProgrammingError:
return []
created_by = django_filters.ChoiceFilter(label='Von', choices=getAUBUsers())
class AUBFilter(django_filters.FilterSet):
created_by = django_filters.ChoiceFilter(label='Von', choices=get_aub_users())
class Meta:
model = Aub
fields = ['created_by',]
fields = ['created_by', ]
schoolapps/aub/migrations/0001_initial.py
+ 21
− 14
View file @ c843a236
# Generated by Django 2.1.2 on 2018-10-27 17:37
# Generated by Django 2.2.1 on 2019-05-29 15:05
import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
......@@ -18,22 +20,27 @@ class Migration(migrations.Migration):
name='Aub',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('from_dt', models.DateTimeField(default=django.utils.timezone.now)),
('to_dt', models.DateTimeField(default=django.utils.timezone.now)),
('from_date', models.DateField(default=datetime.date.today, verbose_name='Startdatum')),
('from_time', models.TimeField(default=django.utils.timezone.now, verbose_name='Startzeit')),
('to_date', models.DateField(default=datetime.date.today, verbose_name='Enddatum')),
('to_time', models.TimeField(default=django.utils.timezone.now, verbose_name='Endzeit')),
('description', models.TextField()),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('created_by', models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL)),
('status', models.IntegerField(
choices=[(0, 'In Bearbeitung 1'), (1, 'In Bearbeitung 2'), (2, 'Genehmigt'), (3, 'Abgelehnt')],
default=0, verbose_name='Status')),
('created_at',
models.DateTimeField(default=django.utils.timezone.now, verbose_name='Erstellungszeitpunkt')),
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='aubs', to=settings.AUTH_USER_MODEL,
verbose_name='Erstellt von')),
],
options={
'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB')),
'verbose_name': 'AUB',
'verbose_name_plural': 'AUBs',
'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'),
('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'),
('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB'),
('view_archive', 'View AUB archive')),
},
),
migrations.CreateModel(
name='Status',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('style_classes', models.CharField(max_length=200)),
],
),
]
schoolapps/aub/migrations/0002_aub_status.py deleted 100644 → 0
+ 0
− 18
View file @ fee41082
# Generated by Django 2.1.2 on 2018-10-27 17:39
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('aub', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='aub',
name='status',
field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to='aub.Status'),
),
]
schoolapps/aub/migrations/0003_auto_20181031_1551.py deleted 100644 → 0
+ 0
− 24
View file @ fee41082
# Generated by Django 2.0.7 on 2018-10-31 14:51
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('aub', '0002_aub_status'),
]
operations = [
migrations.AlterField(
model_name='aub',
name='created_by',
field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs',
to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='aub',
name='status',
field=models.ForeignKey(default=5, on_delete=models.SET(5), related_name='aubs', to='aub.Status'),
),
]
schoolapps/aub/migrations/0003_auto_20181223_0905.py deleted 100644 → 0
+ 0
− 43
View file @ fee41082
# Generated by Django 2.1.2 on 2018-12-23 08:05
import datetime
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('aub', '0002_aub_status'),
]
operations = [
migrations.RemoveField(
model_name='aub',
name='from_dt',
),
migrations.RemoveField(
model_name='aub',
name='to_dt',
),
migrations.AddField(
model_name='aub',
name='from_date',
field=models.DateField(default=datetime.date.today),
),
migrations.AddField(
model_name='aub',
name='from_time',
field=models.TimeField(default=django.utils.timezone.now),
),
migrations.AddField(
model_name='aub',
name='to_date',
field=models.DateField(default=datetime.date.today),
),
migrations.AddField(
model_name='aub',
name='to_time',
field=models.TimeField(default=django.utils.timezone.now),
),
]
schoolapps/aub/migrations/0004_auto_20181031_1617.py deleted 100644 → 0
+ 0
− 19
View file @ fee41082
# Generated by Django 2.0.4 on 2018-10-31 15:17
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('aub', '0003_auto_20181031_1551'),
]
operations = [
migrations.AlterField(
model_name='aub',
name='created_by',
field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL),
),
]
schoolapps/aub/migrations/0005_auto_20181128_1709.py deleted 100644 → 0
+ 0
− 19
View file @ fee41082
# Generated by Django 2.0.7 on 2018-11-28 16:09
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('aub', '0004_auto_20181031_1617'),
]
operations = [
migrations.AlterField(
model_name='aub',
name='created_by',
field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs',
to=settings.AUTH_USER_MODEL),
),
]
schoolapps/aub/migrations/0006_auto_20181219_1107.py deleted 100644 → 0
+ 0
− 24
View file @ fee41082
# Generated by Django 2.0.4 on 2018-12-19 10:07
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('aub', '0005_auto_20181128_1709'),
]
operations = [
migrations.AlterField(
model_name='aub',
name='created_by',
field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='aub',
name='status',
field=models.ForeignKey(default=7, on_delete=models.SET(7), related_name='aubs', to='aub.Status'),
),
]
schoolapps/aub/migrations/0007_merge_20190426_1620.py deleted 100644 → 0
+ 0
− 14
View file @ fee41082
# Generated by Django 2.1.5 on 2019-04-26 14:20
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('aub', '0003_auto_20181223_0905'),
('aub', '0006_auto_20181219_1107'),
]
operations = [
]
schoolapps/aub/migrations/0008_auto_20190426_1654.py deleted 100644 → 0
+ 0
− 58
View file @ fee41082
# Generated by Django 2.1.5 on 2019-04-26 14:54
import datetime
from django.conf import settings
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('aub', '0007_merge_20190426_1620'),
]
operations = [
migrations.AlterModelOptions(
name='aub',
options={'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB'), ('view_archive', 'View AUB archive')), 'verbose_name': 'AUB', 'verbose_name_plural': 'AUBs'},
),
migrations.AlterField(
model_name='aub',
name='created_at',
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Erstellungszeitpunkt'),
),
migrations.AlterField(
model_name='aub',
name='created_by',
field=models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL, verbose_name='Erstellt von'),
),
migrations.AlterField(
model_name='aub',
name='from_date',
field=models.DateField(default=datetime.date.today, verbose_name='Startdatum'),
),
migrations.AlterField(
model_name='aub',
name='from_time',
field=models.TimeField(default=django.utils.timezone.now, verbose_name='Startzeit'),
),
migrations.AlterField(
model_name='aub',
name='status',
field=models.IntegerField(choices=[(0, 'In Bearbeitung 1'), (1, 'In Bearbeitung 2'), (2, 'Genehmigt'), (3, 'Abgelehnt')], default=0, verbose_name='Status'),
),
migrations.AlterField(
model_name='aub',
name='to_date',
field=models.DateField(default=datetime.date.today, verbose_name='Enddatum'),
),
migrations.AlterField(
model_name='aub',
name='to_time',
field=models.TimeField(default=django.utils.timezone.now, verbose_name='Endzeit'),
),
migrations.DeleteModel(
name='Status',
),
]
schoolapps/aub/models.py
+ 7
− 7
View file @ c843a236
......@@ -4,12 +4,12 @@ from django.contrib.auth.models import User
from datetime import date
def get_default_user():
user, created = User.objects.get_or_create(username='nouser')
return user.id
# def get_default_user():
# user, created = User.objects.get_or_create(username='nouser')
# return user.id
class Status():
class Status:
def __init__(self, name, style_class):
self.name = name
self.style_class = style_class
......@@ -24,7 +24,7 @@ status_list = [
Status(name='Genehmigt', style_class='green'),
Status(name='Abgelehnt', style_class='red'),
]
print("status_list[0].name :", status_list[0].name)
# print("status_list[0].name :", status_list[0].name)
status_choices = [(x, val.name) for x, val in enumerate(status_list)]
......@@ -40,8 +40,8 @@ class Aub(models.Model):
status = models.IntegerField(default=0, choices=status_choices, verbose_name="Status")
# Meta
created_by = models.ForeignKey(User, related_name='aubs', on_delete=models.SET(get_default_user()),
default=get_default_user(), verbose_name="Erstellt von")
created_by = models.ForeignKey(User, related_name='aubs', on_delete=models.SET_NULL
, verbose_name="Erstellt von", blank=True, null=True)
created_at = models.DateTimeField(default=timezone.now, verbose_name="Erstellungszeitpunkt")
def getStatus(self):
......
schoolapps/dashboard/migrations/0001_initial.py
+ 7
− 6
View file @ c843a236
# Generated by Django 2.1.2 on 2018-10-27 16:55
# Generated by Django 2.2.1 on 2019-05-29 15:06
from django.conf import settings
from django.db import migrations, models
......@@ -16,26 +16,27 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
name='Activity',
name='Notification',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200)),
('description', models.TextField(max_length=500)),
('link', models.URLField(blank=True)),
('app', models.CharField(max_length=100)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('user', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications',
to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Notification',
name='Activity',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200)),
('description', models.TextField(max_length=500)),
('link', models.URLField(blank=True)),
('app', models.CharField(max_length=100)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('user', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
schoolapps/dashboard/models.py
+ 4
− 4
View file @ c843a236
......@@ -6,14 +6,14 @@ from django.utils import timezone
from mailer import send_mail_with_template
def get_default_user():
User.objects.get_or_create(username='nouser')
# def get_default_user():
# User.objects.get_or_create(username='nouser')
# Create your models here.
class Activity(models.Model):
user = models.ForeignKey(to=User, on_delete=models.CASCADE, default=get_default_user())
user = models.ForeignKey(to=User, on_delete=models.CASCADE)
title = models.CharField(max_length=200)
description = models.TextField(max_length=500)
......@@ -28,7 +28,7 @@ class Activity(models.Model):
class Notification(models.Model):
# to = models.ManyToManyField(User, related_name='notifications')
user = models.ForeignKey(to=User, on_delete=models.CASCADE, default=get_default_user(), related_name="notifications")
user = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="notifications")
title = models.CharField(max_length=200)
description = models.TextField(max_length=500)
link = models.URLField(blank=True)
......
schoolapps/doc/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ fee41082
schoolapps/doc/admin.py deleted 100644 → 0
+ 0
− 3
View file @ fee41082
from django.contrib import admin
# Register your models here.
schoolapps/doc/apps.py deleted 100644 → 0
+ 0
− 5
View file @ fee41082
from django.apps import AppConfig
class DocConfig(AppConfig):
name = 'doc'
schoolapps/doc/migrations/0002_auto_20190106_0905.py deleted 100644 → 0
+ 0
− 18
View file @ fee41082
# Generated by Django 2.1.2 on 2019-01-06 08:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('doc', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='subject',
name='abbreviation',
field=models.CharField(max_length=5),
),
]
schoolapps/doc/migrations/0003_auto_20190108_1626.py deleted 100644 → 0
+ 0
− 18
View file @ fee41082
# Generated by Django 2.1.2 on 2019-01-08 15:26
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('doc', '0002_auto_20190106_0905'),
]
operations = [
migrations.AlterField(
model_name='subject',
name='abbreviation',
field=models.CharField(max_length=5, unique=True),
),
]
schoolapps/doc/migrations/__init__.py deleted 100644 → 0
+ 0
− 0
View file @ fee41082
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment