Added First and Last Name to Edit Profile view

Forcing uniqueness of usernames Actually displaying validation errors in profile edit form DRYed server error handling JavaScript Addresses #33
OpenTwinCities · Feb 8, 2015 · f1b8848 · f1b8848
1 parent 30b2462
commit f1b8848
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 49 deletions.
diff --git a/app/assets/javascripts/main.js.erb b/app/assets/javascripts/main.js.erb
@@ -587,6 +587,7 @@ $(function() {
  $('#edit_form').live('submit', function() {
  var submitButton = $("#edit_form input[type='submit']");
  $(submitButton).attr("disabled", true);
+ $('#edit_form .errormsg').remove();
  var errors = []
  if(!/[\w\.%\+\]+@[\w\]+\.+[\w]{2,}/.test($('#user_email').val())) {
  errors.push($('#user_email'));
@@ -634,6 +635,8 @@ $(function() {
  'user': {
  'email': $('#user_email').val(),
  'username': $('#user_username').val(),
+ 'first_name': $('#user_first_name').val(),
+ 'last_name': $('#user_last_name').val(),
  'organization': $('#user_organization').val(),
  'voice_number': $('#user_voice_number').val(),
  'sms_number': $('#user_sms_number').val(),
@@ -659,55 +662,22 @@ $(function() {
  error: function(jqXHR) {
  var data = $.parseJSON(jqXHR.responseText);
  $(submitButton).attr("disabled", false);
- if(data.errors.email) {
- errors.push($('#user_email'));
- $('#user_email').parent().addClass('error');
- }
- if(data.errors.name) {
+
+ for (var attribute in data.errors){
  errors.push($('#user_username'));
- $('#user_username').parent().addClass('error');
- }
- if(data.errors.organization) {
- errors.push($('#user_organization'));
- $('#user_organization').parent().addClass('error');
- }
- if(data.errors.voice_number) {
- errors.push($('#user_voice_number'));
- $('#user_voice_number').parent().addClass('error');
- }
- if(data.errors.sms_number) {
- errors.push($('#user_sms_number'));
- $('#user_sms_number').parent().addClass('error');
- }
- if(data.errors.address_1) {
- errors.push($('#user_address_1'));
- $('#user_address_1').parent().addClass('error');
- }
- if(data.errors.address_2) {
- errors.push($('#user_address_2'));
- $('#user_address_2').parent().addClass('error');
- }
- if(data.errors.city) {
- errors.push($('#user_city'));
- $('#user_city').parent().addClass('error');
- }
- if(data.errors.state) {
- errors.push($('#user_state'));
- $('#user_state').parent().addClass('error');
- }
- if(data.errors.zip) {
- errors.push($('#user_zip'));
- $('#user_zip').parent().addClass('error');
- }
- if(data.errors.password) {
- errors.push($('#user_password'));
- $('#user_password').parent().addClass('error');
- }
- if(data.errors.current_password) {
- errors.push($('#user_current_password'));
- $('#user_current_password').parent().addClass('error');
- }
- errors[0].focus();
+ $('#user_'+attribute).parent().addClass('error');
+ var error_msg = $('<span>');
+ error_msg.attr('id', 'user_'+attribute+'_errormsg');
+ error_msg.addClass('errormsg');
+ error_msg.text('-- '+ data.errors[attribute].join() +' --');
+ $('#user_'+attribute).after(error_msg);
+
+ };
+
+ $('html, body').animate({
+ scrollTop: ($('#edit_form .error').first().offset().top)
+ }, 500);
+ //errors[0].focus();
  },
  success: function(data) {
  $('#content').html(data);

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -17,3 +17,11 @@
  .radio, .checkbox{
  clear: both;
  }
+
+ .errormsg{
+ display: block;
+ text-align: left;
+ margin-bottom: 0.3rem;
+ color: #B94A48;
+ font-weight: bold;
+ }
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -52,7 +52,7 @@ class User < ActiveRecord::Base
 
  before_validation :remove_non_digits_from_phone_numbers
 
- validates :username, presence: true
+ validates :username, presence: true, uniqueness: true
  validates_formatting_of :email, using: :email
  validates_formatting_of :sms_number, using: :us_phone, allow_blank: true
  validates_formatting_of :voice_number, using: :us_phone, allow_blank: true

diff --git a/app/views/sidebar/edit_profile.html.haml b/app/views/sidebar/edit_profile.html.haml
@@ -4,6 +4,7 @@
  %h2
  = t("labels.shipping_info_heading")
  = render :partial => "user_username", locals: {f: f}
+ = render :partial => "user_realnames", locals: {f: f}
  = render :partial => "user_address", locals: {f: f}
  %h2
  = t("labels.survey_heading")

diff --git a/app/views/users/_user_realnames.html.haml b/app/views/users/_user_realnames.html.haml
@@ -0,0 +1,12 @@
+%fieldset.control-group
+ %label{:for => "user_first_name", :id => "user_first_name_label"}
+ = t("labels.first_name")
+ %small
+ = image_tag "lock.png", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
+ = f.text_field "first_name"
+%fieldset.control-group
+ %label{:for => "user_last_name", :id => "user_last_name_label"}
+ = t("labels.last_name")
+ %small
+ = image_tag "lock.png", :class => "lock", :alt => t("captions.private"), :title => t("captions.private")
+ = f.text_field "last_name"