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

KG - Add Service Name Display For All Calendar Field Editing #2290

Merged
merged 1 commit into from
Apr 15, 2020
Merged

KG - Add Service Name Display For All Calendar Field Editing #2290

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
8 changes: 5 additions & 3 deletions app/views/line_items/_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,21 @@
- min = nil
- max = nil

.modal-dialog.modal-sm{ role: 'document' }
.modal-dialog{ role: 'document' }
.modal-content
= form_for line_item, remote: true do |f|
= hidden_field_tag :srid, service_request.try(:id)
= hidden_field_tag :ssrid, sub_service_request.try(:id)
= hidden_field_tag :field, params[:field]
.modal-header
%h3.modal-title
%h3.modal-title<
= t("calendars.editable_fields.#{params[:field]}")
%small.text-muted
= line_item.service.display_service_name
%button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: t('actions.close') } }
%span{ aria: { hidden: 'true' } } &times;
.modal-body
.form-group
.form-group.mb-0
= f.label params[:field], class: 'required'
.input-group
- if params[:field] == 'displayed_cost'
Expand Down
8 changes: 5 additions & 3 deletions app/views/line_items_visits/_form.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.~

.modal-dialog.modal-sm{ role: 'document' }
.modal-dialog{ role: 'document' }
.modal-content
= form_for line_items_visit, remote: true do |f|
= hidden_field_tag :srid, service_request.try(:id)
Expand All @@ -27,12 +27,14 @@
= hidden_field_tag :page, params[:page]
= hidden_field_tag :tab, params[:tab]
.modal-header
%h3.modal-title
%h3.modal-title<
= t("calendars.editable_fields.#{params[:field]}")
%small.text-muted
= line_items_visit.service.display_service_name
%button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: t('actions.close') } }
%span{ aria: { hidden: 'true' } } &times;
.modal-body
.form-group
.form-group.mb-0
= f.label params[:field], class: 'required'
.input-group
.input-group-prepend
Expand Down
10 changes: 6 additions & 4 deletions app/views/visits/_form.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,21 @@
= hidden_field_tag :tab, 'billing_strategy'
= hidden_field_tag :page, params[:page]
.modal-header
%h3.modal-title
%h3.modal-title<
= t(:calendars)[:pppv][:header_fields][:edit_billing_modal]
%small.text-muted
= visit.service.display_service_name
%button.close{ type: 'button', data: { dismiss: 'modal' }, aria: { label: t('actions.close') } }
%span{ aria: { hidden: 'true' } } &times;
.modal-body
.form-row
.form-group.col-4
.form-group.col-4.mb-0
= f.label :research_billing_qty, class: 'required'
= f.text_field :research_billing_qty, class: 'form-control'
.form-group.col-4
.form-group.col-4.mb-0
= f.label :insurance_billing_qty, class: 'required'
= f.text_field :insurance_billing_qty, class: 'form-control'
.form-group.col-4
.form-group.col-4.mb-0
= f.label :effort_billing_qty, class: 'required'
= f.text_field :effort_billing_qty, class: 'form-control'
.modal-footer
Expand Down