Merge pull request #21 from informatik-mannheim/version_for_django4

prolongation-date fix

Author: LinusKanstein

website/migrations/0017_thesis_assessor_grade_alter_assessor_email_and_more.py

@@ -0,0 +1,54 @@
+# Generated by Django 4.0.5 on 2022-06-27 07:36
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0016_auto_20170529_1255'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='thesis',
+            name='assessor_grade',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=2, null=True, validators=[django.core.validators.MinValueValidator(1.0), django.core.validators.MaxValueValidator(5.0)]),
+        ),
+        migrations.AlterField(
+            model_name='assessor',
+            name='email',
+            field=models.EmailField(blank=True, max_length=80, null=True, verbose_name='E-Mail'),
+        ),
+        migrations.AlterField(
+            model_name='assessor',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='thesis',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='thesis',
+            name='restriction_note',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
+        ),
+    ]

website/migrations/0018_thesis_thesis_program_user_is_head.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.0.5 on 2022-08-02 08:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0017_thesis_assessor_grade_alter_assessor_email_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='thesis',
+            name='thesis_program',
+            field=models.CharField(default='', max_length=3),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='is_head',
+            field=models.BooleanField(default=False),
+        ),
+    ]

website/migrations/0019_assessor_a_title.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.5 on 2022-10-28 08:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0018_thesis_thesis_program_user_is_head'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assessor',
+            name='a_title',
+            field=models.CharField(blank=True, max_length=30, null=True, verbose_name='akad. Grad'),
+        ),
+    ]

website/migrations/0020_rename_a_title_assessor_academic_title_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.0.5 on 2022-11-10 10:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0019_assessor_a_title'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='assessor',
+            old_name='a_title',
+            new_name='academic_title',
+        ),
+        migrations.AlterField(
+            model_name='thesis',
+            name='thesis_program',
+            field=models.CharField(max_length=10),
+        ),
+    ]

website/static/website/bootstrap-3.3.7-dist/js/calculate-end-date.js

@@ -131,13 +131,13 @@ function calculateProlongationDate() {
 
     let prolong_date = new Date(parseInt(year), month - 1, parseInt(day));
     let weeks = document.getElementById("id_weeks").value;
-    prolong_date.setDate(prolong_date.getDate() + weeks * 7);
+    prolong_date.setDate(prolong_date.getDate() + weeks * 7 - 1);
 
     while (prolong_date.getDay() === 6 || prolong_date.getDay() === 0 || isHolidayForDate(prolong_date)) {
         prolong_date.setDate(prolong_date.getDate() + 1);
     }
 
-    document.getElementById("id_prolongation_date_day").value = prolong_date.getDate() - 1;
+    document.getElementById("id_prolongation_date_day").value = prolong_date.getDate();
     document.getElementById("id_prolongation_date_month").value = prolong_date.getMonth() + 1;
     document.getElementById("id_prolongation_date_year").value = prolong_date.getFullYear();
 }