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

Jl arm deletion bug #676

Merged
merged 3 commits into from
Sep 21, 2016
Merged

Jl arm deletion bug #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22b6a56
First pass at preventing the last arm from being deleted.
jleonardw9 Sep 13, 2016
be9e234
Fixing merge conflict
jleonardw9 Sep 14, 2016
fe07254
Integrating sweetalert.
jleonardw9 Sep 21, 2016
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
1 change: 1 addition & 0 deletions app/assets/javascripts/dashboard/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
//= require form_fx_manager
//= require twitter/typeahead.min
//= require filterrific/filterrific-jquery
//= require sweetalert.min
//= require_tree .
//= require ../service_calendar

Expand Down
12 changes: 8 additions & 4 deletions app/assets/javascripts/dashboard/study_schedule_management.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,18 @@ $ ->
$(this).closest('form').submit()

$(document).on 'click', '#remove_service_button', ->
line_item_count = $('#study_schedule_buttons').data('line-item-count')
data =
'protocol_id' : $('#study_schedule_buttons').data('protocol-id')
'sub_service_request_id' : $('#study_schedule_buttons').data('sub-service-request-id')
'service_request_id' : $('#study_schedule_buttons').data('service-request-id')
$.ajax
type: 'GET'
url: '/dashboard/multiple_line_items/edit_line_items'
data: data
if line_item_count == 1
sweetAlert("You can't delete the last service on a request")
else
$.ajax
type: 'GET'
url: '/dashboard/multiple_line_items/edit_line_items'
data: data

$(document).on 'change', "#remove_service_id", ->
data =
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/dashboard/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
@import 'sub_service_requests';
@import 'twitter_typeahead';
@import 'users';
@import 'sweetalert';

// original require files
@import 'bootstrap-sprockets';
Expand Down
2 changes: 1 addition & 1 deletion app/views/study_schedule/_management_buttons.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-# 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.~

#study_schedule_buttons{ data: { protocol_id: service_request.protocol_id, sub_service_request_id: sub_service_request.id, service_request_id: service_request.id } }
#study_schedule_buttons{ data: { protocol_id: service_request.protocol_id, sub_service_request_id: sub_service_request.id, service_request_id: service_request.id, line_item_count: sub_service_request.line_items.count } }
.row
.col-sm-4.col-md-4.text-center
= t(:dashboard)[:arms][:manage]
Expand Down