Merge pull request #221 from sparc-request/ml-add_indicator_for_custo…

…m_visits

Ml add indicator for custom visits

app/controllers/appointments_controller.rb

@@ -30,6 +30,7 @@ def new
   end
 
   def create
+
     @appointment = CustomAppointment.new(custom_appointment_params)
 
     if @appointment.valid?

app/models/appointment.rb

@@ -82,6 +82,10 @@ def destroy_if_incomplete
     end
   end
 
+  def formatted_name
+    self.type == 'CustomAppointment' ? "#{self.name} (Custom Visit)" : self.name
+  end
+
   def initialize_procedures
     unless self.is_a? CustomAppointment # custom appointments don't inherit from the study schedule so there is nothing to build out
       ActiveRecord::Base.transaction do

app/views/appointments/_calendar.html.haml

@@ -25,7 +25,7 @@
         .col-xs-12
           .page-header
             %h3.appointment_header
-              = "Visit: #{appointment.name}"
+              = "Visit: #{appointment.formatted_name}"
               = appointment_notes_formatter(appointment)
             .row
               .col-md-5

app/views/appointments/completed_appointments.json.jbuilder

@@ -1,6 +1,6 @@
 json.(@appointments) do |appointment|
   json.id appointment.id
-  json.name appointment.name
+  json.name appointment.formatted_name
   json.completed_date format_date(appointment.completed_date)
   json.arm appointment.arm.name
 end

app/views/participants/_dropdown.html.haml

@@ -25,7 +25,7 @@
       %option{value: -1} Please Select
       - arms_for_appointments(participant.appointments).each do |arm|
         %option{:disabled => true, :style => 'font-weight:bold;'}= arm.name.humanize + ':'
-        = options_from_collection_for_select(appointments_for_select(arm, participant), 'id', 'name')
+        = options_from_collection_for_select(appointments_for_select(arm, participant), 'id', 'formatted_name')
         %option{'data-divider' => true, :disabled => true}
     %span.custom-visit-container{title: participant.arm_id.nil? ? t(:visit)[:no_arm] : t(:visit)[:custom], data: {toggle: "tooltip", animation: 'false'}}
       %button.btn.btn-primary.appointment.new{type: "button", disabled: participant.arm_id.nil? ? true : false, data: {participant_id: participant.id, arm_id: participant.arm_id}}