Merge pull request #1048 from sparc-request/jm-edit-visit-position-bug

JM - (SPARCDashboard) Edit Visit Position Bug [#149936624] https://ww…
sparc-request · Aug 4, 2017 · 5fbf220 · 5fbf220
2 parents e317688 + 2b347a5
commit 5fbf220
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/dashboard/visit_groups_controller.rb b/app/controllers/dashboard/visit_groups_controller.rb
@@ -96,7 +96,11 @@ def update_params
       :day,
       :window_before,
       :window_after)
-    temp[:position] = temp[:position].to_i - 1
+
+    if @visit_group.position < temp[:position].to_i
+      temp[:position] = temp[:position].to_i - 1
+    end
+
     temp
   end
 

diff --git a/app/controllers/service_calendars_controller.rb b/app/controllers/service_calendars_controller.rb
@@ -129,7 +129,13 @@ def move_visit_position
 
     @visit_group        = VisitGroup.find(params[:visit_group].to_i)
 
-    @visit_group.insert_at( params[:position].to_i - 1 )
+    new_position = params[:position].to_i
+
+    if @visit_group.position < new_position
+      @visit_group.insert_at( new_position - 1 )
+    else
+      @visit_group.insert_at( new_position )
+    end
 
     @pages = {}
     @service_request.arms.each do |arm|