From 9c8367f99301fc3db26b8bb1e6a5f60e2fdb1777 Mon Sep 17 00:00:00 2001 From: Samuel Zielke Date: Sun, 8 Sep 2024 02:22:24 +0200 Subject: [PATCH] Save before local delete --- .DS_Store | Bin 8196 -> 8196 bytes COMBO_MO_MOBIL.htm | 138 +++++++++++------- .../COMBO_MO_MOBIL_VORLAGE.htm | 54 +++++-- theocbase_templates/COMBO_MO_PC.htm | 52 +++++-- 4 files changed, 163 insertions(+), 81 deletions(-) diff --git a/.DS_Store b/.DS_Store index a52e3d589544defce14cdfeb5f41d9cbc079b408..d31d0bff2ad59b5f51dde8a4d10dc58367a34bdb 100644 GIT binary patch literal 8196 zcmeHMJ!}&(6n<_~xU^6rexxplL%;wkPz05bSV9Q{D=9GWQ*upc1DA8iB@Gp-l&w;c zP#0FjiWnGSU|;}dCKeVD0x___#suH|ji zA|eN!X=VVA4vqQTSG1mZWm>s?v$;8| zocj^iK5YhU2L8(o@cY3Z`*zxYdjbz1v2ur~`R4bmhvD5N?`s!)y!7!}~l zEPnZCd^s80<1GzaV(^D*45c&`$%AZ2H$kgZBbh)vP9XXX)(HauVE7)1WSVOT0IBKVYH7irn&+p*rnOu@Hyd3y;SJ$EY_`3Y) z%d=0)$0ckLCZ}_+6IaH%g*uMaMO08IxX3dQDOhHQbvX*a%$jBSf)0^tsu+iD*3^n^=w5xB=wWE#l7cQLcHr|xs>P&A=befJo)?xiP41A6H2WeAjl-ucC8fxmH9K1P^r`2UXW`(4~JEV(dbcG1-{5 rB8nNbfBqq$Id0GY)&4-!PrJ3B;QCp(cC>y{l5kNP_Wb80{H692vw4J< delta 142 zcmZp1XmOa}FDk^qz`)4BAi%)j&k)bx3n4cqE@t1%&cVXr0+JSDa0UwdGB_bC0kWMK zJQ;i#^cXT2N*HoIbMljua`Kaa>Val4r32}C|G|J^bF+X4<796kjmfWt!ZxoIHe;H6 VUd()R6HhDiW_F2hEE_Y}nE^S;Bn|)o diff --git a/COMBO_MO_MOBIL.htm b/COMBO_MO_MOBIL.htm index 94b8b0e..c0856d6 100644 --- a/COMBO_MO_MOBIL.htm +++ b/COMBO_MO_MOBIL.htm @@ -27,7 +27,7 @@ p { margin: 0 0.500rem; line-height: 0.750rem; } svg { margin: auto; display: block; } .info { font-weight: normal; color: gray; } - .theme { font-weight: bold; color: black; } + .theme { font-weight: normal; color: black; } .name { font-weight: normal; font-style: italic; color: #333333; text-align: right; white-space: nowrap; } .infobox { width: 1.000rem; height: 1.000rem; line-height: 1.000rem; font-size: 0.625rem; font-weight: bold; text-align: center; color: white; } .starttime { width: auto; height: 1.500rem; line-height: 1.500rem; margin: auto; font-size: 0.625rem; color: black; } @@ -65,9 +65,10 @@ #outgoing { margin: 0 3.000rem; } #technik { margin: 0 3.000rem; } #week { page-break-after: always; } + tr.heigher { height: 1.8rem;} div#outgoing:not(:first-child) { display: none; } - + @@ -79,7 +80,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: 918915 -- Zoom-Dienst: ID: 922 886 3912 / PW: 918915

!Service_START!

@@ -95,23 +96,23 @@
- + - - - + + + - + - - - + + + - + - - - + + +
Infos

Gastfreundschaft

Reinigung

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

Gastfreundschaft:

Allgemein-Reinigung:

Zwischen-Reinigung:

Dienst
Dienst
@@ -159,11 +160,13 @@ - @@ -237,11 +240,21 @@
#IF !DURATION!#
#ELSE# -
#ENDIF# + 		+ + + -

!GW! (!LM_SOURCE!)

+

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

!FM!

+

!FM!
- @@ -443,10 +458,10 @@
#IF !DURATION!#
#ELSE# -
#ENDIF# + 		+ + + -

!CL!

+

!CL!

!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#
#IF !WT_NO!# - #ENDIF# -
+ -

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

+

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

@@ -456,7 +471,7 @@
#IF !DURATION! EMPTY# -
!SONG1_STARTTIME!
#ENDIF# +
!SONG1_STARTTIME!
#ENDIF#

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

@@ -471,12 +486,12 @@ - - @@ -486,31 +501,57 @@
#IF !DURATION!#
!PT_TIME!
#ELSE# -
Vortrag
#ENDIF# +
Vortrag
#ENDIF# 		+

!PT_THEME!

 +

!PT_SPEAKER! (!PT_SPEAKER_CONGREGATION!)
- -
#IF !DURATION!#
!WT_TIME!
#ELSE# -
WT
#ENDIF# +
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 !CO_VISIT!#

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

!FT_THEME!

+ 		+

!CO_NAME! (!CO!)

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

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

+

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

#ENDIF#

+

#IF !CO_VISIT! EMPTY#

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

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

+
+
+

#ENDIF#

#ENDIF#

#ENDIF#

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION!#

@@ -630,29 +671,31 @@

!REPEAT_END!

-window.weekdate[weeklistpos]][myIndex]; - - } - - } - myIndex = myIndex + 1; - }); - } - - setData(myDATA) - - - \ No newline at end of file diff --git a/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm b/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm index 1b0612b..78a496e 100644 --- a/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm +++ b/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm @@ -458,10 +458,10 @@
#IF !WT_NO!# - #ENDIF# -
+ -

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

