diff --git a/.DS_Store b/.DS_Store index e6b9c1a..8e82d86 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 2be1b80..0a78ff3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ venv/ *__init__.py *__pycache__/ db.sqlite3 +customData.yml \ No newline at end of file diff --git a/COMBO_MO_MOBIL.htm b/COMBO_MO_MOBIL.htm new file mode 100644 index 0000000..c866683 --- /dev/null +++ b/COMBO_MO_MOBIL.htm @@ -0,0 +1,676 @@ + + + + + + + + + + + + + + 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!

+
+ + + + \ No newline at end of file diff --git a/main/library.py b/main/library.py new file mode 100644 index 0000000..73ee941 --- /dev/null +++ b/main/library.py @@ -0,0 +1,20 @@ +import dropbox, yaml + + +def writeToHtml(data): + with open('customData.yml', 'r') as file: + prime_service = yaml.safe_load(file) + + dbx = dropbox.Dropbox('sl.BzPippHAjsFYt3D-DtscfnXIORlVjcb10y9EajcnoGJ1zhF2oQ9btHWBcgiTeDWPhtwTnWkfd0D99jkZHiOuQNHcHsu9SEa9l4Wen7F4B1CiJ-EzsFkGEmaMBcyZnUxfxnij4kXsiU05') + + with open('COMBO_MO_MOBIL.htm', 'r+') as f: + lines = f.readlines() + for i, line in enumerate(lines): + if '' in line: + lines[i] = ' ' + '\n' + f.truncate() + f.seek(0) # rewrite into the file + for line in lines: + f.write(line) + with open('COMBO_MO_MOBIL.htm', 'rb') as f: + dbx.files_upload(f.read(), "/COMBO_MO_MOBIL.htm", mode=dropbox.files.WriteMode("overwrite")) \ No newline at end of file diff --git a/main/views.py b/main/views.py index b666364..dfc73d6 100644 --- a/main/views.py +++ b/main/views.py @@ -3,6 +3,7 @@ from django.contrib.auth.decorators import login_required import datetime from . import models as MainModel from django.http import JsonResponse +from . import library def actualMonday(): today = datetime.date.today() @@ -217,6 +218,8 @@ 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()) + diff --git a/theocbase_templates/COMBO_MO_PC.htm b/theocbase_templates/COMBO_MO_PC.htm index 5208a51..7661b8c 100644 --- a/theocbase_templates/COMBO_MO_PC.htm +++ b/theocbase_templates/COMBO_MO_PC.htm @@ -9,8 +9,7 @@ - - + Combined Schedule (colorful) diff --git a/theocbase_templates/COMBO_test.html b/theocbase_templates/COMBO_test.html deleted file mode 100644 index 3b2eed0..0000000 --- a/theocbase_templates/COMBO_test.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - TEST - - - -

TEST

-

- - - \ No newline at end of file