sparc-request · amcates · Jun 8, 2016 · Jun 8, 2016
diff --git a/app/assets/javascripts/appointments.js.coffee b/app/assets/javascripts/appointments.js.coffee
@@ -71,7 +71,7 @@ $ ->
           url: "/appointments/#{appointment_id}.js"
 
   $(document).on 'click', '.complete_visit', ->
-    start_date = new Date($('#start_date').data("date"))
+    start_date = new Date(parseInt(moment($('#start_date').data("date"), "MM/DD/YYYY h:mm a").format('x')))
     end_date = new Date($.now())
 
     if start_date > end_date
@@ -297,6 +297,7 @@ $ ->
 
   window.start_date_init = (date) ->
     $('#start_date').datetimepicker
+      format: 'MM/DD/YYYY h:mm a'
       defaultDate: date
       ignoreReadonly: true
     $('#start_date').on 'dp.hide', (e) ->
@@ -312,6 +313,7 @@ $ ->
 
   window.completed_date_init = (date) ->
     $('#completed_date').datetimepicker
+      format: 'MM/DD/YYYY h:mm a'
       defaultDate: date
       ignoreReadonly: true
     $('#start_date').data("DateTimePicker").maxDate($('#completed_date').data("DateTimePicker").date())

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -21,7 +21,6 @@ def generate_history_text url
 
   def format_date date
     if date.present?
-      # date.strftime('%F')
       date.strftime('%m/%d/%Y')
     else
       ''