+

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

@@ -471,7 +471,7 @@
#IF !DURATION! EMPTY# -
!SONG1_STARTTIME!
#ENDIF# +
!SONG1_STARTTIME!
#ENDIF#

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

@@ -486,12 +486,12 @@ - - @@ -501,31 +501,57 @@
#IF !DURATION!#
!PT_TIME!
#ELSE# -
Vortrag
#ENDIF# +
Vortrag
#ENDIF# 		+

!PT_THEME!

 +

!PT_SPEAKER! (!PT_SPEAKER_CONGREGATION!)
- -
#IF !DURATION!#
!WT_TIME!
#ELSE# -
WT
#ENDIF# +
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 !CO_VISIT!#

+ + + + + + +
#IF !DURATION!#
!FT_TIME!
#ELSE# +
!FT_STARTTIME!
#ENDIF# + 		+

!FT_THEME!

+ 		+

!CO_NAME! (!CO!)

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

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

+

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

+
+
+

#ENDIF#

+

#IF !CO_VISIT! EMPTY#

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

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

#ENDIF#

#ENDIF#

#ENDIF#

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION!#

@@ -659,7 +685,7 @@ let weeklistpos = 0; let myIndex = 0; ordner_elements.forEach((element) => { - if (myIndex == 36){ + if (myIndex == 37){ myIndex = 0; weeklistpos = weeklistpos + 1; } diff --git a/theocbase_templates/COMBO_MO_PC.htm b/theocbase_templates/COMBO_MO_PC.htm index e00354f..e5d347e 100755 --- a/theocbase_templates/COMBO_MO_PC.htm +++ b/theocbase_templates/COMBO_MO_PC.htm @@ -456,10 +456,10 @@
#IF !WT_NO!# - #ENDIF# -
+ -

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

+

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

@@ -469,7 +469,7 @@
#IF !DURATION! EMPTY# -
!SONG1_STARTTIME!
#ENDIF# +
!SONG1_STARTTIME!
#ENDIF#

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

@@ -484,12 +484,12 @@ - - @@ -499,31 +499,57 @@
#IF !DURATION!#
!PT_TIME!
#ELSE# -
Vortrag
#ENDIF# +
Vortrag
#ENDIF# 		+

!PT_THEME!

 +

!PT_SPEAKER! (!PT_SPEAKER_CONGREGATION!)
- -
#IF !DURATION!#
!WT_TIME!
#ELSE# -
WT
#ENDIF# +
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 !CO_VISIT!#

+ + + + + + +
#IF !DURATION!#
!FT_TIME!
#ELSE# +
!FT_STARTTIME!
#ENDIF# + 		+

!FT_THEME!

+ 		+

!CO_NAME! (!CO!)

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

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

+

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

+
+
+

#ENDIF#

+

#IF !CO_VISIT! EMPTY#

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

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

#ENDIF#

#ENDIF#

#ENDIF#

#IF !NO_MEETING_EXCEPTION! EMPTY#

#IF !VIRTUAL_CONVENTION!#