From cb162e08806707a60bc8176fd7f0a3c6911ee458 Mon Sep 17 00:00:00 2001
From: HanseGucker <joniweth@gmx.de>
Date: Thu, 11 Apr 2019 11:19:42 +0200
Subject: [PATCH] Nice names in AUB
---
.idea/dataSources.local.xml | 6 +++---
.idea/misc.xml | 2 +-
.idea/school-apps.iml | 2 +-
schoolapps/aub/models.py | 33 +++++++++++++--------------------
4 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 06b129d54..a6d51bc65 100755
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -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>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7b70587..aa4cee959 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<?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>
diff --git a/.idea/school-apps.iml b/.idea/school-apps.iml
index 92aaf5da9..e490d4647 100755
--- a/.idea/school-apps.iml
+++ b/.idea/school-apps.iml
@@ -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" />
diff --git a/schoolapps/aub/models.py b/schoolapps/aub/models.py
index 670129280..ce8b64259 100755
--- a/schoolapps/aub/models.py
+++ b/schoolapps/aub/models.py
@@ -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"
--
GitLab