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 jw remove cofc column #269

Merged
merged 2 commits into from
Jan 25, 2016
Merged

Jl jw remove cofc column #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ede137
last min
jwiel86 Jan 25, 2016
5377563
merge conflicts
jwiel86 Jan 25, 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
11 changes: 10 additions & 1 deletion app/assets/javascripts/portal/studies.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,16 @@ $(document).ready ->
restrict_sending_dropdown = $('#study_type_answer_restrict_sending_answer')

epic_box_alert_message = () ->
alert("Please fill out the Epic Information correctly.")
options = {
resizable: false,
height: 220,
modal: true,
autoOpen: false,
buttons:
"OK": ->
$(this).dialog("close")
}
$('#epic_box_alert').dialog(options).dialog("open")

$.prototype.hide_elt = () ->
this[0].selectedIndex = 0
Expand Down
10 changes: 6 additions & 4 deletions app/views/portal/protocols/_study_fields.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
$(document).ready(function() {
Sparc.study.ready();
});


#epic_box_alert{style: 'display:none;', title: t(:epic_box)[:epic_box_error]}
= t(:epic_box)[:epic_box_alert]

.grid_7.box
.info
%fieldset
Expand Down Expand Up @@ -102,9 +105,8 @@
.field
= f.label :selected_for_epic, t(:study_form)[:push_to_epic]

/////***** Only DISPLAY epic box in admin UNLESS changing from a virgin project
/////***** (a project that has never been a study- selected_for_epic = nil) to a study
////****** In this case, we DO want the ability to edit the Epic Box.
/ Only DISPLAY epic box data in admin UNLESS changing from a virgin project

- if admin && @protocol.selected_for_epic != nil
%span.epic_selected.display_epic_answers
= f.object.selected_for_epic ? "Yes" : "No"
Expand Down
3 changes: 3 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,9 @@ en:
calendar_changed: "Changes to patient calendars need to be saved, click 'Stay on page' and save the form to save the calendar, or click 'Leave page' to leave the page and dismiss your changes."
subject_changed: "Changes to subjects need to be saved. Click 'Cancel' to return to the page and save the form, or 'OK' to leave the page and dismiss your changes."
subject_delete: "This subject has one or more completed appointments and can't be deleted."
epic_box:
epic_box_error: "Epic Information Error"
epic_box_alert: "Please fill out the Epic Information correctly."
feedback:
message_error: "Message can't be blank"
fulfillment_js:
Expand Down