checkpoint

2 files changed, 36 insertions, 536 deletions

diff --git a/wqflask/wqflask/show_trait/DataEditingPage.py b/wqflask/wqflask/show_trait/DataEditingPage.py
index fa343535..b1cf5a32 100755
--- a/wqflask/wqflask/show_trait/DataEditingPage.py
+++ b/wqflask/wqflask/show_trait/DataEditingPage.py
@@ -1817,33 +1817,33 @@ class DataEditingPage(templatePage):
             #    varClassName = valueClassName + str(traitVar)
             #valueClassName += str(traitVal)
 
-            if strainNameOrig == strainName:
-                if other_strainsExist and strainNameOrig in (fd.parlist + fd.f1list):
-                    ########################################################################################################################################################
-                      # ZS: Append value and variance to the value and variance input fields' list of classes; this is so the javascript can update the value when the user
-                      # changes it. The updated value is then used when the table is sorted (tablesorter.js). This needs to be done because the "value" attribute is immutable.
-                    #########################################################################################################################################################
-
-                    #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right; background-color:#FFFFFF;", value=dispVal,
-                    #        onChange= "javascript:this.form['_2nd_%s'].value=this.form['%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=valueClassName)
-                    if varianceDataPage:
-                        pass
-                        #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar,
-                        #        onChange= "javascript:this.form['V_2nd_%s'].value=this.form['V%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=varClassName)
-                else:
-                    pass
-                    #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right; background-color:#FFFFFF;", value=dispVal, Class=valueClassName)
-                    if varianceDataPage:
-                        pass
-                        #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar, Class=varClassName)
-            else:
-                pass
-                #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVal,
-                                      #onChange= "javascript:this.form['%s'].value=this.form['%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=valueClassName)
-                if varianceDataPage:
-                    pass
-                    #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar,
-                    #        onChange= "javascript:this.form['V%s'].value=this.form['V%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=varClassName)
+            #if strainNameOrig == strainName:
+            #    if other_strainsExist and strainNameOrig in (fd.parlist + fd.f1list):
+            #        ########################################################################################################################################################
+            #          # ZS: Append value and variance to the value and variance input fields' list of classes; this is so the javascript can update the value when the user
+            #          # changes it. The updated value is then used when the table is sorted (tablesorter.js). This needs to be done because the "value" attribute is immutable.
+            #        #########################################################################################################################################################
+            #
+            #        #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right; background-color:#FFFFFF;", value=dispVal,
+            #        #        onChange= "javascript:this.form['_2nd_%s'].value=this.form['%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=valueClassName)
+            #        if varianceDataPage:
+            #            pass
+            #            #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar,
+            #            #        onChange= "javascript:this.form['V_2nd_%s'].value=this.form['V%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=varClassName)
+            #    else:
+            #        pass
+            #        #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right; background-color:#FFFFFF;", value=dispVal, Class=valueClassName)
+            #        if varianceDataPage:
+            #            pass
+            #            #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar, Class=varClassName)
+            #else:
+            #    pass
+            #    #valueField = HT.Input(name=strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVal,
+            #                          #onChange= "javascript:this.form['%s'].value=this.form['%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=valueClassName)
+            #    if varianceDataPage:
+            #        pass
+            #        #seField = HT.Input(name='V'+strainNameOrig, size=8, maxlength=8, style="text-align:right", value=dispVar,
+            #        #        onChange= "javascript:this.form['V%s'].value=this.form['V%s'].value;" % (strainNameOrig.replace("/", ""), strainNameOrig.replace("/", "")), Class=varClassName)
 
             if strains == 'primary':
                 strain['the_id'] = "Primary_" + str(i+1)
diff --git a/wqflask/wqflask/templates/trait_data_and_analysis.html b/wqflask/wqflask/templates/trait_data_and_analysis.html
index c3bdd787..efd87acc 100644
--- a/wqflask/wqflask/templates/trait_data_and_analysis.html
+++ b/wqflask/wqflask/templates/trait_data_and_analysis.html
@@ -3045,8 +3045,11 @@
                           &nbsp;&nbsp;and samples with no value (x) can be hidden by clicking <strong>Hide No Value</strong> .</span><br>
                         </div><br>
 
