From f3dc5fc33cf965ef3aee9df65354f6c0da5f1bcf Mon Sep 17 00:00:00 2001
From: sujan <sujanadh10@gmail.com>
Date: Tue, 3 Sep 2024 13:01:51 +0545
Subject: [PATCH] feat: updated xls form to include building_exists condition

---
 osm_fieldwork/update_form.py                  |  15 ++++++++++++++-
 .../xlsforms/fmtm/mandatory_fields.xls        | Bin 18432 -> 18432 bytes
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/osm_fieldwork/update_form.py b/osm_fieldwork/update_form.py
index 43ecaee2..57815652 100644
--- a/osm_fieldwork/update_form.py
+++ b/osm_fieldwork/update_form.py
@@ -29,9 +29,22 @@ def merge_sheets(mandatory_df, custom_df, digitisation_df):
     mandatory_df_filtered = mandatory_df[~mandatory_df["name"].isin(common_fields)]
     digitisation_df_filtered = digitisation_df[~digitisation_df["name"].isin(common_fields)]
 
+    group_row = pd.DataFrame({
+    "type": ["begin group"],
+    "name": ["survey_questions"],
+    "label": ["Survey Form"],
+    "relevant": ["${building_exists} = 'yes'"]  # Add the relevant condition to display this group only if "Yes" is selected
+    })
+
+    end_group_row = pd.DataFrame({
+        "type": ["end group"],
+        "name": ["end_survey_questions"],
+        "label": ["End Survey Form"]
+    })
+
     # Concatenate: mandatory fields at the top, custom common fields, remaining custom fields, and finally append form fields
     merged_df = pd.concat(
-        [custom_common_df, mandatory_df_filtered, custom_non_common_df, digitisation_df_filtered], ignore_index=True
+        [custom_common_df, mandatory_df_filtered, group_row, custom_non_common_df, digitisation_df_filtered, end_group_row], ignore_index=True
     )
 
     return merged_df
diff --git a/osm_fieldwork/xlsforms/fmtm/mandatory_fields.xls b/osm_fieldwork/xlsforms/fmtm/mandatory_fields.xls
index 5a9154e4af1bad7ee2c308e75d6475fcff3140fc..a8545c21bbc045a546b295d1c34ae41de44a83a2 100644
GIT binary patch
delta 1421
zcmZXUKWr0M9LK-!&aoXQitW(Egvj+v2r(%Utt*m{rcSX^genjUphyHzqr*OuYtuWD
zJLgYBL>45Z4vqA-GF7S=;0D?oSUNDUR$iEpSSm4e=;);=62E6V_l)Y3@80M4e((4H
zZf~FM?Xzb?nVA9y{i1NI>l^0w10*r|nUus(UU96l={`UTkIqO@9H#AAp4F6%PKjHY
zUt&EyztPsc;2`rjk-rL9cTSG%+^$-y70X^;GPf+(b9Z@>=WQoH&L_q>DTvx|=2R$~
z9OolDu4i~vcXw>87x>?K@pgFbejMb!vSd4+c>!2-s=RF2d5_;+cgm(&;hUDX!YhVn
zaHG6dwOk6+v86lit(g2UB3^M!R~~Cbb~*z#f*ssO6&6-ep}UP`EWyMUtzCHZ-$fAv
zF>b@b01r+cpU~L7;M)@#E7d-pm4zXVZZNv){faec@Q*3hp`-Yf;s_$}#jm3|qj*Y5
zV^sM13B_@$dcB~y6P+jyDo!AQdavRxbfK73+)a`BVkn<0)Y_~jsm*>?X{D&gew)=a
z(x{8Id~Qf)#9A5l0gQJhWx{~g(|8O7zvthubRRaQ7GAIt;#vwvgP+F!ja@jP=rSZO
zAxrlrF<hj2ACgXc<&dJdL_HukT9nQuaK5<`ZoyzooSq)eNiPjgU@S{nX#G?mDe9*y
z9v9B^U{Lt{m7ey~Dm~d6U-VDrN)OwT?m!2OwgyJ&Eil>|BwJDIQdY<h<6>j-5i>>a
zl##tdeq~BBoOz6g#Bc@6Vt;CJVWlP0Nrz-1X{3KXB%R0#DS`!j7g7i9eIHVkXjROf
z&4iXCA6Smi$j#%2mVSf=Zl1=u8KoSz1)AVPl9um=BrV(G$=T;UsYX7G27*?M>iMqZ
zr&JMSDQlgI<&+z3ET`Q6S?xy}MSJ?i#c8wUOg3u~YawYw>mlhxZi{4LXW@xYX9kni
zP^Ob?BUqgAS)tz6%|;-fD94RJMin0h^3CNN*bLn<+@Ke|SreLRqV14$q8~%Iz)kv4
z$S-A<5@5Im<JrXV%U_DWii2z?_@|g)f1Ep`r*+aPOaSNTxmUXOyiZ)2J0h;nb;loX
b|NZvQgV#(9MLr7l=C+vjayt0$>!|)7LcjbH

delta 1216
zcmZvc%TE(g6vn?hGxTjseNeT5(x4QO1bK)>uwbhTV}h_S5hQ9UrBt-lwqOYoFp(t+
zxjPdR7sizfGqb?I!j;{Sur*Ql#yBDI+zNARa3+(^@0@$jcg{CAUE5@9o9tsaF!&+_
zx@;&e6c*D<>+qqyOGNBQ&E>PHba5T^c-bpL4y1FXY$^LUcB-FG1zy{eN8VCu$=D0L
zcg0(Q>}=ba<(X`T))kYbY(94{l`j<1snW{jNG>1gZ0_%D?r9GI|6j#DEeWI2azSBB
zhPzc^S1L_0p^X)I!00v`Br8y$pO&mbMSNJY1`RqNjf9f%b24hD+03(&9W<EPE!hbt
z;z7wSxL_WY?1me0pJWeprt{B{P<N%Ks*jx18|A8cvQe+8>W3dDZ)yvL#YAj>!V>@s
zJAKuOp?IsmCyl#pyUe)R@!ihXd!~45xX;^A%`i034e)1|f<~<Oi@K`&rJ`_4|HmyA
z&0(1r?rhX_Scf`fYTUNbsmRp0DSWHA<$lNEUisF=4K~d~(IiXp=g}aW;cuc7t7+<S
zk6cu#qjAhwq+kr!EK-SPEz)oc8H?&DH)oNJC`-f?8`ZQEiRv0f#&DpeNv(J_Da0P^
zm(Xb280IY!Vh=46Vvj5mV)J}^VB4!wj6`X#cq7xzD|)^3L-<{BN*1RxQ^R7L{z~Sl
zUl!({25$^ZQ#mn#C_aIlMG8^gB9-XzK8f=Z!xKI<6!aCWm`bstF+22ub(=LGw%SOC
z6s|VXD*2$1>!Xt>S#k`MSg=STTC_+ddTPl6cTgs>p^*k)n8N)ZlU?OOz7q?wvhg$K
zVtiBUJM^5_occ(g>Q`v5_=6dt2fN;H3Lj4#<F^wY$2+$5b@|s0<6-T%v6d(^Wjkv8
IzG_qd0Cc&|1^@s6