From 4b2506c435b67f3168568b1c00ec2fa8230987a0 Mon Sep 17 00:00:00 2001
From: Bastian Greshake <bgreshake@googlemail.com>
Date: Mon, 28 May 2012 12:23:15 +0200
Subject: [PATCH 1/3] removed debugging stuff

---
 app/views/users/_edit.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/users/_edit.html.erb b/app/views/users/_edit.html.erb
index a88703d..35a9896 100644
--- a/app/views/users/_edit.html.erb
+++ b/app/views/users/_edit.html.erb
@@ -47,7 +47,6 @@
        <h2>Additional phenotypes</h2>
 		<%= f.fields_for :user_phenotypes do |p| %>
             <% @phenotype = Phenotype.find_by_id(p.object.phenotype_id) %>
-        <% if @phenotype and @phenotype.characteristic != "Hair colour" and @phenotype.characteristic!= "Height" and @phenotype.characteristic != "Skin colour" and @phenotype.characteristic != "Population group"%>
 		<div class="field">
 		
 		   <script type="text/javascript">
@@ -60,7 +59,6 @@
 		
 		 	<%= p.label Phenotype.find_by_id(p.object.phenotype_id).characteristic %><%= p.text_field :variation, :id => "phenotype_"+p.object.phenotype_id.to_s%> <%= p.link_to_remove "Remove"%><br/>
 	 	</div>
-    <% end %> 
 <%end %>
 
  <%= link_to "Add a new phenotype", :controller => "phenotypes", :action => "new" %>

From d71272c6a318a770299876ae5b13c50106eda43b Mon Sep 17 00:00:00 2001
From: Bastian Greshake <bgreshake@googlemail.com>
Date: Mon, 28 May 2012 12:28:39 +0200
Subject: [PATCH 2/3] same changes for phenotype-count

---
 app/views/phenotypes/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/phenotypes/index.html.erb b/app/views/phenotypes/index.html.erb
index e770e85..b14ae45 100644
--- a/app/views/phenotypes/index.html.erb
+++ b/app/views/phenotypes/index.html.erb
@@ -3,8 +3,8 @@
 <table class="zebra-striped" id="no_snp_overview">
 <thead>
 <tr>
+  <th>Count</th>
 	<th><%= sortable "id", "ID"%></th>
-    <th>Count</th>
 	<th><%= sortable "characteristic","Phenotype"%></th>
 	<th><%= sortable "number_of_users","Number of users"%></th>
 	<th><%= sortable "created_at", "Created"%>
@@ -13,8 +13,8 @@
 <tbody>
 <% @phenotypes_paginate.each do |s| %>
 	<tr>
-    <td><%= s.id %></td>
     <td><%= Phenotype.all.sort! { |a,b| a.id <=> b.id}.index(s) + 1%></td>
+    <td><%= s.id %></td>
 	<td><%= link_to(s.characteristic, s) %></td>
 	<td><%=s.number_of_users%></td>
 	<td><%=s.created_at%></td>

From 1813fb664764959b67ab346a711cbecff6c6f2a9 Mon Sep 17 00:00:00 2001
From: Bastian Greshake <bgreshake@googlemail.com>
Date: Mon, 28 May 2012 12:29:58 +0200
Subject: [PATCH 3/3] same changes for phenotype-count

---
 app/views/phenotypes/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/phenotypes/index.html.erb b/app/views/phenotypes/index.html.erb
index b14ae45..83d24ef 100644
--- a/app/views/phenotypes/index.html.erb
+++ b/app/views/phenotypes/index.html.erb
@@ -3,7 +3,7 @@
 <table class="zebra-striped" id="no_snp_overview">
 <thead>
 <tr>
-  <th>Count</th>
+ 	<th>#</th>
 	<th><%= sortable "id", "ID"%></th>
 	<th><%= sortable "characteristic","Phenotype"%></th>
 	<th><%= sortable "number_of_users","Number of users"%></th>