diff options
| author | Sam Ockman | 2012-06-12 05:08:30 -0400 |
|---|---|---|
| committer | Sam Ockman | 2012-06-12 05:08:30 -0400 |
| commit | 0f9faba03699387f866f59000e33767ef93035f5 (patch) | |
| tree | 6dda7c89e7300825fb3958e4c5af120316af302a | |
| parent | b4c536fa8e94643f8cbd37f9fb1db18b2ab52263 (diff) | |
| download | genenetwork2-0f9faba03699387f866f59000e33767ef93035f5.tar.gz | |
More stats now working
| -rwxr-xr-x | wqflask/wqflask/show_trait/DataEditingPage.py | 20 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/trait_data_and_analysis.html | 14 |
2 files changed, 14 insertions, 20 deletions
diff --git a/wqflask/wqflask/show_trait/DataEditingPage.py b/wqflask/wqflask/show_trait/DataEditingPage.py index d5238828..0194a7d9 100755 --- a/wqflask/wqflask/show_trait/DataEditingPage.py +++ b/wqflask/wqflask/show_trait/DataEditingPage.py @@ -852,8 +852,8 @@ class DataEditingPage(templatePage): all_strains = [] primary_strains = [] #XZ: strain of primary group, e.g., BXD, LXS - #MDP_menu = HT.Select(name='stats_mdp', Class='stats_mdp') - MDP_menu = [] # We're going to use the same named data structure as in the old version + #self.MDP_menu = HT.Select(name='stats_mdp', Class='stats_mdp') + self.MDP_menu = [] # We're going to use the same named data structure as in the old version # but repurpose it for Jinja2 as an array for strain in thisTrait.data.keys(): @@ -875,17 +875,17 @@ class DataEditingPage(templatePage): all_strains = primary_strains + other_strains other_strains = map(lambda X:"_2nd_"+X, fd.f1list + fd.parlist) + other_strains #XZ: note that fd.f1list and fd.parlist are added. print("ac1") # This is the one used for first sall3 - MDP_menu.append(('All Cases','0')) - MDP_menu.append(('%s Only' % fd.RISet, '1')) - MDP_menu.append(('Non-%s Only' % fd.RISet, '2')) - #stats_row.append("Include: ", MDP_menu, HT.BR(), HT.BR()) + self.MDP_menu.append(('All Cases','0')) + self.MDP_menu.append(('%s Only' % fd.RISet, '1')) + self.MDP_menu.append(('Non-%s Only' % fd.RISet, '2')) + #stats_row.append("Include: ", self.MDP_menu, HT.BR(), HT.BR()) else: if (len(other_strains) > 0) and (len(primary_strains) + len(other_strains) > 3): print("ac2") - MDP_menu.append(('All Cases','0')) - MDP_menu.append(('%s Only' % fd.RISet,'1')) - MDP_menu.append(('Non-%s Only' % fd.RISet,'2')) - #stats_row.append("Include: ", MDP_menu, " "*3) + self.MDP_menu.append(('All Cases','0')) + self.MDP_menu.append(('%s Only' % fd.RISet,'1')) + self.MDP_menu.append(('Non-%s Only' % fd.RISet,'2')) + #stats_row.append("Include: ", self.MDP_menu, " "*3) all_strains = primary_strains all_strains.sort(key=webqtlUtil.natsort_key) all_strains = map(lambda X:"_2nd_"+X, fd.f1list + fd.parlist) + all_strains diff --git a/wqflask/wqflask/templates/trait_data_and_analysis.html b/wqflask/wqflask/templates/trait_data_and_analysis.html index f77d22d4..ca191313 100644 --- a/wqflask/wqflask/templates/trait_data_and_analysis.html +++ b/wqflask/wqflask/templates/trait_data_and_analysis.html @@ -241,17 +241,11 @@ <p class="sectionheader" id="title2" style="border-radius: 5px;"> Basic Statistics</p> <p id="sectionbody2"></p>Include: <select name="stats_mdp" size="1" class="stats_mdp"> - <option value="0"> - All Cases - </option> - - <option value="1"> - BXD Only - </option> - - <option value="2"> - Non-BXD Only + {% for mdp in MDP_menu %} + <option value="{{ mdp[1] }}"> + {{ mdp[0] }} </option> + {% endfor %} </select><br> <br> <input type="button" name="Default_Name" class="button update" value=" Update Figures "><br> |