From 40497c6ff5bef7192806ac18b6c6787d6b52565b Mon Sep 17 00:00:00 2001
From: Arijit De <talktoari@gmail.com>
Date: Sun, 22 Apr 2012 10:44:45 +0530
Subject: [PATCH] Donor upload fixed verified

---
 app/controllers/donors_controller.rb            | 14 +++++---------
 app/views/donors/upload_validate_donor.html.erb |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/controllers/donors_controller.rb b/app/controllers/donors_controller.rb
index f97ddda..5d5f838 100644
--- a/app/controllers/donors_controller.rb
+++ b/app/controllers/donors_controller.rb
@@ -114,20 +114,14 @@ def upload_validate_donor
       cur_donor.ser_no = row[0]
       cur_donor.title = row[1]
       cur_donor.first_name = row[2]
-      # Last Name populate
-      if row[3] == ""
-        cur_donor.last_name = "."
-      else
-        cur_donor.last_name = row[3]
-      end
 
       # Gender format changes
       if ((row[4] == "B") || (row[4] == "Boy") || (row[4] == "M") || (row[4] == "Male"))
-        cur_student.gender = "Boy"
+        cur_donor.gender = "Boy"
       elsif ((row[4] == "G") || (row[4] == "Girl") || (row[4] == "F") || (row[4] == "Female"))
-        cur_student.gender = "Girl"
+        cur_donor.gender = "Girl"
       else
-        cur_student.gender = row[4]
+        cur_donor.gender = row[4]
       end
 
       cur_donor.email = row[5]
@@ -144,6 +138,8 @@ def upload_validate_donor
       cur_donor.donor_type = row[16]
       cur_donor.comment = row[17]
 
+      cur_donor.last_name = "."
+
       if cur_donor.valid?
         @donors << cur_donor
         # Save the data to DB on success validation for each entry
diff --git a/app/views/donors/upload_validate_donor.html.erb b/app/views/donors/upload_validate_donor.html.erb
index 987e1f7..c4d7d43 100644
--- a/app/views/donors/upload_validate_donor.html.erb
+++ b/app/views/donors/upload_validate_donor.html.erb
@@ -41,8 +41,8 @@
       <%= donor.address_landmark %>
     </td>
     <td><%= donor.district %></td>
-    <td><%= donor.city %>, <%= donor.state %>, <%= donor.country %>, <%= donor.pincode %></td>
-    <td><%= donor.phone %>, <%= donor.mobile %></td>
+    <td><%= donor.city %> <%= donor.state %> <%= donor.country %> <%= donor.pincode %></td>
+    <td><%= donor.phone %> <%= donor.mobile %></td>
     <td><%= donor.donor_type %></td>
     <td><%= donor.comment %></td>
   </tr>