Skip to content
Snippets Groups Projects
Commit 239dab24 authored by Lorenz Zahn's avatar Lorenz Zahn
Browse files

adjust migrations

parent f4f3f7c8
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 210 deletions
app/vkk/migrations/0002_alter_project_department.py deleted 100644 → 0
+ 0
− 19
View file @ f4f3f7c8
# Generated by Django 4.1.1 on 2022-09-29 09:23
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('vkk', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='project',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='vkk.department', verbose_name='department'),
),
]
app/vkk/migrations/0003_departmentcosts_departmentdate_generalcosts_and_more.py → app/vkk/migrations/0002_departmentcosts_departmentdate_generalcosts_and_more.py
+ 38
− 7
View file @ 239dab24
# Generated by Django 4.1.2 on 2022-10-20 11:04
# Generated by Django 4.1.3 on 2022-12-01 19:38
from django.db import migrations, models
import django.db.models.deletion
......@@ -7,7 +7,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('vkk', '0002_alter_project_department'),
('vkk', '0001_initial'),
]
operations = [
......@@ -15,10 +15,11 @@ class Migration(migrations.Migration):
name='DepartmentCosts',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('equivalents_per_hour', models.FloatField(verbose_name='full time equivalents per hour')),
('equivalents_per_hour', models.DecimalField(decimal_places=2, max_digits=8, verbose_name='full time equivalents per hour')),
],
options={
'verbose_name': 'department costs',
'verbose_name_plural': 'department costs',
'default_permissions': (),
},
),
......@@ -30,6 +31,7 @@ class Migration(migrations.Migration):
],
options={
'verbose_name': 'department interval',
'verbose_name_plural': 'department intervals',
'default_permissions': (),
},
),
......@@ -38,10 +40,11 @@ class Migration(migrations.Migration):
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('start', models.DateField(verbose_name='start date')),
('costs', models.FloatField(verbose_name='general costs')),
('costs', models.DecimalField(decimal_places=2, max_digits=8, verbose_name='general costs')),
],
options={
'verbose_name': 'general costs',
'verbose_name_plural': 'general costs',
'default_permissions': (),
},
),
......@@ -49,10 +52,11 @@ class Migration(migrations.Migration):
name='ProjectFundedStaff',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('hours', models.FloatField()),
('hours', models.DecimalField(decimal_places=2, max_digits=8)),
],
options={
'verbose_name': 'project funded staff',
'verbose_name_plural': 'project funded staff',
'default_permissions': (),
},
),
......@@ -64,6 +68,7 @@ class Migration(migrations.Migration):
],
options={
'verbose_name': 'project funded staff interval',
'verbose_name_plural': 'project funded staff intervals',
'default_permissions': (),
},
),
......@@ -71,8 +76,16 @@ class Migration(migrations.Migration):
name='Receipt',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('start', models.DateField(verbose_name='start date')),
('end', models.DateField(verbose_name='end date')),
('create_time', models.DateTimeField(auto_now_add=True, verbose_name='time booked')),
('data', models.JSONField()),
],
options={
'verbose_name': 'receipt',
'verbose_name_plural': 'receipts',
'default_permissions': (),
},
),
migrations.CreateModel(
name='ReceiptTemplate',
......@@ -82,6 +95,8 @@ class Migration(migrations.Migration):
('data', models.JSONField()),
],
options={
'verbose_name': 'receipt template',
'verbose_name_plural': 'receipt templates',
'default_permissions': (),
},
),
......@@ -89,10 +104,11 @@ class Migration(migrations.Migration):
name='SalaryLevelCosts',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('brutto_per_hour', models.FloatField(verbose_name='brutto staff costs per hour')),
('brutto_per_hour', models.DecimalField(decimal_places=2, max_digits=8, verbose_name='brutto staff costs per hour')),
],
options={
'verbose_name': 'salary level costs',
'verbose_name_plural': 'salary level costs',
'default_permissions': (),
},
),
......@@ -104,9 +120,15 @@ class Migration(migrations.Migration):
],
options={
'verbose_name': 'salary interval',
'verbose_name_plural': 'salary intervals',
'default_permissions': (),
},
),
migrations.AlterField(
model_name='project',
name='department',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='vkk.department', verbose_name='department'),
),
migrations.AddConstraint(
model_name='salaryleveldate',
constraint=models.UniqueConstraint(fields=('date',), name='unique_constraint_salary_level_date'),
......@@ -125,6 +147,11 @@ class Migration(migrations.Migration):
model_name='receipttemplate',
constraint=models.UniqueConstraint(fields=('start',), name='unique_constraint_receipt_template_start'),
),
migrations.AddField(
model_name='receipt',
name='project',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vkk.project', verbose_name='project'),
),
migrations.AddField(
model_name='projectfundedstaffdate',
name='project',
......@@ -133,7 +160,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='projectfundedstaff',
name='salary_level',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vkk.salarylevel', verbose_name='salary_level'),
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vkk.salarylevel', verbose_name='salary level'),
),
migrations.AddField(
model_name='projectfundedstaff',
......@@ -162,6 +189,10 @@ class Migration(migrations.Migration):
model_name='salarylevelcosts',
constraint=models.UniqueConstraint(fields=('salary_level', 'start'), name='unique_constraint_salary_level_costs'),
),
migrations.AddConstraint(
model_name='receipt',
constraint=models.CheckConstraint(check=models.Q(('start__lte', models.F('end'))), name='interval_check_receipt'),
),
migrations.AddConstraint(
model_name='projectfundedstaffdate',
constraint=models.UniqueConstraint(fields=('date', 'project'), name='unique_constraint_project_funded_staff_date'),
......
app/vkk/migrations/0004_receipt_department_receipt_project_receipt_time.py deleted 100644 → 0
+ 0
− 33
View file @ f4f3f7c8
# Generated by Django 4.1.2 on 2022-10-20 17:44
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('vkk', '0003_departmentcosts_departmentdate_generalcosts_and_more'),
]
operations = [
migrations.AddField(
model_name='receipt',
name='department',
field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='vkk.department', verbose_name='department'),
preserve_default=False,
),
migrations.AddField(
model_name='receipt',
name='project',
field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='vkk.project', verbose_name='project'),
preserve_default=False,
),
migrations.AddField(
model_name='receipt',
name='time',
field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='time booked'),
preserve_default=False,
),
]
app/vkk/migrations/0005_alter_departmentcosts_options_and_more.py deleted 100644 → 0
+ 0
− 96
View file @ f4f3f7c8
# Generated by Django 4.1.3 on 2022-11-10 14:17
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('vkk', '0004_receipt_department_receipt_project_receipt_time'),
]
operations = [
migrations.AlterModelOptions(
name='departmentcosts',
options={'default_permissions': (), 'verbose_name': 'department costs', 'verbose_name_plural': 'department costs'},
),
migrations.AlterModelOptions(
name='departmentdate',
options={'default_permissions': (), 'verbose_name': 'department interval', 'verbose_name_plural': 'department intervals'},
),
migrations.AlterModelOptions(
name='generalcosts',
options={'default_permissions': (), 'verbose_name': 'general costs', 'verbose_name_plural': 'general costs'},
),
migrations.AlterModelOptions(
name='projectfundedstaff',
options={'default_permissions': (), 'verbose_name': 'project funded staff', 'verbose_name_plural': 'project funded staff'},
),
migrations.AlterModelOptions(
name='projectfundedstaffdate',
options={'default_permissions': (), 'verbose_name': 'project funded staff interval', 'verbose_name_plural': 'project funded staff intervals'},
),
migrations.AlterModelOptions(
name='receipt',
options={'default_permissions': (), 'verbose_name': 'receipt', 'verbose_name_plural': 'receipts'},
),
migrations.AlterModelOptions(
name='receipttemplate',
options={'default_permissions': (), 'verbose_name': 'receipt template', 'verbose_name_plural': 'receipt templates'},
),
migrations.AlterModelOptions(
name='salarylevelcosts',
options={'default_permissions': (), 'verbose_name': 'salary level costs', 'verbose_name_plural': 'salary level costs'},
),
migrations.AlterModelOptions(
name='salaryleveldate',
options={'default_permissions': (), 'verbose_name': 'salary interval', 'verbose_name_plural': 'salary intervals'},
),
migrations.RemoveField(
model_name='receipt',
name='department',
),
migrations.AddField(
model_name='receipt',
name='end',
field=models.DateField(default=django.utils.timezone.now, verbose_name='end date'),
preserve_default=False,
),
migrations.AddField(
model_name='receipt',
name='start',
field=models.DateField(default=django.utils.timezone.now, verbose_name='start date'),
preserve_default=False,
),
migrations.AlterField(
model_name='departmentcosts',
name='equivalents_per_hour',
field=models.DecimalField(decimal_places=3, max_digits=8, verbose_name='full time equivalents per hour'),
),
migrations.AlterField(
model_name='generalcosts',
name='costs',
field=models.DecimalField(decimal_places=3, max_digits=8, verbose_name='general costs'),
),
migrations.AlterField(
model_name='projectfundedstaff',
name='hours',
field=models.DecimalField(decimal_places=2, max_digits=8),
),
migrations.AlterField(
model_name='projectfundedstaff',
name='salary_level',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vkk.salarylevel', verbose_name='salary level'),
),
migrations.AlterField(
model_name='salarylevelcosts',
name='brutto_per_hour',
field=models.DecimalField(decimal_places=3, max_digits=8, verbose_name='brutto staff costs per hour'),
),
migrations.AddConstraint(
model_name='receipt',
constraint=models.CheckConstraint(check=models.Q(('start__lte', models.F('end'))), name='interval_check_receipt'),
),
]
app/vkk/migrations/0006_rename_time_receipt_create_time.py deleted 100644 → 0
+ 0
− 18
View file @ f4f3f7c8
# Generated by Django 4.1.3 on 2022-11-10 18:41
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('vkk', '0005_alter_departmentcosts_options_and_more'),
]
operations = [
migrations.RenameField(
model_name='receipt',
old_name='time',
new_name='create_time',
),
]
app/vkk/migrations/0007_alter_departmentcosts_equivalents_per_hour_and_more.py deleted 100644 → 0
+ 0
− 28
View file @ f4f3f7c8
# Generated by Django 4.1.3 on 2022-12-01 15:49
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('vkk', '0006_rename_time_receipt_create_time'),
]
operations = [
migrations.AlterField(
model_name='departmentcosts',
name='equivalents_per_hour',
field=models.DecimalField(decimal_places=2, max_digits=8, verbose_name='full time equivalents per hour'),
),
migrations.AlterField(
model_name='generalcosts',
name='costs',
field=models.DecimalField(decimal_places=2, max_digits=8, verbose_name='general costs'),
),
migrations.AlterField(
model_name='salarylevelcosts',
name='brutto_per_hour',
field=models.DecimalField(decimal_places=2, max_digits=8, verbose_name='brutto staff costs per hour'),
),
]
app/vkk/static/scripts/receipts.js
+ 3
− 6
View file @ 239dab24
......@@ -170,7 +170,6 @@ function renderStaffCosts(project_funded_staff, salary_costs_annotated) {
renderTableHeadCell("Gehaltsstufe", row);
renderTableHeadCell("Mitarbeiter-Stunden", row);
renderTableHeadCell("Stundensatz", row);
renderTableHeadCell("(direkte)", row);
renderTableHeadCell("(indirekte)", row);
const tbody = document.createElement("tbody");
......@@ -181,7 +180,7 @@ function renderStaffCosts(project_funded_staff, salary_costs_annotated) {
const sumrow = document.createElement("tr");
tbody.appendChild(sumrow);
const sumtitle = document.createElement("th");
sumtitle.setAttribute("colspan", 4);
sumtitle.setAttribute("colspan", 3);
sumtitle.innerText = "Summe (indirekte)"
sumrow.appendChild(sumtitle);
......@@ -196,7 +195,7 @@ function renderProjectFundedStaff(project_funded_staff, table) {
const title = document.createElement("th");
title.innerText = "durch das Projekt finanzierte Mitarbeiter";
title.setAttribute("colspan", 5);
title.setAttribute("colspan", 4);
head.appendChild(title);
const hours_by_level = project_funded_staff.hours_by_salary_level;
......@@ -208,7 +207,6 @@ function renderProjectFundedStaff(project_funded_staff, table) {
renderTableCell(key, row);
renderTableCell(salary_level["hours"], row)
renderTableCell(salary_level["brutto_per_hour"], row);
renderTableCell(salary_level["costs"], row);
renderTableCell("", row);
}
}
......@@ -221,7 +219,7 @@ function renderSalaryCostsAnnotated(salary_costs_annotated, table) {
const title = document.createElement("th");
title.innerText = "am Projekt beteiligte Mitarbeiter (haushaltsfinanziert)";
title.setAttribute("colspan", 5);
title.setAttribute("colspan", 4);
head.appendChild(title);
const salary_levels = salary_costs_annotated.salary_levels;
......@@ -233,7 +231,6 @@ function renderSalaryCostsAnnotated(salary_costs_annotated, table) {
renderTableCell(key, row);
renderTableCell(salary_level["hours"], row)
renderTableCell(salary_level["brutto_per_hour"], row);
renderTableCell("", row);
renderTableCell(salary_level["costs"], row);
}
}
......
app/vkk/workhours/accounting/projects/project/export/receipts/forms.py
+ 0
− 3
View file @ 239dab24
......@@ -203,9 +203,6 @@ class ReceiptForm(forms.ModelForm):
'brutto_per_hour': self.salary_costs.get(
salary_level=entry.salary_level
).brutto_per_hour,
'costs' : self.salary_costs.get(
salary_level=entry.salary_level
).brutto_per_hour * entry.hours,
} for entry in self.project_funded_staff
},
'hours_sum': sum([
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment