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

Nice names in AUB

parent f98af618
No related branches found
No related tags found
1 merge request!86Merge school-apps
......@@ -2,15 +2,15 @@
<project version="4">
<component name="dataSourceStorageLocal">
<data-source name="Django default" uuid="ef6730d6-e849-4772-acac-62469acab4d2">
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" />
<introspection-schemas>*:schoolapps</introspection-schemas>
</data-source>
<data-source name="Django default2" uuid="ea4cff78-5949-410f-aa64-d6daa5fb293d">
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" />
<introspection-schemas>*:schoolapps</introspection-schemas>
</data-source>
<data-source name="Django untis" uuid="ae145b31-953d-4d55-ad07-b49b3287f618">
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" />
<introspection-schemas>*:untis</introspection-schemas>
</data-source>
</component>
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (SchoolApps)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (school-apps)" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
......
......@@ -17,7 +17,7 @@
<sourceFolder url="file://$MODULE_DIR$/schoolapps" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="jdk" jdkName="Python 3.7 (SchoolApps)" jdkType="Python SDK" />
<orderEntry type="jdk" jdkName="Python 3.6 (school-apps)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jquery-3.2.1" level="application" />
<orderEntry type="library" name="react.production" level="application" />
......
......@@ -17,42 +17,32 @@ class Status():
def __str__(self):
return self.name
status_list = [
Status(name='In Bearbeitung 1', style_class='orange'),
Status(name='In Bearbeitung 2', style_class='yellow'),
Status(name='Genehmigt', style_class='green'),
Status(name='Abgelehnt', style_class='red'),
]
]
print("status_list[0].name :", status_list[0].name)
status_choices = [(x, val.name) for x, val in enumerate(status_list)]
# def get_default_status():
# status, created = Status.objects.get_or_create(name='In Bearbeitung 1', style_classes='orange')
# return status.id
#
class Aub(models.Model):
# Time
from_date = models.DateField(default=date.today)
from_time = models.TimeField(default=timezone.now)
to_date = models.DateField(default=date.today)
to_time = models.TimeField(default=timezone.now)
from_date = models.DateField(default=date.today, verbose_name="Startdatum")
from_time = models.TimeField(default=timezone.now, verbose_name="Startzeit")
to_date = models.DateField(default=date.today, verbose_name="Enddatum")
to_time = models.TimeField(default=timezone.now, verbose_name="Endzeit")
# Information
description = models.TextField()
# status = models.ForeignKey(Status, related_name='aubs', on_delete=models.SET(get_default_status()),
# default=get_default_status())
# status_choices = [(IN_PROCESSING_STATUS.id, IN_PROCESSING_STATUS.name),
# (SEMI_ALLOWED_STATUS.id, SEMI_ALLOWED_STATUS.name),
# (ALLOWED_STATUS.id, ALLOWED_STATUS.name),
# (NOT_ALLOWED_STATUS.id, NOT_ALLOWED_STATUS.name)]
status = models.IntegerField(default=0)
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())
created_at = models.DateTimeField(default=timezone.now)
default=get_default_user(), verbose_name="Erstellt von")
created_at = models.DateTimeField(default=timezone.now, verbose_name="Erstellungszeitpunkt")
def getStatus(self):
return status_list[self.status]
......@@ -70,3 +60,6 @@ class Aub(models.Model):
('check2_aub', 'Check a AUB'),
('view_archive', 'View AUB archive'),
)
verbose_name = "AUB"
verbose_name_plural = "AUBs"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment