From 2c65a64990dade49fae30f6fc07e0d72aa01d883 Mon Sep 17 00:00:00 2001 From: Samuel Zielke Date: Fri, 12 Apr 2024 00:14:18 +0200 Subject: [PATCH] New Version of API Request --- .DS_Store | Bin 6148 -> 6148 bytes main/views.py | 7 +- theocbase_templates/COMBO_MO_PC copy.htm | 33 +- theocbase_templates/COMBO_MO_PC.htm | 45 +- theocbase_templates/COMBO_MO_PC_API TEST.htm | 780 +++++++++++++++++++ theocbase_templates/COMBO_MO_PC_NEW.htm | 772 ++++++++++++++++++ theocbase_templates/COMBO_test.html | 25 + theocbase_templates/db_res.js | 15 + 8 files changed, 1629 insertions(+), 48 deletions(-) create mode 100644 theocbase_templates/COMBO_MO_PC_API TEST.htm create mode 100644 theocbase_templates/COMBO_MO_PC_NEW.htm create mode 100644 theocbase_templates/COMBO_test.html create mode 100644 theocbase_templates/db_res.js diff --git a/.DS_Store b/.DS_Store index 1b057cb00e9102003c8db362c44caedeb9ab5ed9..e6b9c1a7cd00fd81461f35d8bdd7dca4e86f6b2b 100644 GIT binary patch delta 19 acmZoMXffEZgNe;VN5RD0bn`wYH&FmSRt3iZ delta 19 acmZoMXffEZgNe;lN5RD0Wb-~IH&FmSTLs4e diff --git a/main/views.py b/main/views.py index 8e5178b..6a96abc 100644 --- a/main/views.py +++ b/main/views.py @@ -5,6 +5,7 @@ from . import models as MainModel from django.http import JsonResponse wochentage = ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sonntag'] +service_types = ['Zoom', 'Saal', 'Gruppe'] def actualMonday(): today = datetime.date.today() @@ -75,7 +76,7 @@ def createApi_1(): 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 "" DatesOfServiceWeek.append(time) - type = str(db_service_weekly.__getattribute__("type_"+str(i))) if db_service_weekly.__getattribute__("type_"+str(i)) != None else "" + type = str(service_types[db_service_weekly.__getattribute__("type_"+str(i))+1]) if db_service_weekly.__getattribute__("type_"+str(i)) != None else "" DatesOfServiceWeek.append(type) if db_service_weekly.__getattribute__("speaker_"+str(i)) != None: name = " - " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).first_name[:3]) + ". " + str(db_service_weekly.__getattribute__("speaker_"+str(i)).name) @@ -254,10 +255,6 @@ def index(request): # ÜBERPRÜFEN OB DIE "WEEK" SCHON EINEN EINTRAG HAT - SONST ANLEGEN MainModel.week.objects.create(date_of_monday=strDate) if MainModel.week.objects.filter(date_of_monday=strDate).count() < 1 else ... - # FUNKTION ZUM VERGLEICH DER BEIDEN DATENSÄTZE - def check_is_same(a, b): - return True if a == b else False - # Abfrage der Datenbanken um Informationen abzugleichen gruppen_data = MainModel.group.objects.all() persons = MainModel.contributors.objects.all() diff --git a/theocbase_templates/COMBO_MO_PC copy.htm b/theocbase_templates/COMBO_MO_PC copy.htm index 81cfa21..ded8a4d 100644 --- a/theocbase_templates/COMBO_MO_PC copy.htm +++ b/theocbase_templates/COMBO_MO_PC copy.htm @@ -13,17 +13,6 @@ Combined Schedule (colorful) - - + + + +
+

!REPEAT_START!

+
+ +

!Service_START!

+
+ + + + +
+ + +

Infos und Predigtdienst

+
+
+
+ + + + + + + + + + + + + + + + + + + +
Infos

Gastfreundschaft

Reinigung

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

Dienst




Dienst




+
+

!Service_END!

+

!MIDWEEK_START!

+
+ + #IF !MWB_NO!# + #ENDIF# + + +
+ + +

!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !LM_STARTTIME!#ENDIF#)

+
+
+

#IF !NO_MEETING_EXCEPTION! EMPTY#

+
+ + + + + + + + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! !SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF# & !PRAYER! #IF !PRAYER1_NAME!#(!PRAYER1_NAME!)#ENDIF#

+
+

!LM_CHAIRMAN! (!CHAIRMAN!)#IF !COUNSELOR_A1!# / !COUNSELOR_A1! (!COUNSELOR! !AUX_SHORT!1)#IF !COUNSELOR_A2!# / !COUNSELOR_A2! + (!COUNSELOR! !AUX_SHORT!2)

#ENDIF##ENDIF# +
#IF !DURATION!#
1
#ELSE# +
!OC_STARTTIME!
#ENDIF# +
+

!OPENING!

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

!GW! (!LM_SOURCE!)

+
#IF !DURATION!#
!GW1_TIME!
#ELSE# +
!GW1_STARTTIME!
#ENDIF# +
+

!GW1_THEME!

+
+

!GW1_SPEAKER!

+
#IF !DURATION!#
!GW2_TIME!
#ELSE# +
!GW2_STARTTIME!
#ENDIF# +
+

!GW2_THEME!

+
+

!GW2_SPEAKER!

+
#IF !GW3_SPEAKER_B! EMPTY# + #IF !DURATION!#
!GW3_TIME!
+ #ELSE#
!GW3_STARTTIME!
#ENDIF# +
+

!GW3_THEME!

+
+

!GW3_SPEAKER_A!

+
#ENDIF#
+ + + + + + + + + + + + +
#IF !GW3_SPEAKER_B!# + #IF !DURATION!#
!GW3_TIME!
+ #ELSE#
!GW3_STARTTIME!
#ENDIF# +
+

!GW3_THEME!

+
#IF !GW3_SPEAKER_C!# +

!GW3_SPEAKER_C!

+
!AUX_SHORT!2
+
#ENDIF# +

!GW3_SPEAKER_B!

+
!AUX_SHORT!1
+
+

!GW3_SPEAKER_A!

+
#ENDIF#
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #IF !FM3_THEME!# + + + + + + + + + + + + #ENDIF# + + #IF !FM4_THEME!# + + + + + + + + + + + + #ENDIF# +
#IF !DURATION!#
#ELSE# +
#ENDIF# +
+

!FM!

+
+ #IF !DURATION!#
!FM1_TIME!
+ #ELSE#
!FM1_STARTTIME!
#ENDIF# +
+

!FM1_THEME!

+
#IF !FM1_SPEAKER_C!# +

!FM1_SPEAKER_C!#IF !FM1_ASSISTANT_C!#
!FM1_ASSISTANT_C!#ENDIF#

+
!AUX_SHORT!2
+
#ENDIF##IF !FM1_SPEAKER_B!# +

!FM1_SPEAKER_B!#IF !FM1_ASSISTANT_B!#
!FM1_ASSISTANT_B!#ENDIF#

+
!AUX_SHORT!1
+
#ENDIF# +

!FM1_SPEAKER_A!#IF !FM1_ASSISTANT_A!#
!FM1_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM2_TIME!
+ #ELSE#
!FM2_STARTTIME!
#ENDIF# +
+

!FM2_THEME!

+
#IF !FM2_SPEAKER_C!# +

!FM2_SPEAKER_C!#IF !FM2_ASSISTANT_C!#
!FM2_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM2_SPEAKER_B!# +

!FM2_SPEAKER_B!#IF !FM2_ASSISTANT_B!#
!FM2_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM2_SPEAKER_A!#IF !FM2_ASSISTANT_A!#
!FM2_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM3_TIME!
+ #ELSE#
!FM3_STARTTIME!
#ENDIF# +
+

!FM3_THEME!

+
#IF !FM3_SPEAKER_C!# +

!FM3_SPEAKER_C!#IF !FM3_ASSISTANT_C!#
!FM3_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM3_SPEAKER_B!# +

!FM3_SPEAKER_B!#IF !FM3_ASSISTANT_B!#
!FM3_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM3_SPEAKER_A!#IF !FM3_ASSISTANT_A!#
!FM3_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM4_TIME!
+ #ELSE#
!FM4_STARTTIME!
#ENDIF# +
+

!FM4_THEME!

+
#IF !FM4_SPEAKER_C!# +

!FM4_SPEAKER_C!#IF !FM4_ASSISTANT_C!#
!FM4_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM4_SPEAKER_B!# +

!FM4_SPEAKER_B!#IF !FM4_ASSISTANT_B!#
!FM4_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM4_SPEAKER_A!#IF !FM4_ASSISTANT_A!#
!FM4_ASSISTANT_A!#ENDIF#

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

!CL!

+

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

+ +
#IF !DURATION!#
!CL1_TIME!
#ELSE# +
!CL1_STARTTIME!
#ENDIF# +
+

!CL1_THEME!

+
+

!CL1_SPEAKER!

+
#IF !CL2_THEME!##IF !DURATION!#
!CL2_TIME!
#ELSE# +
!CL2_STARTTIME!
#ENDIF# +
+

!CL2_THEME!

+
+

!CL2_SPEAKER!

+
#ENDIF#
#IF !CO_VISIT! EMPTY##IF !DURATION!#
!CBS_TIME!
#ELSE# +
!CBS_STARTTIME!
#ENDIF# +
+

!CBS_THEME!

+
+

!CBS_CONDUCTOR! (!CONDUCTOR!)
!CBS_READER! (!READER!)

+
#ENDIF#
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
#IF !CO_VISIT!##IF !DURATION!#
3
#ELSE# +
!CC_STARTTIME!
#ENDIF# +
+

!CONCLUSION!

+
#IF !DURATION!#
!CO_TIME!
#ELSE# +
!CO_STARTTIME!
#ENDIF# +
+

!CO_THEME!

+
+

!CO_NAME! (!CO!)

+
#ENDIF#
#IF !CO_VISIT! EMPTY!##IF !DURATION!#
3
#ELSE# +
!CC_STARTTIME!
#ENDIF# +
+

!CONCLUSION!

+
#ENDIF#
#IF !DURATION! EMPTY# +
!SONG3_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#(!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

!MIDWEEK_END!

+

!WEEKEND_START!

+
+ + #IF !WT_NO!# + #ENDIF# + + +
+ + +

!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#) +

+
+

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION! EMPTY#

+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!

+
+

!PM_CHAIRMAN! (!CHAIRMAN!)

+
+
+
+ + + + + + + +
#IF !DURATION!#
!PT_TIME!
#ELSE# +
Vortrag
#ENDIF# +
+

!PT_THEME!

+
+

!PT_SPEAKER! (!PT_SPEAKER_CONGREGATION!)

+
+
+ +
+ + + + + + + +
#IF !DURATION!#
!WT_TIME!
#ELSE# +
WT
#ENDIF# +
+

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

+

!WT_THEME!

+
+

!WT_CONDUCTOR! (!CONDUCTOR!)#IF !CO_VISIT! EMPTY##IF !WT_READER!#
!WT_READER! (!READER!)#ENDIF##ENDIF#

+
+
+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG3_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME! EMPTY# (!PT_SPEAKER!)#ELSE# (!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

#ENDIF#

+

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION!#

+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!

+
+

#IF !PM_CHAIRMAN!# !PM_CHAIRMAN!#ELSE# !WT_CONDUCTOR! #ENDIF# (!CHAIRMAN!)

+
+
+
+ + + + + + + + + + + +
+ + + + + +

!WT!

+
#IF !DURATION!#
!WT_TIME!
#ELSE# +
!WT_STARTTIME!
#ENDIF# +
+

!WT_THEME!

+
+

!WT_CONDUCTOR! (!CONDUCTOR!)#IF !CO_VISIT! EMPTY##IF !WT_READER!#
!WT_READER! (!READER!)#ENDIF##ENDIF#

+
+
+

#IF !CO_VISIT! EMPTY#

+
+ + + + + +
#IF !DURATION! EMPTY# +
!SONG2_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#(!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

#ENDIF#

+

#ENDIF#

+

!WEEKEND_END!

+

!PTOUT_START!

+ #IF !PT_NO!# +
+ + + + +
+ +

!TITLE!

+
+
+
+ + + + + +
+
!DATE dd.MM.!
+
+

!PT_SPEAKER! (!PT_CONGREGATION! / !PM_STARTTIME!)

+
+
+ #ENDIF# +

!PTOUT_END!

+

!Technik_START!

+
+ + + + +
+ +

Ordner und Technik

+
+
+
+ + + + + + + + + + + + +
Ordner

Saal

Foyer

Technik

Anlage

Zoom

Bühne

+
+

+

!Technik_END!

+
+ +

!REPEAT_END!

+ +
+ + + + diff --git a/theocbase_templates/COMBO_MO_PC_NEW.htm b/theocbase_templates/COMBO_MO_PC_NEW.htm new file mode 100644 index 0000000..20885d4 --- /dev/null +++ b/theocbase_templates/COMBO_MO_PC_NEW.htm @@ -0,0 +1,772 @@ + + + + + + + + + + + + + + Combined Schedule (colorful) + + + + + + +
+

!REPEAT_START!

+
+ +

!Service_START!

+
+ + + + +
+ + +

Infos und Predigtdienst

+
+
+
+ + + + + + + + + + + + + + + + + + + +
Infos

Gastfreundschaft

Reinigung

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

Dienst




Dienst




+
+

!Service_END!

+

!MIDWEEK_START!

+
+ + #IF !MWB_NO!# + #ENDIF# + + +
+ + +

!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !LM_STARTTIME!#ENDIF#)

+
+
+

#IF !NO_MEETING_EXCEPTION! EMPTY#

+
+ + + + + + + + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! !SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF# & !PRAYER! #IF !PRAYER1_NAME!#(!PRAYER1_NAME!)#ENDIF#

+
+

!LM_CHAIRMAN! (!CHAIRMAN!)#IF !COUNSELOR_A1!# / !COUNSELOR_A1! (!COUNSELOR! !AUX_SHORT!1)#IF !COUNSELOR_A2!# / !COUNSELOR_A2! + (!COUNSELOR! !AUX_SHORT!2)

#ENDIF##ENDIF# +
#IF !DURATION!#
1
#ELSE# +
!OC_STARTTIME!
#ENDIF# +
+

!OPENING!

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

!GW! (!LM_SOURCE!)

+
#IF !DURATION!#
!GW1_TIME!
#ELSE# +
!GW1_STARTTIME!
#ENDIF# +
+

!GW1_THEME!

+
+

!GW1_SPEAKER!

+
#IF !DURATION!#
!GW2_TIME!
#ELSE# +
!GW2_STARTTIME!
#ENDIF# +
+

!GW2_THEME!

+
+

!GW2_SPEAKER!

+
#IF !GW3_SPEAKER_B! EMPTY# + #IF !DURATION!#
!GW3_TIME!
+ #ELSE#
!GW3_STARTTIME!
#ENDIF# +
+

!GW3_THEME!

+
+

!GW3_SPEAKER_A!

+
#ENDIF#
+ + + + + + + + + + + + +
#IF !GW3_SPEAKER_B!# + #IF !DURATION!#
!GW3_TIME!
+ #ELSE#
!GW3_STARTTIME!
#ENDIF# +
+

!GW3_THEME!

+
#IF !GW3_SPEAKER_C!# +

!GW3_SPEAKER_C!

+
!AUX_SHORT!2
+
#ENDIF# +

!GW3_SPEAKER_B!

+
!AUX_SHORT!1
+
+

!GW3_SPEAKER_A!

+
#ENDIF#
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #IF !FM3_THEME!# + + + + + + + + + + + + #ENDIF# + + #IF !FM4_THEME!# + + + + + + + + + + + + #ENDIF# +
#IF !DURATION!#
#ELSE# +
#ENDIF# +
+

!FM!

+
+ #IF !DURATION!#
!FM1_TIME!
+ #ELSE#
!FM1_STARTTIME!
#ENDIF# +
+

!FM1_THEME!

+
#IF !FM1_SPEAKER_C!# +

!FM1_SPEAKER_C!#IF !FM1_ASSISTANT_C!#
!FM1_ASSISTANT_C!#ENDIF#

+
!AUX_SHORT!2
+
#ENDIF##IF !FM1_SPEAKER_B!# +

!FM1_SPEAKER_B!#IF !FM1_ASSISTANT_B!#
!FM1_ASSISTANT_B!#ENDIF#

+
!AUX_SHORT!1
+
#ENDIF# +

!FM1_SPEAKER_A!#IF !FM1_ASSISTANT_A!#
!FM1_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM2_TIME!
+ #ELSE#
!FM2_STARTTIME!
#ENDIF# +
+

!FM2_THEME!

+
#IF !FM2_SPEAKER_C!# +

!FM2_SPEAKER_C!#IF !FM2_ASSISTANT_C!#
!FM2_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM2_SPEAKER_B!# +

!FM2_SPEAKER_B!#IF !FM2_ASSISTANT_B!#
!FM2_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM2_SPEAKER_A!#IF !FM2_ASSISTANT_A!#
!FM2_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM3_TIME!
+ #ELSE#
!FM3_STARTTIME!
#ENDIF# +
+

!FM3_THEME!

+
#IF !FM3_SPEAKER_C!# +

!FM3_SPEAKER_C!#IF !FM3_ASSISTANT_C!#
!FM3_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM3_SPEAKER_B!# +

!FM3_SPEAKER_B!#IF !FM3_ASSISTANT_B!#
!FM3_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM3_SPEAKER_A!#IF !FM3_ASSISTANT_A!#
!FM3_ASSISTANT_A!#ENDIF#

+
+ #IF !DURATION!#
!FM4_TIME!
+ #ELSE#
!FM4_STARTTIME!
#ENDIF# +
+

!FM4_THEME!

+
#IF !FM4_SPEAKER_C!# +

!FM4_SPEAKER_C!#IF !FM4_ASSISTANT_C!#
!FM4_ASSISTANT_C!#ENDIF#

+
#ENDIF##IF !FM4_SPEAKER_B!# +

!FM4_SPEAKER_B!#IF !FM4_ASSISTANT_B!#
!FM4_ASSISTANT_B!#ENDIF#

+
#ENDIF# +

!FM4_SPEAKER_A!#IF !FM4_ASSISTANT_A!#
!FM4_ASSISTANT_A!#ENDIF#

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

!CL!

+

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

+ +
#IF !DURATION!#
!CL1_TIME!
#ELSE# +
!CL1_STARTTIME!
#ENDIF# +
+

!CL1_THEME!

+
+

!CL1_SPEAKER!

+
#IF !CL2_THEME!##IF !DURATION!#
!CL2_TIME!
#ELSE# +
!CL2_STARTTIME!
#ENDIF# +
+

!CL2_THEME!

+
+

!CL2_SPEAKER!

+
#ENDIF#
#IF !CO_VISIT! EMPTY##IF !DURATION!#
!CBS_TIME!
#ELSE# +
!CBS_STARTTIME!
#ENDIF# +
+

!CBS_THEME!

+
+

!CBS_CONDUCTOR! (!CONDUCTOR!)
!CBS_READER! (!READER!)

+
#ENDIF#
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
#IF !CO_VISIT!##IF !DURATION!#
3
#ELSE# +
!CC_STARTTIME!
#ENDIF# +
+

!CONCLUSION!

+
#IF !DURATION!#
!CO_TIME!
#ELSE# +
!CO_STARTTIME!
#ENDIF# +
+

!CO_THEME!

+
+

!CO_NAME! (!CO!)

+
#ENDIF#
#IF !CO_VISIT! EMPTY!##IF !DURATION!#
3
#ELSE# +
!CC_STARTTIME!
#ENDIF# +
+

!CONCLUSION!

+
#ENDIF#
#IF !DURATION! EMPTY# +
!SONG3_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#(!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

!MIDWEEK_END!

+

!WEEKEND_START!

+
+ + #IF !WT_NO!# + #ENDIF# + + +
+ + +

!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#) +

+
+

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION! EMPTY#

+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!

+
+

!PM_CHAIRMAN! (!CHAIRMAN!)

+
+
+
+ + + + + + + +
#IF !DURATION!#
!PT_TIME!
#ELSE# +
Vortrag
#ENDIF# +
+

!PT_THEME!

+
+

!PT_SPEAKER! (!PT_SPEAKER_CONGREGATION!)

+
+
+ +
+ + + + + + + +
#IF !DURATION!#
!WT_TIME!
#ELSE# +
WT
#ENDIF# +
+

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

+

!WT_THEME!

+
+

!WT_CONDUCTOR! (!CONDUCTOR!)#IF !CO_VISIT! EMPTY##IF !WT_READER!#
!WT_READER! (!READER!)#ENDIF##ENDIF#

+
+
+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG3_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME! EMPTY# (!PT_SPEAKER!)#ELSE# (!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

#ENDIF#

+

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION!#

+
+ + + + + + +
#IF !DURATION! EMPTY# +
!SONG1_STARTTIME!
#ENDIF# +
+

!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!

+
+

#IF !PM_CHAIRMAN!# !PM_CHAIRMAN!#ELSE# !WT_CONDUCTOR! #ENDIF# (!CHAIRMAN!)

+
+
+
+ + + + + + + + + + + +
+ + + + + +

!WT!

+
#IF !DURATION!#
!WT_TIME!
#ELSE# +
!WT_STARTTIME!
#ENDIF# +
+

!WT_THEME!

+
+

!WT_CONDUCTOR! (!CONDUCTOR!)#IF !CO_VISIT! EMPTY##IF !WT_READER!#
!WT_READER! (!READER!)#ENDIF##ENDIF#

+
+
+

#IF !CO_VISIT! EMPTY#

+
+ + + + + +
#IF !DURATION! EMPTY# +
!SONG2_STARTTIME!
#ENDIF# +
+

!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#(!PRAYER2_NAME!)#ENDIF#

+
+
+

#ENDIF#

+

#ENDIF#

+

#ENDIF#

+

!WEEKEND_END!

+

!PTOUT_START!

+ #IF !PT_NO!# +
+ + + + +
+ +

!TITLE!

+
+
+
+ + + + + +
+
!DATE dd.MM.!
+
+

!PT_SPEAKER! (!PT_CONGREGATION! / !PM_STARTTIME!)

+
+
+ #ENDIF# +

!PTOUT_END!

+

!Technik_START!

+
+ + + + +
+ +

Ordner und Technik

+
+
+
+ + + + + + + + + + + + +
Ordner

Saal

Foyer

Technik

Anlage

Zoom

Bühne

+
+

+

!Technik_END!

+
+ +

!REPEAT_END!

+ +
+ + + + diff --git a/theocbase_templates/COMBO_test.html b/theocbase_templates/COMBO_test.html new file mode 100644 index 0000000..3b2eed0 --- /dev/null +++ b/theocbase_templates/COMBO_test.html @@ -0,0 +1,25 @@ + + + + + + + TEST + + + +

TEST

+

+ + + \ No newline at end of file diff --git a/theocbase_templates/db_res.js b/theocbase_templates/db_res.js new file mode 100644 index 0000000..6f6a5b1 --- /dev/null +++ b/theocbase_templates/db_res.js @@ -0,0 +1,15 @@ +let ResData = null +fetch('http://mo.samuelzielke.de/api/') + .then(response => response.json()) + .then(data => { + ResData=data; + window.readyrequest = true; + window.ResData = ResData; + }) + .catch(error => console.error('Error:', error)); +let stopped = false +while(!stopped){ + console.log("Warten"); + if (ResData != null) stopped = true; +} +const DATA = ResData \ No newline at end of file