diff --git a/app/views/appointments/show.js.coffee b/app/views/appointments/show.js.coffee
@@ -22,11 +22,11 @@ $('#appointment_indications').selectpicker()
 $('#appointment_indications').selectpicker('val', statuses)
 
 $(".followup_procedure_datepicker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
-  
+
 $(".completed_date_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
 $('.row.appointment [data-toggle="tooltip"]').tooltip()
diff --git a/app/views/fulfillments/edit.js.coffee b/app/views/fulfillments/edit.js.coffee
@@ -1,6 +1,6 @@
 $("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/fulfillment_form', locals: {line_item: @line_item, fulfillment: @fulfillment, clinical_providers: @clinical_providers, header_text: 'Edit Fulfillment'})) %>");
 $("#modal_place").modal 'show'
 $("#date_fulfilled_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 $(".selectpicker").selectpicker()
diff --git a/app/views/fulfillments/new.js.coffee b/app/views/fulfillments/new.js.coffee
@@ -1,6 +1,6 @@
 $("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/fulfillment_form', locals: {line_item: @line_item, fulfillment: @fulfillment, component: @component, clinical_providers: @clinical_providers, header_text: 'Create New Fulfillment'})) %>");
 $("#modal_place").modal 'show'
 $("#date_fulfilled_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 $(".selectpicker").selectpicker()
diff --git a/app/views/line_items/edit.js.coffee b/app/views/line_items/edit.js.coffee
@@ -1,10 +1,10 @@
 <% if @otf %> # study level activities line item edit
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/study_level_activity_form', locals: {protocol: @protocol, line_item: @line_item, header_text: t(:line_item)[:edit]})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/study_level_activity_form', locals: {protocol: @protocol, line_item: @line_item, header_text: t(:line_item)[:edit]})) %>")
 $("#date_started_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 <% else %> # study schedule line item edit
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_schedule/management/manage_services/change_service_form', locals: {line_item: @line_item})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_schedule/management/manage_services/change_service_form', locals: {line_item: @line_item})) %>")
 <% end %>
 $(".selectpicker").selectpicker()
 $("#modal_place").modal 'show'
diff --git a/app/views/line_items/new.js.coffee b/app/views/line_items/new.js.coffee
@@ -1,7 +1,7 @@
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/study_level_activity_form', locals: {protocol: @protocol, line_item: @line_item, header_text: t(:line_item)[(is_protocol_type_study?(@protocol)) ? :create : :create_project]})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'study_level_activities/study_level_activity_form', locals: {protocol: @protocol, line_item: @line_item, header_text: t(:line_item)[(is_protocol_type_study?(@protocol)) ? :create : :create_project]})) %>")
 $("#modal_place").modal 'show'
 $("#date_started_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
 $(".selectpicker").selectpicker()
diff --git a/app/views/notes/create.js.coffee b/app/views/notes/create.js.coffee
@@ -23,12 +23,12 @@ statuses[statuses.length] =  "<%= status %>"
 $('#appointment_indications').selectpicker()
 $('#appointment_indications').selectpicker('val', statuses)
 
-$(".followup_procedure_datepicker").datetimepicker(format: 'MM-DD-YYYY')
-$(".completed_date_field").datetimepicker(format: 'MM-DD-YYYY')
+$(".followup_procedure_datepicker").datetimepicker(format: 'MM/DD/YYYY')
+$(".completed_date_field").datetimepicker(format: 'MM/DD/YYYY')
 
 $('.row.appointment [data-toggle="tooltip"]').tooltip()
 <% elsif @line_item.present? %>
 $("#list-<%= @line_item.id %>").trigger('click')
 <% else %>
 $('table#participants-tracker-table').bootstrapTable('refresh', {silent: true})
-<% end %>
+<% end %>
diff --git a/app/views/participants/edit.js.coffee b/app/views/participants/edit.js.coffee
@@ -1,7 +1,7 @@
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'participants/participant_form', locals: {protocol: @protocol, participant: @participant, header_text: 'Edit Participant'})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'participants/participant_form', locals: {protocol: @protocol, participant: @participant, header_text: 'Edit Participant'})) %>")
 $("#modal_place").modal 'show'
 $("#dob_time_picker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
   viewMode: 'years'
 $(".selectpicker").selectpicker()

diff --git a/app/views/participants/new.js.coffee b/app/views/participants/new.js.coffee
@@ -1,7 +1,7 @@
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'participants/participant_form', locals: {protocol: @protocol, participant: @participant, header_text: 'Create New Participant'})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'participants/participant_form', locals: {protocol: @protocol, participant: @participant, header_text: 'Create New Participant'})) %>")
 $("#modal_place").modal 'show'
 $("#dob_time_picker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
   viewMode: 'years'
 $(".selectpicker").selectpicker()
diff --git a/app/views/procedures/create.js.coffee b/app/views/procedures/create.js.coffee
@@ -8,7 +8,7 @@ else
 $(".selectpicker").selectpicker()
 
 $(".completed_date_field").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
 update_complete_visit_button(<%= @appointment.can_finish? %>)
diff --git a/app/views/procedures/edit.js.coffee b/app/views/procedures/edit.js.coffee
@@ -1,6 +1,6 @@
 $("#modal_area").html("<%= escape_javascript(render(partial: 'edit', locals: { procedure: @procedure, task: @task, clinical_providers: @clinical_providers})) %>")
 $("#follow_up_procedure_datepicker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 $("#modal_place").modal 'show'
 

diff --git a/app/views/procedures/update.js.coffee b/app/views/procedures/update.js.coffee
@@ -4,7 +4,7 @@ $("#modal_errors").html("<%= escape_javascript(render(partial: 'modal_errors', l
 
 update_complete_visit_button(<%= @procedure.appointment.can_finish? %>)
 
-date_time_picker = $(".procedure[data-id='<%= @procedure.id %>']").find(".completed_date_field").datetimepicker(format: 'MM-DD-YYYY').data("DateTimePicker")
+date_time_picker = $(".procedure[data-id='<%= @procedure.id %>']").find(".completed_date_field").datetimepicker(format: 'MM/DD/YYYY').data("DateTimePicker")
 
 $("table.procedures tbody tr[data-id='<%= @procedure.id %>']").data('billing-type', "<%= @procedure.billing_type %>").attr('data-billing-type', "<%= @procedure.billing_type %>")
 $("table.procedures tbody tr[data-id='<%= @procedure.id %>']").data('group-id', "<%= @procedure.group_id %>").attr('data-group-id', "<%= @procedure.group_id %>")
@@ -49,8 +49,8 @@ statuses[statuses.length] =  "<%= status %>"
 $('#appointment_indications').selectpicker()
 $('#appointment_indications').selectpicker('val', statuses)
 
-$(".followup_procedure_datepicker").datetimepicker(format: 'MM-DD-YYYY')
-$(".completed_date_field").datetimepicker(format: 'MM-DD-YYYY')
+$(".followup_procedure_datepicker").datetimepicker(format: 'MM/DD/YYYY')
+$(".completed_date_field").datetimepicker(format: 'MM/DD/YYYY')
 
 $('.row.appointment [data-toggle="tooltip"]').tooltip()
 

diff --git a/app/views/reports/new.js.coffee b/app/views/reports/new.js.coffee
@@ -2,11 +2,11 @@ $("#modal_area").html("<%= escape_javascript(render(partial: @report_type, local
 $("#modal_place").modal('show')
 
 $('#start_date').datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
 $('#end_date').datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
 $(".modal-content .selectpicker").selectpicker()
@@ -28,7 +28,7 @@ multi_select.multiselect({
   onDropdownHide: (e) ->
     selected_values = multi_select.val()
     if !_.isEqual(@original_selected_values,selected_values) && selected_values != null
-      $('#protocol_section').empty() 
+      $('#protocol_section').empty()
       $('#protocol_section').closest('.form-group').find('label').append("<i class='dropdown-glyphicon glyphicon glyphicon-refresh spin' />")
       $('#protocol_section').closest('.form-group').removeClass("hidden")
       $.ajax

diff --git a/app/views/tasks/create.js.coffee b/app/views/tasks/create.js.coffee
@@ -39,13 +39,13 @@ $('#appointment_indications').selectpicker()
 $('#appointment_indications').selectpicker('val', statuses)
 
 $(".followup_procedure_datepicker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 
-$(".completed_date_field").datetimepicker(format: 'MM-DD-YYYY')
+$(".completed_date_field").datetimepicker(format: 'MM/DD/YYYY')
 
 $('.row.appointment [data-toggle="tooltip"]').tooltip()
 <% end %>
 
-$(".followup_procedure_datepicker").datetimepicker(format: 'MM-DD-YYYY')
-<% end %>
+$(".followup_procedure_datepicker").datetimepicker(format: 'MM/DD/YYYY')
+<% end %>
diff --git a/app/views/tasks/new.js.coffee b/app/views/tasks/new.js.coffee
@@ -1,6 +1,6 @@
 $("#modal_area").html("<%= escape_javascript(render(partial: 'form', locals: {task: @task, clinical_providers: @clinical_providers})) %>")
 $("#modal_place").modal 'show'
 $("#follow_up_datepicker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 $(".selectpicker").selectpicker()
diff --git a/app/views/tasks/task_reschedule.js.coffee b/app/views/tasks/task_reschedule.js.coffee
@@ -1,6 +1,6 @@
-$("#modal_area").html("<%= escape_javascript(render(:partial =>'task_reschedule_modal', locals: {task: @task})) %>");
+$("#modal_area").html("<%= escape_javascript(render(:partial =>'task_reschedule_modal', locals: {task: @task})) %>")
 $("#reschedule_datepicker").datetimepicker
-  format: 'MM-DD-YYYY'
+  format: 'MM/DD/YYYY'
   ignoreReadonly: true
 $("#modal_place").modal 'show'
 

diff --git a/app/views/update_dropdowns/create.js.coffee b/app/views/update_dropdowns/create.js.coffee
@@ -1,4 +1,3 @@
-
 $('#protocol_section').html('<%= escape_javascript(select_tag "protocol_ids", truncated_options_from_collection_for_select(@protocols, "id", "short_title_with_sparc_id"), multiple: true, "data-live-search" => true, "data-actions-box" => true, title: t(:reports)[:all_protocols], class: "selectpicker form-control") %>')
 $('.dropdown-glyphicon.glyphicon.glyphicon-refresh.spin').remove()
-$('.selectpicker').selectpicker('refresh')
+$('.selectpicker').selectpicker('refresh')