improve looknfeel
This commit is contained in:
@@ -7,6 +7,7 @@ from django.shortcuts import render
|
|||||||
from django.template.defaulttags import register
|
from django.template.defaulttags import register
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django import forms
|
from django import forms
|
||||||
|
from easy_select2 import apply_select2
|
||||||
|
|
||||||
|
|
||||||
class ZugeteiltFilter(admin.SimpleListFilter):
|
class ZugeteiltFilter(admin.SimpleListFilter):
|
||||||
@@ -88,6 +89,10 @@ create_overview.short_description = "Übersicht erstellen"
|
|||||||
class AufsichtInline(admin.TabularInline):
|
class AufsichtInline(admin.TabularInline):
|
||||||
model = Betriebsaufsicht
|
model = Betriebsaufsicht
|
||||||
extra = 0
|
extra = 0
|
||||||
|
formfield_overrides = {
|
||||||
|
models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
|
||||||
|
models.ForeignKey: {'widget': apply_select2(forms.Select)}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
@@ -99,6 +104,7 @@ class BetriebAdmin(admin.ModelAdmin):
|
|||||||
search_fields = ('name', 'manager', 'raum', 'aufsicht')
|
search_fields = ('name', 'manager', 'raum', 'aufsicht')
|
||||||
formfield_overrides = {
|
formfield_overrides = {
|
||||||
models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
|
models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
|
||||||
|
models.ForeignKey: {'widget': apply_select2(forms.Select)}
|
||||||
}
|
}
|
||||||
actions = [ban_ip, create_overview]
|
actions = [ban_ip, create_overview]
|
||||||
filter_horizontal = ('angestellte',)
|
filter_horizontal = ('angestellte',)
|
||||||
@@ -133,6 +139,10 @@ class AngestellterAdmin(admin.ModelAdmin):
|
|||||||
class AufsichtAdmin(admin.ModelAdmin):
|
class AufsichtAdmin(admin.ModelAdmin):
|
||||||
list_display = ('name', 'show_stunden')
|
list_display = ('name', 'show_stunden')
|
||||||
search_fields = ('name',)
|
search_fields = ('name',)
|
||||||
|
formfield_overrides = {
|
||||||
|
models.ManyToManyField: {'widget': forms.CheckboxSelectMultiple},
|
||||||
|
models.ForeignKey: {'widget': apply_select2(forms.Select)}
|
||||||
|
}
|
||||||
|
|
||||||
admin.site.register(Betrieb, BetriebAdmin)
|
admin.site.register(Betrieb, BetriebAdmin)
|
||||||
admin.site.register(Partei, ParteiAdmin)
|
admin.site.register(Partei, ParteiAdmin)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class Angestellter(models.Model):
|
|||||||
|
|
||||||
class Aufsicht(models.Model):
|
class Aufsicht(models.Model):
|
||||||
name = models.CharField('Name', max_length=100)
|
name = models.CharField('Name', max_length=100)
|
||||||
stunden = models.IntegerField('Deputatsstunden', default=25,
|
stunden = models.FloatField('Deputatsstunden', default=25,
|
||||||
help_text='Verfügbare Deputatsstunde (Dreiviertel Stunden) von Dienstag bis Freitag')
|
help_text='Verfügbare Deputatsstunde (Dreiviertel Stunden) von Dienstag bis Freitag')
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@@ -109,7 +109,7 @@ class Betrieb(models.Model):
|
|||||||
class Betriebsaufsicht(models.Model):
|
class Betriebsaufsicht(models.Model):
|
||||||
aufsicht = models.ForeignKey(Aufsicht)
|
aufsicht = models.ForeignKey(Aufsicht)
|
||||||
betrieb = models.ForeignKey(Betrieb)
|
betrieb = models.ForeignKey(Betrieb)
|
||||||
teilstunden = models.IntegerField('Geleistete Deputatsstunden', default=16)
|
teilstunden = models.FloatField('Geleistete Deputatsstunden', default=16)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.aufsicht.name
|
return self.aufsicht.name
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ INSTALLED_APPS = (
|
|||||||
'datenbank',
|
'datenbank',
|
||||||
'meingoethopia',
|
'meingoethopia',
|
||||||
'startpage',
|
'startpage',
|
||||||
|
'easy_select2',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
|
|||||||
Reference in New Issue
Block a user