Initial commit for parent zygosity form for c3

-Copied existing Jform from:
	 scrzyg.xml and
	 scrzygosity.xml

	 Which is basically exactly what we want
-have not added them to JForms yet through categories and datasets.xml
changed the filename within c3_cg_zyg and added it to categories
corrected form filename and dataset
actually changed the dataset field. decided the dabase will be called data_c3_zy_m for caregiver
Revert "changed the filename within c3_cg_zyg and added it to categories"

This reverts commit 66b7032ebc594c70a95904a59f602d2844a91303.
about to revert. don't know what I'm doing.
attempting to resolve git conflict
Revert "Initial commit for parent zygosity form for c3"

This reverts commit 1da31e8fb23af1726163abaea7f638209f6b113e.
changed form field in form. name = caergiver zyg filename=c3_cg_zyg
added form field from form to categories.xml
fixed end tag in categories
found file empty. re-initial commit. copy of srczygosity
renamed the filenames in form and datset
added dataset to datasets.xml
STABLE Build. updated form and dataset. correctly appears in Jforms

-changed entryset names and filenames to correct errors.

-table is still not created or linked to the form.
-still includes incorrect fields.
Added new database and made arrangements for it

-linked database to form
-removed blood type questions
-fixed numbering
-fixed template to just be m instead of ms
-added new quetiosn about preference
removed blood questions from form
Added picture preference to form.
-and moved data field in dataset to the corresponding location.

diff --git a/dataset/c3_cg_zyg.xml b/dataset/c3_cg_zyg.xml
index b6248c2..a6f6c23 100644
--- a/dataset/c3_cg_zyg.xml
+++ b/dataset/c3_cg_zyg.xml
@@ -86,11 +86,12 @@
 	<data name="Self Zygosity" field="31a" template="temp1" validator="val13_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048008881125" />
 	<data name="Identical Explain" field="31b" template="temp1" validator="MEMO" dependencies="true" editable="true" ui="com.wtp.jforms.ui.control.smart.MemoFieldBox" classid="1048008881126" />
 	<data name="Fraternal Reason" field="31c" template="temp1" validator="val13_9998_9999" dependencies="true" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048008881127" />
-	<data name="Picture preference" field="32" template="temp1" validator="val12_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.textFieldBox" classid="1048008881128" />
 	<data name="Zygosity" field="go" template="temp1" validator="val13_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048187005989" />
 	<data name="Tricky Zygosity" field="tr" template="temp1" validator="yesno01_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048187005990" />

 	<data name="Picture Requested" field="pr" template="temp1" validator="yesno01_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048187005991" />
 	<data name="Picture Included" field="pi" template="temp1" validator="yesno01_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.TextFieldBox" classid="1048187005992" />
+	<data name="Picture preference" field="32" template="temp1" validator="val12_9998_9999" dependencies="false" editable="true" ui="com.wtp.jforms.ui.control.smart.textFieldBox" classid="1048008881128" />
+
 	<dependency field="Type">
 		<parent field="Fertility Drug Use" lowerbound="2147483647" upperbound="2147483647">
 			<enable value="1" />
diff --git a/form/c3_cg_zyg.xml b/form/c3_cg_zyg.xml
index 04f392f..ed6165e 100644
--- a/form/c3_cg_zyg.xml
+++ b/form/c3_cg_zyg.xml
@@ -74,6 +74,7 @@
 		<datafield name="Tricky Zygosity" entryset="Zygosity" filename="build\dataset\c3_cg_zyg.xml" type="0" class="com.wtp.jforms.ui.control.smart.TextFieldBox" editable="true" classid="1048187005990" options="" />
 		<datafield name="Picture Requested" entryset="Zygosity" filename="build\dataset\c3_cg_zyg.xml" type="0" class="com.wtp.jforms.ui.control.smart.TextFieldBox" editable="true" classid="1048187005991" options="" />
 		<datafield name="Picture Included" entryset="Zygosity" filename="build\dataset\c3_cg_zyg.xml" type="0" class="com.wtp.jforms.ui.control.smart.TextFieldBox" editable="true" classid="1048187005992" options="" />
+		<datafield name="Picture Preference" entryset="Zygosity" filename="build\dataset\c3_cg_zyg" type="0" class="com.wtp.jforms.ui.control.smart.TextFieldBox" editable="true" classid="1048008881128" options="options" />
  	</componentset>
 </form>
fixed filename in form
tested. working. about to be merged.
-fixed picture preference.