-                        <div id="primary">
-                          <table class="tablesorter" id="sortable1" cellpadding="0" cellspacing="0">
+						{% for strain_type in (primary_strains, other_strains) %}
+                        <div id="{{ strain_type[0]['the_id'].lower().partition('_')[0] }}">  {# Slightly tortuous, but best way to get the id we need #}
+                          <table class="tablesorter"
+								 id="{{ 'sortable%i' % (loop.index) }}"
+								 cellpadding="0" cellspacing="0">
                             <tr>
                               <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="60">Index</th>
 
@@ -3059,7 +3062,7 @@
                               <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="80">SE</th>
                             </tr>
 
-							{% for strain in primary_strains %}
+							{% for strain in strain_type %}
                             <tr class="{{ strain.outlier }}" id="{{ strain.the_id }}">
                               <td class="fs13 b1 c222" align="right" width="45">
 								{{ loop.index }}
@@ -3089,518 +3092,15 @@
 
                           </table>
                         </div>
-
                         <div>
                           &nbsp;
                         </div>
-
-                        <div id="other">
-                          <table class="tablesorter" id="sortable2" cellpadding="0" cellspacing="0">
-                            <tr>
-                              <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="60">Index</th>
-
-                              <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="100">Sample</th>
-
-                              <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="70">Value</th>
-
-                              <th class="fs13 fwb ff1 b1 cw cbrb" width="20">&nbsp;</th>
-
-                              <th class="fs13 fwb ff1 b1 cw cbrb" align="right" width="80">SE</th>
-                            </tr>
-
-                            <tr class="" id="Other_1">
-                              <td class="fs13 b1 c222" align="right" width="45">1 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "_2nd_B6D2F1" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">B6D2F1</span></td>
-
-                              <td class="fs13 b1 c222" id="value_0_other" align="right" width="70"><input type="text" name="_2nd_B6D2F1" class=
-                              "fs13 b1 c222 valueField 6.214" value="6.214" size="8" maxlength="8" onchange=
-                              "javascript:this.form['_2nd_B6D2F1'].value=this.form['_2nd_B6D2F1'].value;" style="text-align:right"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_0_other" align="right" width="80"><input type="text" name="V_2nd_B6D2F1" class=
-                              "fs13 b1 c222 valueField 0.269" value="0.269" size="8" maxlength="8" onchange=
-                              "javascript:this.form['V_2nd_B6D2F1'].value=this.form['V_2nd_B6D2F1'].value;" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_2">
-                              <td class="fs13 b1 c222" align="right" width="45">2 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "_2nd_D2B6F1" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">D2B6F1</span></td>
-
-                              <td class="fs13 b1 c222" id="value_1_other" align="right" width="70"><input type="text" name="_2nd_D2B6F1" class=
-                              "fs13 b1 c222 valueField 6.124" value="6.124" size="8" maxlength="8" onchange=
-                              "javascript:this.form['_2nd_D2B6F1'].value=this.form['_2nd_D2B6F1'].value;" style="text-align:right"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_1_other" align="right" width="80"><input type="text" name="V_2nd_D2B6F1" class=
-                              "fs13 b1 c222 valueField 0.123" value="0.123" size="8" maxlength="8" onchange=
-                              "javascript:this.form['V_2nd_D2B6F1'].value=this.form['V_2nd_D2B6F1'].value;" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_3">
-                              <td class="fs13 b1 c222" align="right" width="45">3 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "_2nd_C57BL/6J" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">C57BL/6J</span></td>
-
-                              <td class="fs13 b1 c222" id="value_2_other" align="right" width="70"><input type="text" name="_2nd_C57BL/6J" class=
-                              "fs13 b1 c222 valueField 6.16" value="6.160" size="8" maxlength="8" onchange=
-                              "javascript:this.form['_2nd_C57BL6J'].value=this.form['_2nd_C57BL6J'].value;" style="text-align:right"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_2_other" align="right" width="80"><input type="text" name="V_2nd_C57BL/6J" class=
-                              "fs13 b1 c222 valueField 0.298" value="0.298" size="8" maxlength="8" onchange=
-                              "javascript:this.form['V_2nd_C57BL6J'].value=this.form['V_2nd_C57BL6J'].value;" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_4">
-                              <td class="fs13 b1 c222" align="right" width="45">4 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "_2nd_DBA/2J" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">DBA/2J</span></td>
-
-                              <td class="fs13 b1 c222" id="value_3_other" align="right" width="70"><input type="text" name="_2nd_DBA/2J" class=
-                              "fs13 b1 c222 valueField 6.126" value="6.126" size="8" maxlength="8" onchange=
-                              "javascript:this.form['_2nd_DBA2J'].value=this.form['_2nd_DBA2J'].value;" style="text-align:right"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_3_other" align="right" width="80"><input type="text" name="V_2nd_DBA/2J" class=
-                              "fs13 b1 c222 valueField 0.011" value="0.011" size="8" maxlength="8" onchange=
-                              "javascript:this.form['V_2nd_DBA2J'].value=this.form['V_2nd_DBA2J'].value;" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_5">
-                              <td class="fs13 b1 c222" align="right" width="45">5 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "129S1/SvImJ" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">129S1/SvImJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_4_other" align="right" width="70"><input type="text" name="129S1/SvImJ" class=
-                              "fs13 b1 c222 valueField 6.353" value="6.353" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_4_other" align="right" width="80"><input type="text" name="V129S1/SvImJ" class=
-                              "fs13 b1 c222 valueField 0.402" value="0.402" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_6">
-                              <td class="fs13 b1 c222" align="right" width="45">6 <input type="checkbox" name="selectCheck" class="checkbox" value="A/J"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">A/J</span></td>
-
-                              <td class="fs13 b1 c222" id="value_5_other" align="right" width="70"><input type="text" name="A/J" class=
-                              "fs13 b1 c222 valueField 6.279" value="6.279" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_5_other" align="right" width="80"><input type="text" name="VA/J" class=
-                              "fs13 b1 c222 valueField 0.344" value="0.344" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_7">
-                              <td class="fs13 b1 c222" align="right" width="45">7 <input type="checkbox" name="selectCheck" class="checkbox" value="AKR/J"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">AKR/J</span></td>
-
-                              <td class="fs13 b1 c222" id="value_6_other" align="right" width="70"><input type="text" name="AKR/J" class=
-                              "fs13 b1 c222 valueField 6.242" value="6.242" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_6_other" align="right" width="80"><input type="text" name="VAKR/J" class=
-                              "fs13 b1 c222 valueField 0.08" value="0.080" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_8">
-                              <td class="fs13 b1 c222" align="right" width="45">8 <input type="checkbox" name="selectCheck" class="checkbox" value="BALB/cByJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">BALB/cByJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_7_other" align="right" width="70"><input type="text" name="BALB/cByJ" class=
-                              "fs13 b1 c222 valueField 5.933" value="5.933" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_7_other" align="right" width="80"><input type="text" name="VBALB/cByJ" class=
-                              "fs13 b1 c222 valueField" value="x" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_9">
-                              <td class="fs13 b1 c222" align="right" width="45">9 <input type="checkbox" name="selectCheck" class="checkbox" value="BALB/cJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">BALB/cJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_8_other" align="right" width="70"><input type="text" name="BALB/cJ" class=
-                              "fs13 b1 c222 valueField 6.243" value="6.243" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_8_other" align="right" width="80"><input type="text" name="VBALB/cJ" class=
-                              "fs13 b1 c222 valueField 0.253" value="0.253" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_10">
-                              <td class="fs13 b1 c222" align="right" width="45">10 <input type="checkbox" name="selectCheck" class="checkbox" value="C3H/HeJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">C3H/HeJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_9_other" align="right" width="70"><input type="text" name="C3H/HeJ" class=
-                              "fs13 b1 c222 valueField 6.303" value="6.303" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_9_other" align="right" width="80"><input type="text" name="VC3H/HeJ" class=
-                              "fs13 b1 c222 valueField 0.566" value="0.566" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_11">
-                              <td class="fs13 b1 c222" align="right" width="45">11 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "C57BL/6ByJ" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">C57BL/6ByJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_10_other" align="right" width="70"><input type="text" name="C57BL/6ByJ" class=
-                              "fs13 b1 c222 valueField 6.216" value="6.216" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_10_other" align="right" width="80"><input type="text" name="VC57BL/6ByJ" class=
-                              "fs13 b1 c222 valueField 0.34" value="0.340" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_12">
-                              <td class="fs13 b1 c222" align="right" width="45">12 <input type="checkbox" name="selectCheck" class="checkbox" value="CAST/EiJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CAST/EiJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_11_other" align="right" width="70"><input type="text" name="CAST/EiJ" class=
-                              "fs13 b1 c222 valueField 6.485" value="6.485" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_11_other" align="right" width="80"><input type="text" name="VCAST/EiJ" class=
-                              "fs13 b1 c222 valueField" value="x" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_13">
-                              <td class="fs13 b1 c222" align="right" width="45">13 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB1"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB1</span></td>
-
-                              <td class="fs13 b1 c222" id="value_12_other" align="right" width="70"><input type="text" name="CXB1" class=
-                              "fs13 b1 c222 valueField 6.427" value="6.427" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_12_other" align="right" width="80"><input type="text" name="VCXB1" class=
-                              "fs13 b1 c222 valueField 0.101" value="0.101" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_14">
-                              <td class="fs13 b1 c222" align="right" width="45">14 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB10"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB10</span></td>
-
-                              <td class="fs13 b1 c222" id="value_13_other" align="right" width="70"><input type="text" name="CXB10" class=
-                              "fs13 b1 c222 valueField 6.044" value="6.044" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_13_other" align="right" width="80"><input type="text" name="VCXB10" class=
-                              "fs13 b1 c222 valueField 0.19" value="0.190" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_15">
-                              <td class="fs13 b1 c222" align="right" width="45">15 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB11"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB11</span></td>
-
-                              <td class="fs13 b1 c222" id="value_14_other" align="right" width="70"><input type="text" name="CXB11" class=
-                              "fs13 b1 c222 valueField 6.004" value="6.004" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_14_other" align="right" width="80"><input type="text" name="VCXB11" class=
-                              "fs13 b1 c222 valueField 0.122" value="0.122" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_16">
-                              <td class="fs13 b1 c222" align="right" width="45">16 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB12"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB12</span></td>
-
-                              <td class="fs13 b1 c222" id="value_15_other" align="right" width="70"><input type="text" name="CXB12" class=
-                              "fs13 b1 c222 valueField 6.18" value="6.180" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_15_other" align="right" width="80"><input type="text" name="VCXB12" class=
-                              "fs13 b1 c222 valueField 0.009" value="0.009" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_17">
-                              <td class="fs13 b1 c222" align="right" width="45">17 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB13"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB13</span></td>
-
-                              <td class="fs13 b1 c222" id="value_16_other" align="right" width="70"><input type="text" name="CXB13" class=
-                              "fs13 b1 c222 valueField 5.99" value="5.990" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_16_other" align="right" width="80"><input type="text" name="VCXB13" class=
-                              "fs13 b1 c222 valueField 0.013" value="0.013" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_18">
-                              <td class="fs13 b1 c222" align="right" width="45">18 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB2"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB2</span></td>
-
-                              <td class="fs13 b1 c222" id="value_17_other" align="right" width="70"><input type="text" name="CXB2" class=
-                              "fs13 b1 c222 valueField 6.257" value="6.257" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_17_other" align="right" width="80"><input type="text" name="VCXB2" class=
-                              "fs13 b1 c222 valueField 0.328" value="0.328" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_19">
-                              <td class="fs13 b1 c222" align="right" width="45">19 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB3"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB3</span></td>
-
-                              <td class="fs13 b1 c222" id="value_18_other" align="right" width="70"><input type="text" name="CXB3" class=
-                              "fs13 b1 c222 valueField 6.39" value="6.390" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_18_other" align="right" width="80"><input type="text" name="VCXB3" class=
-                              "fs13 b1 c222 valueField 0.156" value="0.156" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_20">
-                              <td class="fs13 b1 c222" align="right" width="45">20 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB4"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB4</span></td>
-
-                              <td class="fs13 b1 c222" id="value_19_other" align="right" width="70"><input type="text" name="CXB4" class=
-                              "fs13 b1 c222 valueField 6.11" value="6.110" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_19_other" align="right" width="80"><input type="text" name="VCXB4" class=
-                              "fs13 b1 c222 valueField 0.006" value="0.006" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_21">
-                              <td class="fs13 b1 c222" align="right" width="45">21 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB5"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB5</span></td>
-
-                              <td class="fs13 b1 c222" id="value_20_other" align="right" width="70"><input type="text" name="CXB5" class=
-                              "fs13 b1 c222 valueField 6.105" value="6.105" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_20_other" align="right" width="80"><input type="text" name="VCXB5" class=
-                              "fs13 b1 c222 valueField 0.381" value="0.381" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_22">
-                              <td class="fs13 b1 c222" align="right" width="45">22 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB6"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB6</span></td>
-
-                              <td class="fs13 b1 c222" id="value_21_other" align="right" width="70"><input type="text" name="CXB6" class=
-                              "fs13 b1 c222 valueField 5.906" value="5.906" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_21_other" align="right" width="80"><input type="text" name="VCXB6" class=
-                              "fs13 b1 c222 valueField 0.094" value="0.094" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_23">
-                              <td class="fs13 b1 c222" align="right" width="45">23 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB7"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB7</span></td>
-
-                              <td class="fs13 b1 c222" id="value_22_other" align="right" width="70"><input type="text" name="CXB7" class=
-                              "fs13 b1 c222 valueField 6.258" value="6.258" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_22_other" align="right" width="80"><input type="text" name="VCXB7" class=
-                              "fs13 b1 c222 valueField 0.077" value="0.077" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_24">
-                              <td class="fs13 b1 c222" align="right" width="45">24 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB8"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB8</span></td>
-
-                              <td class="fs13 b1 c222" id="value_23_other" align="right" width="70"><input type="text" name="CXB8" class=
-                              "fs13 b1 c222 valueField 6.14" value="6.140" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_23_other" align="right" width="80"><input type="text" name="VCXB8" class=
-                              "fs13 b1 c222 valueField 0.155" value="0.155" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_25">
-                              <td class="fs13 b1 c222" align="right" width="45">25 <input type="checkbox" name="selectCheck" class="checkbox" value="CXB9"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">CXB9</span></td>
-
-                              <td class="fs13 b1 c222" id="value_24_other" align="right" width="70"><input type="text" name="CXB9" class=
-                              "fs13 b1 c222 valueField 6.184" value="6.184" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_24_other" align="right" width="80"><input type="text" name="VCXB9" class=
-                              "fs13 b1 c222 valueField 0.083" value="0.083" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_26">
-                              <td class="fs13 b1 c222" align="right" width="45">26 <input type="checkbox" name="selectCheck" class="checkbox" value="KK/HlJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">KK/HlJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_25_other" align="right" width="70"><input type="text" name="KK/HlJ" class=
-                              "fs13 b1 c222 valueField 6.106" value="6.106" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_25_other" align="right" width="80"><input type="text" name="VKK/HlJ" class=
-                              "fs13 b1 c222 valueField 0.43" value="0.430" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_27">
-                              <td class="fs13 b1 c222" align="right" width="45">27 <input type="checkbox" name="selectCheck" class="checkbox" value="LG/J"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">LG/J</span></td>
-
-                              <td class="fs13 b1 c222" id="value_26_other" align="right" width="70"><input type="text" name="LG/J" class=
-                              "fs13 b1 c222 valueField 6.102" value="6.102" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_26_other" align="right" width="80"><input type="text" name="VLG/J" class=
-                              "fs13 b1 c222 valueField 0.301" value="0.301" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_28">
-                              <td class="fs13 b1 c222" align="right" width="45">28 <input type="checkbox" name="selectCheck" class="checkbox" value=
-                              "NOD/ShiLtJ" onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">NOD/ShiLtJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_27_other" align="right" width="70"><input type="text" name="NOD/ShiLtJ" class=
-                              "fs13 b1 c222 valueField 6.444" value="6.444" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_27_other" align="right" width="80"><input type="text" name="VNOD/ShiLtJ" class=
-                              "fs13 b1 c222 valueField 0.244" value="0.244" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_29">
-                              <td class="fs13 b1 c222" align="right" width="45">29 <input type="checkbox" name="selectCheck" class="checkbox" value="NZO/HlLtJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">NZO/HlLtJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_28_other" align="right" width="70"><input type="text" name="NZO/HlLtJ" class=
-                              "fs13 b1 c222 valueField 6.053" value="6.053" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_28_other" align="right" width="80"><input type="text" name="VNZO/HlLtJ" class=
-                              "fs13 b1 c222 valueField 0.194" value="0.194" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_30">
-                              <td class="fs13 b1 c222" align="right" width="45">30 <input type="checkbox" name="selectCheck" class="checkbox" value="PWD/PhJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">PWD/PhJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_29_other" align="right" width="70"><input type="text" name="PWD/PhJ" class=
-                              "fs13 b1 c222 valueField 6.034" value="6.034" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_29_other" align="right" width="80"><input type="text" name="VPWD/PhJ" class=
-                              "fs13 b1 c222 valueField 0.483" value="0.483" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_31">
-                              <td class="fs13 b1 c222" align="right" width="45">31 <input type="checkbox" name="selectCheck" class="checkbox" value="PWK/PhJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">PWK/PhJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_30_other" align="right" width="70"><input type="text" name="PWK/PhJ" class=
-                              "fs13 b1 c222 valueField 6.269" value="6.269" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_30_other" align="right" width="80"><input type="text" name="VPWK/PhJ" class=
-                              "fs13 b1 c222 valueField 0.253" value="0.253" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-
-                            <tr class="" id="Other_32">
-                              <td class="fs13 b1 c222" align="right" width="45">32 <input type="checkbox" name="selectCheck" class="checkbox" value="WSB/EiJ"
-                              onclick="highlight(this)"></td>
-
-                              <td class="fs13 b1 c222" align="right" width="100"><span class="fs14 fwn ffl">WSB/EiJ</span></td>
-
-                              <td class="fs13 b1 c222" id="value_31_other" align="right" width="70"><input type="text" name="WSB/EiJ" class=
-                              "fs13 b1 c222 valueField 5.939" value="5.939" size="8" maxlength="8" style="text-align:right; background-color:#FFFFFF;"></td>
-
-                              <td class="fs13 b1 c222" align="center" width="20">±</td>
-
-                              <td class="fs13 b1 c222" id="SE_31_other" align="right" width="80"><input type="text" name="VWSB/EiJ" class=
-                              "fs13 b1 c222 valueField 0.047" value="0.047" size="8" maxlength="8" style="text-align:right"></td>
-                            </tr>
-                          </table>
-                        </div>
+						{% endfor %}
                       </div>
                     </td>
                   </tr>
-                </table><input type="hidden" name="Default_Name">
+                </table>
+				<input type="hidden" name="Default_Name">
               </form>
             </td>
           </tr>