From 3a222b876cf291921194d9f0e2dd3fc8e6a999a2 Mon Sep 17 00:00:00 2001 From: Sam Ockman Date: Mon, 25 Jun 2012 04:43:00 -0400 Subject: checkpoint --- wqflask/wqflask/show_trait/DataEditingPage.py | 54 +-- .../wqflask/templates/trait_data_and_analysis.html | 518 +-------------------- 2 files changed, 36 insertions(+), 536 deletions(-) (limited to 'wqflask') 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 @@   and samples with no value (x) can be hidden by clicking Hide No Value .

-
- + {% for strain_type in (primary_strains, other_strains) %} +
{# Slightly tortuous, but best way to get the id we need #} +
@@ -3059,7 +3062,7 @@ - {% for strain in primary_strains %} + {% for strain in strain_type %}
IndexSE
{{ loop.index }} @@ -3089,518 +3092,15 @@
-
 
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IndexSampleValue SE
1 B6D2F1±
2 D2B6F1±
3 C57BL/6J±
4 DBA/2J±
5 129S1/SvImJ±
6 A/J±
7 AKR/J±
8 BALB/cByJ±
9 BALB/cJ±
10 C3H/HeJ±
11 C57BL/6ByJ±
12 CAST/EiJ±
13 CXB1±
14 CXB10±
15 CXB11±
16 CXB12±
17 CXB13±
18 CXB2±
19 CXB3±
20 CXB4±
21 CXB5±
22 CXB6±
23 CXB7±
24 CXB8±
25 CXB9±
26 KK/HlJ±
27 LG/J±
28 NOD/ShiLtJ±
29 NZO/HlLtJ±
30 PWD/PhJ±
31 PWK/PhJ±
32 WSB/EiJ±
-
+ {% endfor %} - + + -- cgit v1.2.3