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

Jjh sla cols #673

Merged
merged 2 commits into from
Sep 21, 2016
Merged

Jjh sla cols #673

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
13081c4
[#130552589]
Sep 20, 2016
8409606
Use actual data. #130552589
Sep 20, 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
2 changes: 2 additions & 0 deletions app/views/dashboard/line_items/_study_level_activity.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ json.service sla_service_name_display(line_item)
json.charge_code line_item.service.charge_code
json.quantity_requested line_item.quantity
json.quantity_type line_item.service.current_effective_pricing_map.quantity_type
json.unit_requested line_item.units_per_quantity
json.unit_type line_item.service.current_effective_pricing_map.otf_unit_type
json.cost sla_cost_display(line_item)
json.date_started format_date(line_item.in_process_date)
json.date_completed format_date(line_item.complete_date)
Expand Down
4 changes: 4 additions & 0 deletions app/views/dashboard/study_level_activities/_study_level_activities_table.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
%th{data: {class: 'fulfillments_button', align: "left", field: "fulfillments_button", switchable: 'false'}}
%th{data: {class: 'service', align: "left", field: "service"}}
= t(:dashboard)[:study_level_activities][:table][:service]
%th{data: {class: 'unit_requested', align: "left", field: "unit_requested", visible: "false"}}
= t(:dashboard)[:study_level_activities][:table][:unit_requested]
%th{data: {class: 'unit_type', align: "left", field: "unit_type", visible: "false"}}
= t(:dashboard)[:study_level_activities][:table][:unit_type]
%th{data: {class: 'qty_req', align: "left", sortable: "true", field: "quantity_requested"}}
= t(:dashboard)[:study_level_activities][:table][:quantity_requested]
%th{data: {class: 'qty_rem', align: "left", sortable: "true", field: "quantity_type"}}
Expand Down
3 changes: 2 additions & 1 deletion config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,8 @@ en:
destroyed: "Study Level Activity Destroyed!"
table:
service: "Service"
unit_type: "Unit Type"
unit_requested: "Unit Requested"
quantity_requested: "Qty Requested"
quantity_type: "Qty Type"
cost: "Cost"
Expand Down Expand Up @@ -2093,4 +2095,3 @@ en:
message: "To begin to search and add authorized users to this study/project, type in the first or last name of the user. Select as appropriate."
search_box_header: "User Search"
search_placeholder: "Search for user..."