change salary model field to DecimalField
This commit is contained in:
@@ -8,7 +8,13 @@ class JobPostingAdmin(admin.ModelAdmin):
|
||||
form = JobPostingForm
|
||||
model = JobPosting
|
||||
|
||||
list_display = ["company_name", "job_name", "salary", "number_of_hours", "publish_date"]
|
||||
list_display = [
|
||||
"company_name",
|
||||
"job_name",
|
||||
"salary",
|
||||
"number_of_hours",
|
||||
"publish_date",
|
||||
]
|
||||
|
||||
|
||||
admin.site.register(JobPosting, JobPostingAdmin)
|
||||
|
||||
@@ -7,7 +7,14 @@ from .models import JobPosting
|
||||
class JobPostingForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = JobPosting
|
||||
fields = ["company_name", "job_name", "salary", "number_of_hours", "pdf_location", "publish_date"]
|
||||
fields = [
|
||||
"company_name",
|
||||
"job_name",
|
||||
"salary",
|
||||
"number_of_hours",
|
||||
"pdf_location",
|
||||
"publish_date",
|
||||
]
|
||||
|
||||
labels = {
|
||||
"company_name": _("Firmenname"),
|
||||
@@ -19,5 +26,7 @@ class JobPostingForm(forms.ModelForm):
|
||||
|
||||
help_texts = {
|
||||
"pdf_location": _("Verwendbare Formate: PDF"),
|
||||
"salary": _("in Euro angeben; monatliches Gehalt bei >1h, sonst Stundenlohn."),
|
||||
"salary": _(
|
||||
"in Euro angeben; monatliches Gehalt bei >1h, sonst Stundenlohn."
|
||||
),
|
||||
}
|
||||
|
||||
18
fet2020/blackboard/migrations/0003_auto_20210624_1503.py
Normal file
18
fet2020/blackboard/migrations/0003_auto_20210624_1503.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Generated by Django 3.1.5 on 2021-06-24 13:03
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('blackboard', '0002_auto_20210515_1916'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='jobposting',
|
||||
name='salary',
|
||||
field=models.DecimalField(decimal_places=1, max_digits=6, verbose_name='Gehalt'),
|
||||
),
|
||||
]
|
||||
@@ -19,8 +19,10 @@ class JobPosting(models.Model):
|
||||
company_name = models.CharField(verbose_name="Firmenname", max_length=128)
|
||||
job_name = models.CharField(verbose_name="Berufsbezeichnung", max_length=128)
|
||||
|
||||
salary = models.PositiveSmallIntegerField(
|
||||
salary = models.DecimalField(
|
||||
verbose_name="Gehalt",
|
||||
max_digits=6,
|
||||
decimal_places=1,
|
||||
)
|
||||
number_of_hours = models.DecimalField(
|
||||
default=40,
|
||||
|
||||
@@ -8,7 +8,9 @@ from .models import JobPosting
|
||||
|
||||
def index(request):
|
||||
job_postings_cutoff = timezone.now().date() - timedelta(30) # 30days from now
|
||||
job_postings = JobPosting.all_job_postings.filter(publish_date__gt=job_postings_cutoff)
|
||||
job_postings = JobPosting.all_job_postings.filter(
|
||||
publish_date__gt=job_postings_cutoff
|
||||
)
|
||||
bb_info = CustomFlatPage.objects.filter(title__iexact="blackboard").first()
|
||||
bb_empty = CustomFlatPage.objects.filter(title__iexact="blackboard empty").first()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user