message_train 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643b64859228388c4280a61d9530c45eb0f0a08d
-  data.tar.gz: bb43432c7eb367a70633db2ad05ae93f15b27d5c
+  metadata.gz: 2f8b74012f45f8321860ca7bc6f48ec9a5741ebf
+  data.tar.gz: 79423ee5ff4c48be2ac56f6a66a2138a981b7442
 SHA512:
-  metadata.gz: 6429bef65560c118eb49f457988ad56451e64a407f83ab55b8ba3d1fd233d1816ee5344a737bdbe90d466b55b92b34188e2e81807841eb117e12f4cfafbf94df
-  data.tar.gz: 40b6b596b498d4a4db7fca577f9943d68fc0368d77d40584c2af873e724cdf662298ac09f59ea7800120dab816af704f26b93b942cd0cfa148acad1892846fef
+  metadata.gz: 307096ad03c2d35a41bab46d1aca7d6c6f0f28dfe58a7327ada339ae4390157935aecac47232a450512a3d9f0e6db7261ce200469a70dd1d7686bfc28b94164f
+  data.tar.gz: eeb0da18f5c3fd979b0effd9a82f66afc82462c9dc9e7a5f25f1d1fa14dbaca7428939f8bd772151fdae4152cd9eb21b008356da8514501ff5079282cc6d1700

data/.simplecov

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+   add_filter 'lib/message_train/localization.rb'
+   add_filter 'spec'
+end

data/.travis.yml

@@ -2,6 +2,11 @@ language: ruby
 rvm:
   - ruby-2.2.1
   - 2.2.2
+before_install:
+  - export TZ=America/Denver
 before_script:
- - export DISPLAY=:99.0
- - sh -e /etc/init.d/xvfb start
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+script: bundle exec rspec
+notifications:
+  email: false

data/Gemfile

@@ -17,6 +17,8 @@ gem 'bootstrap-sass', '~> 3.3'
 gem 'bootstrap_leather', '~> 0.8'
 gem 'bootstrap_pager', '~> 0.10'
 gem 'bootstrap_form', '~> 2.3'
+gem 'bootstrap-wysihtml5-rails', '> 0.3'
+gem 'cocoon', '~> 1.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -37,6 +39,7 @@ group :development, :test do
   gem 'seedbank', '~> 0.3'
   gem 'friendly_id', '~> 5'
   gem 'byebug', '~> 5'
+  gem 'high_voltage', '~> 2.4'
 end
 
 group :test do

data/README.rdoc

