JM- (SPARCDashboard) View Consolidated Request scroll bug [#149756833] …

…https://www.pivotaltracker.com/story/show/149756833
sparc-request · Jul 31, 2017 · ca4a08b · ca4a08b
1 parent bc60e07
commit ca4a08b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/controllers/service_calendars_controller.rb b/app/controllers/service_calendars_controller.rb
@@ -70,6 +70,7 @@ def merged_calendar
     @merged           = true
     @consolidated     = false
     @statuses_hidden  = []
+    @scroll_true        = params[:scroll].present? && params[:scroll] == 'true'
     setup_calendar_pages
 
     respond_to do |format|
@@ -87,6 +88,8 @@ def view_full_calendar
     @consolidated       = true
     @service_request    = @protocol.any_service_requests_to_display?
     @statuses_hidden    = params[:statuses_hidden]
+    @scroll_true        = params[:scroll].present? && params[:scroll] == 'true'
+    @toggle_visit      = params[:toggle_visit].present? && params[:toggle_visit] == 'true'
     setup_calendar_pages
 
     respond_to do |format|

diff --git a/app/views/service_calendars/master_calendar/pppv/_visit_group_page_select.html.haml b/app/views/service_calendars/master_calendar/pppv/_visit_group_page_select.html.haml
@@ -17,7 +17,7 @@
 -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- url_data = { sub_service_request_id: sub_service_request.try(:id), service_request_id: service_request.try(:id), pages: pages.to_s, arm_id: arm.id, tab: tab, portal: portal.to_s, admin: admin.to_s, review: review.to_s, merged: merged.to_s, consolidated: consolidated.to_s, statuses_hidden: statuses_hidden, format: :js }
+- url_data = { sub_service_request_id: sub_service_request.try(:id), service_request_id: service_request.try(:id), pages: pages.to_s, arm_id: arm.id, tab: tab, portal: portal.to_s, admin: admin.to_s, review: review.to_s, merged: merged.to_s, consolidated: consolidated.to_s, statuses_hidden: statuses_hidden, toggle_visit: true, format: :js }
 
 - if consolidated
   - path_method = method(:view_full_calendar_service_calendars_path)

diff --git a/app/views/service_calendars/view_full_calendar.js.coffee b/app/views/service_calendars/view_full_calendar.js.coffee
@@ -17,6 +17,10 @@
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+<% if @toggle_visit %>
+$(".arm-calendar-container-<%= @arm.id %>").replaceWith("<%= escape_javascript(render( '/service_calendars/master_calendar/pppv/pppv_calendar', tab: @tab, arm: @arm, service_request: @service_request, sub_service_request: @sub_service_request, page: @pages[@arm.id], pages: @pages, review: @review, portal: @portal, admin: @admin, merged: @merged, consolidated: @consolidated, statuses_hidden: %w(first_draft))) %>")
+<% else %>
 $('#modal_place').html("<%= escape_javascript(render( 'service_calendars/view_full_calendar', tab: @tab, service_request: @service_request, sub_service_request: @sub_service_request, pages: @pages, review: @review, portal: @portal, admin: @admin, merged: @merged, consolidated: @consolidated, statuses_hidden: @statuses_hidden)) %>")
+<% end %>
 $('#modal_place').modal('show')
 $('.selectpicker').selectpicker()