diff --git a/.DS_Store b/.DS_Store index 8e82d86..e5c526a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/COMBO_MO_MOBIL.htm b/COMBO_MO_MOBIL.htm index 650b958..716dbac 100644 --- a/COMBO_MO_MOBIL.htm +++ b/COMBO_MO_MOBIL.htm @@ -67,7 +67,7 @@ #week { page-break-after: always; } div#outgoing:not(:first-child) { display: none; } - + @@ -673,4 +673,17 @@ +window.weekdate[weeklistpos]][myIndex]; + + } + + } + myIndex = myIndex + 1; + }); + } + + setData(myDATA) + + + \ No newline at end of file diff --git a/main/migrations/0028_info_additional_cleaning.py b/main/migrations/0028_info_additional_cleaning.py new file mode 100644 index 0000000..57589c4 --- /dev/null +++ b/main/migrations/0028_info_additional_cleaning.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.4 on 2024-05-02 07:14 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0027_week_info_field'), + ] + + operations = [ + migrations.AddField( + model_name='info', + name='additional_cleaning', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='additional_cleaning_Person', to='main.group'), + ), + ] diff --git a/main/migrations/0029_remove_info_additional_cleaning.py b/main/migrations/0029_remove_info_additional_cleaning.py new file mode 100644 index 0000000..3e8de66 --- /dev/null +++ b/main/migrations/0029_remove_info_additional_cleaning.py @@ -0,0 +1,17 @@ +# Generated by Django 5.0.4 on 2024-05-02 07:25 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0028_info_additional_cleaning'), + ] + + operations = [ + migrations.RemoveField( + model_name='info', + name='additional_cleaning', + ), + ] diff --git a/main/migrations/0030_info_additional_cleaning.py b/main/migrations/0030_info_additional_cleaning.py new file mode 100644 index 0000000..8db5cad --- /dev/null +++ b/main/migrations/0030_info_additional_cleaning.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.4 on 2024-05-02 07:25 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0029_remove_info_additional_cleaning'), + ] + + operations = [ + migrations.AddField( + model_name='info', + name='additional_cleaning', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='additional_cleaning_Person', to='main.group'), + ), + ] diff --git a/main/models.py b/main/models.py index 916034a..387ad8b 100644 --- a/main/models.py +++ b/main/models.py @@ -96,6 +96,7 @@ class info(models.Model): week = models.ForeignKey(week, on_delete=models.CASCADE) gast = models.ForeignKey(group, on_delete=models.CASCADE, related_name="gastPerson", null=True) cleaning = models.ForeignKey(group, on_delete=models.CASCADE, related_name="CleanPerson", null=True) + additional_cleaning = models.ForeignKey(group, on_delete=models.CASCADE, related_name="additional_cleaning_Person", null=True) def __str__(self): return str(self.week) \ No newline at end of file diff --git a/main/templates/main/index.html b/main/templates/main/index.html index 589c2c6..21120a5 100644 --- a/main/templates/main/index.html +++ b/main/templates/main/index.html @@ -82,6 +82,17 @@

+

+ Zwischen-Reinigung + Gruppe: + +

+

Wocheninfo: diff --git a/main/views.py b/main/views.py index 6d1677d..9cf7b31 100644 --- a/main/views.py +++ b/main/views.py @@ -4,6 +4,13 @@ import datetime from . import models as MainModel from django.http import JsonResponse from . import library +from django import template + +register = template.Library() + +@register.filter +def sort_lower(lst, key_name): + return sorted(lst, key=lambda item: getattr(item, key_name).lower()) def actualMonday(): today = datetime.date.today() @@ -47,7 +54,7 @@ def createApi(): my_list = {} # Wir wollen 8 Wochen übertragen (Wenn so viele gepflegt sind) - for i in range(0, 8): + for i in range(0, 12): # Aktuelle Woche abfragen und String generieren new_actual = actual + datetime.timedelta(weeks=+i) new_actual = new_actual.strftime("%d.%m.%y") @@ -73,15 +80,15 @@ def createApi(): DatesOfServiceWeek = [] date = str(db_service_weekly.__getattribute__("date_"+str(i)).weekday()) if db_service_weekly.__getattribute__("date_"+str(i)) != None else "" DatesOfServiceWeek.append(date) - time = " - " + db_service_weekly.__getattribute__("time_"+str(i)).strftime("%H:%M Uhr") if db_service_weekly.__getattribute__("time_"+str(i)) != None else "" + time = " " + db_service_weekly.__getattribute__("time_"+str(i)).strftime("%H:%M Uhr") if db_service_weekly.__getattribute__("time_"+str(i)) != None else "" DatesOfServiceWeek.append(time) - type = str(db_service_weekly.__getattribute__("type_"+str(i))) if db_service_weekly.__getattribute__("type_"+str(i)) != None else "" - DatesOfServiceWeek.append(str(type)) if db_service_weekly.__getattribute__("speaker_"+str(i)) != None: - name = " - " + str(db_service_weekly.__getattribute__("speaker_"+str(i))) + " " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).name) + name = " " + str(db_service_weekly.__getattribute__("speaker_"+str(i)))[:3] + ". " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).name) else: name = "" DatesOfServiceWeek.append(name) + type = str(db_service_weekly.__getattribute__("type_"+str(i))) if db_service_weekly.__getattribute__("type_"+str(i)) != None else "" + DatesOfServiceWeek.append(str(type)) DatesOfService[i] = DatesOfServiceWeek @@ -93,6 +100,7 @@ def createApi(): str("- " + week.info_field) if week.info_field != "" else "", str(db_info.get(week=week).gast.Name) if db_info.get(week=week).gast != None else "", str(db_info.get(week=week).cleaning.Name) if db_info.get(week=week).cleaning != None else "", + str(db_info.get(week=week).additional_cleaning.Name) if db_info.get(week=week).additional_cleaning != None else "", # PREDIGTDIENST DatesOfService[1][0], DatesOfService[1][1], @@ -225,7 +233,7 @@ def index(request): regie_data.stage = persons.get(id=post_regie[4]) if post_regie[4] != "0" else None regie_data.save() - library.writeToHtml(createApi()) + # library.writeToHtml(createApi()) @@ -235,7 +243,7 @@ def index(request): regie_data = MainModel.regie.objects.filter(week__date_of_monday=strDate)[0] if MainModel.regie.objects.filter(week__date_of_monday=strDate).count() > 0 else {} info_data = MainModel.info.objects.filter(week__date_of_monday=strDate)[0] if MainModel.info.objects.filter(week__date_of_monday=strDate).count() > 0 else {} gruppen_data = MainModel.group.objects.all() - persons = MainModel.contributors.objects.all() + persons = MainModel.contributors.objects.all().order_by('name') service_data = MainModel.service.objects.filter(week__date_of_monday=strDate)[0] if MainModel.service.objects.filter(week__date_of_monday=strDate).count() > 0 else {} return render(request, 'main/index.html', {'actual' : actual, 'error' : error, @@ -258,5 +266,4 @@ def index(request): 'info_data' : info_data, 'gruppen_data' : gruppen_data, 'service_data' : service_data - }) - + }) \ No newline at end of file diff --git a/theocbase_templates/.DS_Store b/theocbase_templates/.DS_Store new file mode 100644 index 0000000..356ad6f Binary files /dev/null and b/theocbase_templates/.DS_Store differ diff --git a/theocbase_templates/COMBO_MO_PC.htm b/theocbase_templates/COMBO_MO_PC.htm old mode 100644 new mode 100755 index d0dc00e..77f4b61 --- a/theocbase_templates/COMBO_MO_PC.htm +++ b/theocbase_templates/COMBO_MO_PC.htm @@ -77,7 +77,7 @@

!CONGREGATION_TITLE! - !WEEKSTARTING!#IF !EXCEPTION!# (!EXCEPTION!)#ELSEIF !CONVENTION!# (!EXCEPTION! !NO_MEETING!)#ENDIF#
-

Zoom-Versammlung: ID:612 011 9044 / PW: 918 915

+

Zoom-Versammlung: ID:612 011 9044 / PW: 918 915 -- Zoom-Dienst: ID: 922 886 3912 / PW: 918915

!Service_START!

@@ -95,21 +95,21 @@ - - - + + + - - - + + + - - - + + +
Infos

Gastfreundschaft

Reinigung

Zoom-Dienst ID: 922 886 3912 / PW: 918915

Gastfreundschaft:

Allgemein-Reinigung:

Zwischen-Reinigung:

Dienst
Dienst
@@ -157,11 +157,13 @@ - @@ -235,11 +237,21 @@
#IF !DURATION!#
#ELSE# -
#ENDIF# + 		+ + + -

!GW! (!LM_SOURCE!)

+

!GW! (!LM_SOURCE!)
- @@ -345,11 +357,13 @@
#IF !DURATION!#
#ELSE# -
#ENDIF# + 		+ + + + + + + + + + + -

!FM!

+

!FM!
- @@ -628,14 +642,22 @@

!REPEAT_END!

#IF !DURATION!#
#ELSE# -
#ENDIF# + 		+ + + -

!CL!

+

!CL!

!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#