@@ -4,7 +4,13 @@
 {<img src="https://badge.fury.io/rb/message_train.svg" alt="Gem Version" />}[http://badge.fury.io/rb/message_train]
 
 
-Rails 4 Private Messaging Gem
+MessageTrain is a Rails 4 Private Messaging Gem that uses bootstrap to send and display private messages from one user to another. It can also be configured to send messages to a user collective (such as a certain Role or Group of users).
+
+Messages can be saved as drafts instead of sending. Message composition features type-ahead completion for recipients, wysiwyg html bodies, and an arbitrary number of attachments. Messages are grouped together into conversations, and allow valid senders to reply to a given message. Any given conversation can be ignored if it is no longer of interest to the user, at which point no further messages will be received in that conversation. The "read" or "unread" status of messages is tracked automatically, and can also be changed manually by the user.
+
+Conversations are grouped into various boxes, depending on their status for that user: in, sent, all, drafts, trash, ignored. Any message can be trashed by the user, at which point the user has the option to permanently delete it.
+
+Email messages are sent when a user receives a message, either directly or through a collective (unless they have unsubscribed from those notifications).
 
 == Installation
 
@@ -27,6 +33,10 @@ OR to set the name and slug columns:
 
     message_train slug_column: :short_name, name_column: :display_name
 
+To include Message Train variables and helpers in your controllers, add this concern to your controller or application controller:
+
+    include MessageTrainSupport
+
 Add to your application.css.scss:
 
     @import "message_train";
@@ -55,6 +65,8 @@ The `message_train` mixin takes the following options:
 [:only] A symbol or array of symbols to be the only relationships used, which can include: [:sender, :recipient]
 [:except] A symbol or array of symbols not to create relationships for, which can include: [:sender, :recipient]
 [:valid_senders] A method name to call for a list of valid senders for this model
+[:collectives_for_recipient] A method that, when passed @box_user, will return a collection of valid instances of this model for that @box_user to receive. Probably a scope. (e.g. it might return groups that the user is a member of)
+[:valid_recipients] A method that returns a collection of valid recipients for this model. default: nil
 [:name_column]   The column by which to name and find this model. default: :name
 [:slug_column]   The column with the short, typeable form of the name. default: :slug
 
@@ -102,6 +114,30 @@ Or in your initializer:
 [message_toggle(message, icon, mark_to_set, title, options = {})] Link to toggle some status of a message
 [message_recipients(message)] Recipients for a given message
 
+== Configuration
+
+[config.slug_columns] Usually populated by options on the `message_train` mixin for models, this contains a `Hash` of tables and their slug columns
+[config.name_columns] Usually populated by options on the `message_train` mixin for models, this contains a `Hash` of tables and their name columns
+[config.current_user_method] Defaults to `Devise`'s `current_user`
+[config.user_sign_in_path] Defaults to `Devise`'s `/users/sign_in`
+[config.user_route_authentication_method] Defaults to `Devise`'s `:user`
+[config.address_book_method] Default value if `address_book_methods` doesn't have a match for this table
+[config.address_book_methods] `Hash` of tables and the methods those tables use to provide a tab-completion address book for that table.
+[config.recipient_tables] Usually populated by options on the `message_train` mixin for models, this contains a `Hash` of tables and their class names
+[config.collectives_for_recipient_methods] Usually populated by options on the `message_train` mixin for models, this contains a list of collectives that act as recipients through which users receive messages.
+[config.valid_senders_methods] Usually populated by options on the `message_train` mixin for models, this contains a `Hash` of tables and the methods that indicate which users can send messages to a given instance from that table.
+[config.valid_recipients_methods] Usually populated by options on the `message_train` mixin for models, this contains a `Hash` of tables and the methods that indicate which users can receive messages from a given instance from that table.
+[config.from_email] The email address from which notification emails are sent.
+[config.site_name] The name of the site, for use in notification emails.
+
+== Upgrading
+
+New columns were added with version 0.2.0, so when upgrading be sure to install the latest migrations:
+
+    rake message_train:install:migrations
+
+Running this command is harmless if the migrations are already installed, they will simply be skipped.
+
 == Contributing to MessageTrain
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "message_train"
   gem.homepage = "http://www.gemvein.com/museum/cases/message_train"
   gem.license = "MIT"
-  gem.summary = %Q{Messaging for any object}
-  gem.description = %Q{Private/public messaging for any object, such as Users or Groups}
+  gem.summary = %Q{Rails 4 Engine providing messaging for any object}
+  gem.description = %Q{Rails 4 Engine providing private/public messaging for any object, such as Users or Groups}
   gem.email = "karen.e.lundgren@gmail.com"
   gem.authors = ["Karen Lundgren"]
   # dependencies defined in Gemfile
@@ -62,10 +62,9 @@ namespace :message_train do
   end
   desc "Recreate database from seeds and clean out all system files"
   task clean: :environment do
+    import 'spec/dummy/Rakefile'
     Rake::Task["message_train:files"].invoke
-    Rake::Task["app:db:drop"].invoke
-    Rake::Task["app:db:create"].invoke
-    Rake::Task["app:db:migrate"].invoke
-    Rake::Task["app:db:seed"].invoke
+    dummy_app_path = MessageTrain::Engine.root.join('spec', 'dummy')
+    system "bundle exec rake -f #{dummy_app_path.join('Rakefile')} db:drop db:create db:migrate db:seed db:test:prepare"
   end
 end

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/app/assets/javascripts/message_train.js

@@ -1,4 +1,6 @@
 //= require bootstrap-tags
+//= require cocoon
+//= require bootstrap-wysihtml5
 
 function create_alert(level, message) {
     $('#alert_area').append('<div class="alert alert-' + level + ' alert-dismissible fade in" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>' + message + ' </div>');
@@ -61,6 +63,11 @@ function process_results(data) {
 function add_tag_magic(selector) {
     var div = $(selector);
     var model = div.data('model');
+    if ( div.data('read-only') ) {
+        var readOnly = true;
+    } else {
+        var readOnly = false;
+    }
     var request_string = '/box/in/participants/' + model + '.json';
     $.getJSON(request_string, function(data){
         var form = div.parents('form');
@@ -69,6 +76,7 @@ function add_tag_magic(selector) {
             suggestions.push(participant.slug);
         });
         var tags = div.tags({
+            readOnly: readOnly,
             suggestions: suggestions,
             tagSize: 'lg',
             promptText: 'Comma separated list'
@@ -138,4 +146,29 @@ $(document).ready(function(){
     $('.recipient-input').each(function() {
         add_tag_magic('#' + $(this).attr('id'));
     });
+
+    $('#attachment_preview').on('show.bs.modal', function (event) {
+        var button = $(event.relatedTarget); // Button that triggered the modal
+        var src = button.data('src'); // Extract info from data-* attributes
+        var original = button.data('original');
+        var text = button.data('text');
+        var modal = $(this);
+        modal.find('#image_placeholder').html('<a href="' + original + '" title="' + text + '"><img src="' + src + '" /></a>')
+    })
+
+    $('.wysiwyg').wysihtml5({
+        toolbar: {
+            'font-styles': true,
+            'color': false,
+            'emphasis': {
+                'small': true
+            },
+            'blockquote': true,
+            'lists': true,
+            'html': false,
+            'link': true,
+            'image': false,
+            'smallmodals': true
+        }
+    });
 });

data/app/assets/stylesheets/message_train.scss

@@ -1,4 +1,17 @@
 @import 'bootstrap-tags';
+@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
+
+img {
+  max-width: 100%;
+}
+
+.attachment-thumbnails {
+  text-align: center;
+
+  .thumbnail {
+    text-align: center;
+  }
+}
 
 #message_train_conversations {
   a, a:link, a:visited {
@@ -65,10 +78,18 @@
   white-space: nowrap;
 }
 
+.date-column {
+  white-space: nowrap;
+}
+
 tr:hover .conversation-actions a {
   visibility: visible;
 }
 
+.glyphicon-thumbnail {
+  font-size: 170px;
+}
+
 .glyphicon.spinning {
   animation: spin 1s infinite linear;
   -webkit-animation: spin2 1s infinite linear;
@@ -99,9 +120,14 @@ tr:hover .conversation-actions a {
 .btn-compose {
   margin: 0 auto 10px auto;
   width: 100%;
+  white-space: inherit;
 }
 
 .tags-input {
   border-radius: 4px;
   padding-left: 12px;
+}
+
+.dropdown-menu {
+  width: 240px;
 }

data/app/controllers/concerns/message_train_support.rb

@@ -0,0 +1,127 @@
+module MessageTrainSupport
+  extend ActiveSupport::Concern
+
+  included do
+
+    # Last in first out
+    prepend_before_filter :load_collective_boxes,
+                          :load_box,
+                          :load_collective,
+                          :load_division,
+                          :load_box_user,
+                          unless: :devise_controller?
+    before_filter :load_objects
+    before_action :set_locale
+
+    helper MessageTrain::ApplicationHelper
+    helper MessageTrain::BoxesHelper
+    helper MessageTrain::CollectivesHelper
+    helper MessageTrain::ConversationsHelper
+    helper MessageTrain::MessagesHelper
+    helper MessageTrain::AttachmentsHelper
+
+    rescue_from ActiveRecord::RecordNotFound do
+      render '404', status: :not_found
+    end
+
+  end
+
+protected
+
+  def require_authentication
+    redirect_to url_for(MessageTrain.configuration.user_sign_in_path), flash: { notice: :you_must_sign_in_or_sign_up_to_continue.l }
+  end
+
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+
+  def load_box_user
+    @box_user = send(MessageTrain.configuration.current_user_method) || require_authentication
+  end
+
+  def load_division
+    @division = (params[:division] || params[:box_division] || 'in').to_sym
+  end
+
+  def load_collective
+    if params[:collective_id].present?
+      collective_table, collective_id = params[:collective_id].split(':')
+      collective_class_name = MessageTrain.configuration.recipient_tables[collective_table.to_sym]
+      collective_model = collective_class_name.constantize
+      slug_column = MessageTrain.configuration.slug_columns[collective_table.to_sym]
+      @collective = collective_model.find_by!(slug_column => collective_id)
+
+      unless @collective.allows_receiving_by?(@box_user) || @collective.allows_sending_by?(@box_user)
+        flash[:error] = :access_to_that_box_denied.l
+        redirect_to main_app.root_url
+        return
+      end
+
+      case @division
+        when :in, :ignored
+          unless @collective.allows_receiving_by? @box_user
+            flash[:error] = :access_to_that_box_denied.l
+            redirect_to message_train.collective_box_url(@collective.path_part, :sent)
+          end
+        when :sent, :drafts
+          unless @collective.allows_sending_by? @box_user
+            flash[:error] = :access_to_that_box_denied.l
+            redirect_to message_train.collective_box_url(@collective.path_part, :in)
+          end
+        else
+          # do nothing
+      end
+    end
+  end
+
+  def load_box
+    if !@collective.nil?
+      @box = @collective.box(@division, @box_user)
+    else
+      @box = @box_user.box(@division)
+    end
+  end
+
+  def load_collective_boxes
+    @collective_boxes = @box_user.collective_boxes(@division, @box_user)
+  end
+
+  def load_objects
+    @objects = {}
+    @objects['conversations'] = {}
+    @objects['messages'] = {}
+    if params[:objects].present?
+      params[:objects].each do |type, list|
+        list.each do |key, list_item|
+          @objects[type][key.to_s] = list_item.to_i
+        end
+      end
+    end
+  end
+
+  def respond_to_marking
+    if !@box.errors.all.empty?
+      respond_to do |format|
+        format.html {
+          flash[:error] = @box.message
+          show
+        }
+        format.json { render :results, status: :unprocessable_entity }
+      end
+    else
+      respond_to do |format|
+        format.html {
+          if @box.results.all.empty?
+            flash[:alert] = @box.message
+          else
+            flash[:notice] = @box.message
+          end
+          show
+        }
+        format.json { render :results, status: :accepted }
+      end
+    end
+  end
+
+end

data/app/controllers/message_train/application_controller.rb

@@ -1,64 +1,5 @@
 module MessageTrain
   class ApplicationController < ::ApplicationController
-    helper BoxesHelper
-    helper ConversationsHelper
-    helper MessagesHelper
-    before_filter :load_box
-    before_filter :load_objects
-    before_action :set_locale
-
-    rescue_from ActiveRecord::RecordNotFound do
-      render '404', status: :not_found
-    end
-
-    rescue_from ActionController::RoutingError do
-      redirect_to url_for(MessageTrain.configuration.user_sign_in_path), flash: { notice: :you_must_sign_in_or_sign_up_to_continue.l }
-    end
-
-    private
-      def set_locale
-        I18n.locale = params[:locale] || I18n.default_locale
-      end
-
-      def load_box
-        @box = send(MessageTrain.configuration.current_user_method).box(params[:box_division].to_sym)
-      end
-
-      def load_objects
-        @objects = {}
-        @objects['conversations'] = {}
-        @objects['messages'] = {}
-        if params[:objects].present?
-          params[:objects].each do |type, list|
-            list.each do |key, list_item|
-              @objects[type][key.to_s] = list_item.to_i
-            end
-          end
-        end
-      end
-
-      def respond_to_marking
-        if !@box.errors.all.empty?
-          respond_to do |format|
-            format.html {
-              flash[:error] = @box.message
-              show
-            }
-            format.json { render :results, status: :unprocessable_entity }
-          end
-        else
-          respond_to do |format|
-            format.html {
-              if @box.results.all.empty?
-                flash[:alert] = @box.message
-              else
-                flash[:notice] = @box.message
-              end
-              show
-            }
-            format.json { render :results, status: :accepted }
-          end
-        end
-      end
+    include MessageTrainSupport
   end
 end

data/app/controllers/message_train/boxes_controller.rb

@@ -29,9 +29,5 @@ module MessageTrain
       def load_conversations
         @conversations = @box.conversations
       end
-
-      def load_box
-        @box = send(MessageTrain.configuration.current_user_method).box(params[:division].to_sym)
-      end
   end
 end

data/app/controllers/message_train/messages_controller.rb

@@ -26,9 +26,9 @@ module MessageTrain
       @message = @box.send_message(message_params)
       if @box.errors.all.empty?
         if @message.draft
-          redirect_to message_train.box_path(:drafts), alert: :message_saved_as_draft.l
+          redirect_to message_train.box_path(:drafts), alert: @box.message
         else
-          redirect_to message_train.box_path(:sent), notice: :message_sent.l
+          redirect_to message_train.box_path(:sent), notice: @box.message
         end
       else
         flash[:error] = @box.message
@@ -44,9 +44,9 @@ module MessageTrain
       @box.update_message(@message, message_params)
       if @box.errors.all.empty?
         if @message.draft
-          redirect_to message_train.box_conversation_url(@box, @message.conversation), alert: :message_saved_as_draft.l
+          redirect_to message_train.box_conversation_url(@box, @message.conversation), alert: @box.message
         else
-          redirect_to message_train.box_path(:sent), notice: :message_sent.l
+          redirect_to message_train.box_path(:sent), notice: @box.message
         end
       else
         flash[:error] = @box.message
@@ -61,14 +61,20 @@ module MessageTrain
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def message_params
-      params.require(:message).permit(
+      permitted = params.require(:message).permit(
           :conversation_id,
           :subject,
           :body,
           :draft,
-          attachments: [:attachment],
+          attachments_attributes: [:id, :attachment, :_destroy],
           recipients_to_save: MessageTrain.configuration.recipient_tables.keys
       )
+      if permitted['draft'] == :save_as_draft.l
+        permitted['draft'] = true
+      elsif permitted['draft'] == :send.l
+        permitted['draft'] = false
+      end
+      permitted
     end
   end
 end

data/app/controllers/message_train/participants_controller.rb

@@ -20,7 +20,7 @@ module MessageTrain
     private
 
       def load_participants
-        if params[:model].nil?
+        if params[:model].empty?
           raise ActiveRecord::RecordNotFound
         end
         model_sym = params[:model].to_sym

data/app/controllers/message_train/unsubscribes_controller.rb

@@ -0,0 +1,59 @@
+module MessageTrain
+  class UnsubscribesController < MessageTrain::ApplicationController
+
+    # GET /unsubscribes
+    def index
+      @subscriptions = @box_user.subscriptions
+    end
+
+    # POST /unsubscribes
+    def create
+      unsub = unsubscribe_params
+      model = unsub[:from_type].constantize
+      @from = model.find(unsub[:from_id])
+      if @from == @box_user || @from.allows_receiving_by?(@box_user)
+        @unsubscribe = @box_user.unsubscribe_from(@from)
+        if @unsubscribe.errors.empty?
+          if @from == @box_user
+            flash[:notice] = :unsubscribe_message.l
+          else
+            name_column = MessageTrain.configuration.name_columns[@from.class.table_name.to_sym]
+            collective_name = @from.send(name_column)
+            collective_type = @from.class.name
+            flash[:notice] = :collective_unsubscribe_message.l(collective_name: collective_name, collective_type: collective_type)
+          end
+        else
+          flash[:error] = @unsubscribe.errors.full_messages.to_sentence
+        end
+        redirect_to message_train.unsubscribes_url
+      else
+        flash[:error] = :you_are_not_in_that_collective_type.l(collective_type: model.name)
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
+    # DELETE /unsubscribes/:id
+    def destroy
+      @unsubscribe = @box_user.unsubscribes.find(params[:id])
+      @from = @unsubscribe.from
+      if @from == @box_user
+        message = :unsubscribe_removed_message.l
+      else
+        name_column = MessageTrain.configuration.name_columns[@unsubscribe.from.class.table_name.to_sym]
+        collective_name = @unsubscribe.from.send(name_column)
+        collective_type = @unsubscribe.from_type
+        message = :collective_unsubscribe_removed_message.l(collective_name: collective_name, collective_type: collective_type)
+      end
+      @unsubscribe.destroy
+      flash[:notice] = message
+      redirect_to message_train.unsubscribes_url
+    end
+
+  private
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def unsubscribe_params
+      params.require(:unsubscribe).permit(:from_type, :from_id)
+    end
+  end
+end

data/app/helpers/message_train/application_helper.rb

@@ -0,0 +1,26 @@
+module MessageTrain
+  module ApplicationHelper
+
+    def message_train_widget
+      render partial: 'message_train/application/widget'
+    end
+
+    def fuzzy_date(date)
+      time = Time.parse(date.strftime('%F %T'))
+      # Don't get confused: ">" here means "after", not "more than"
+      if time > 1.minute.ago
+        :just_now.l
+      elsif time > 1.day.ago
+        l(time, format: :fuzzy_today)
+      elsif time > 1.week.ago
+        l(time, format: :fuzzy_this_week)
+      elsif time > 1.year.ago
+        l(time, format: :fuzzy_date_without_year)
+      else
+        l(time, format: :fuzzy_date)
+      end
+
+    end
+
+  end
+end

data/app/helpers/message_train/attachments_helper.rb

@@ -0,0 +1,19 @@
+module MessageTrain
+  module AttachmentsHelper
+    def attachment_icon(attachment)
+      html = ""
+      if attachment.image?
+        html << image_tag(attachment.attachment.url(:thumb))
+      else
+        html << content_tag(:span, '', class: 'glyphicon glyphicon-save-file glyphicon-thumbnail')
+        html << tag(:br)
+        html << attachment.attachment_file_name
+      end
+      html.html_safe
+    end
+
+    def attachment_link(attachment)
+      render partial: 'message_train/application/attachment_link', locals: { attachment: attachment }
+    end
+  end
+end

data/app/helpers/message_train/boxes_helper.rb

@@ -1,30 +1,35 @@
 module MessageTrain
   module BoxesHelper
+
     def box_nav_item(box)
       text = box.title
       link = message_train.box_path(box.division)
-      if box.unread_count > 0
-        text << ' '
-        text << badge(box.unread_count.to_s, 'info pull-right')
+      unread_count = box.unread_count
+      if unread_count > 0
+        text << badge(unread_count.to_s.gsub(/\s+/, ""), 'info pull-right')
       end
-      nav_item text, link
+      nav_item text.gsub(/[\n\t]/,'').html_safe, link
     end
+
     def box_list_item(box, html_options = {})
-      render partial: 'message_train/boxes/list_item', locals: { box: box, html_options: html_options }
+      render partial: 'message_train/boxes/list_item', locals: { box: box, html_options: html_options, unread_count: box.unread_count }
     end
-    def boxes_widget
-      boxes = send(MessageTrain.configuration.current_user_method).all_boxes
-      render partial: 'message_train/boxes/widget', locals: { boxes: boxes }
+
+    def boxes_widget(box_user)
+      render partial: 'message_train/boxes/widget', locals: { boxes: box_user.all_boxes }
     end
-    def boxes_dropdown_list
-      boxes = send(MessageTrain.configuration.current_user_method).all_boxes
-      render partial: 'message_train/boxes/dropdown_list', locals: { boxes: boxes }
+
+    def boxes_dropdown_list(box_user, options = {})
+      render partial: 'message_train/boxes/dropdown_list', locals: { boxes: box_user.all_boxes }
     end
+
     def box_participant_name(participant)
       participant.send(MessageTrain.configuration.name_columns[participant.class.table_name.to_sym])
     end
+
     def box_participant_slug(participant)
       participant.send(MessageTrain.configuration.slug_columns[participant.class.table_name.to_sym])
     end
+
   end
 end