Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 3, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 11 additions & 8 deletions app/controllers/service_calendars_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -79,14 +80,16 @@ def merged_calendar
end

def view_full_calendar
@tab = 'calendar'
@review = false
@portal = true
@admin = false
@merged = true
@consolidated = true
@service_request = @protocol.any_service_requests_to_display?
@statuses_hidden = params[:statuses_hidden]
@tab = 'calendar'
@review = false
@portal = true
@admin = false
@merged = true
@consolidated = true
@service_request = @protocol.any_service_requests_to_display?
@statuses_hidden = params[:statuses_hidden]
@scroll_true = params[:scroll].present? && params[:scroll] == 'true'
@visit_dropdown_change = params[:pages].present?
setup_calendar_pages

respond_to do |format|
Expand Down
4 changes: 4 additions & 0 deletions app/views/service_calendars/view_full_calendar.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 @visit_dropdown_change %>
$(".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()