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.

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

wth - (SPARCDashboard, SPARCRequest & Data) Admin Rate Label Change a… #1442

Merged
merged 2 commits into from Aug 1, 2018

Conversation

wtholt
Copy link
Contributor

@wtholt wtholt commented Jul 27, 2018

…nd Visual Cue

Background: Currently, the admin rate is an attribute on Line Item level. When an admin user set an admin rate on a service in a request, and then add the same service in SPARCFulfillment (which was not pushed from SPARCRequest), SPARCFulfillment considers it as a service with the normal rate rather than admin rate.

Please:

1). Make the format of the "Non-clinical Service" "Your Cost" editable field consistent with the other ones in SPARCDashboard Admin Edit Section “Clinical Services” Tab (see 2nd screenshot attached);

2). Add a visual cue (such as "(Modified)" sign or "M" icon with "Modified Rate" tooltip next to the cost in green color) for admin rate (SPARCRequest & SPARCDashboard).

The corresponding SPARCFulfillment story can be found here: https://www.pivotaltracker.com/story/show/156286625

[#156275541]

Story - https://www.pivotaltracker.com/story/show/156275541

@@ -41,7 +41,9 @@ def sla_service_rate_display line_item
end

def sla_your_cost_field line_item
raw( text_field(:line_item, :service, class: 'your-cost-edit', value: number_with_precision(Service.cents_to_dollars(line_item.applicable_rate), precision: 2)) )
link_to 'javascript:void(0);', class: [("your-cost editable"), ('text-danger' if line_item.admin_rates.present?)], data: { url: dashboard_line_item_path(line_item), title: line_item.admin_rates.present? ? 'Modified Rate' : 'Admin Rate' }do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add this text to en.yml?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

$(document).on 'load-success.bs.table', '.study_level_activities', ->
setup_xeditable_fields()

$('body').tooltip(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea. At some point we should streamline our tooltips to do this using a global JS function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. The only reason I came across this was because tooltips and x-editable fields don't play nicely. Reason being the data: { toggle: 'tooltip' } part

…nd Visual Cue

Background: Currently, the admin rate is an attribute on Line Item level. When an admin user set an admin rate on a service in a request, and then add the same service in SPARCFulfillment (which was not pushed from SPARCRequest), SPARCFulfillment considers it as a service with the normal rate rather than admin rate.

Please:

1). Make the format of the "Non-clinical Service" "Your Cost" editable field consistent with the other ones in SPARCDashboard Admin Edit Section “Clinical Services” Tab (see 2nd screenshot attached);

2). Add a visual cue (such as "(Modified)" sign or "M" icon with "Modified Rate" tooltip next to the cost in green color) for admin rate (SPARCRequest & SPARCDashboard).

The corresponding SPARCFulfillment story can be found here: https://www.pivotaltracker.com/story/show/156286625

[#156275541]

Story - https://www.pivotaltracker.com/story/show/156275541

fixed specs and yml

fix specs

fix specs
@Stuart-Johnson Stuart-Johnson merged commit 9f7ff20 into v3.3.0 Aug 1, 2018
@Stuart-Johnson Stuart-Johnson deleted the wth-admin-rate branch August 1, 2018 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants