Skip to content

Commit

Permalink
Merge pull request #259 from sparc-request/kg-admin_status
Browse files Browse the repository at this point in the history 
KG - Admin Statuses
  • Loading branch information
kyle-glick committed Jan 19, 2016
2 parents a7c2ca1 + 5c7bed7 commit d75946b
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 41 deletions.
80 changes: 50 additions & 30 deletions app/views/portal/admin/_ssr_list.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@

.admin-index-ssr-list
.admin-index-ssr-table
%input.search-all-service-requests{:type => 'text', :placeholder => t(:admin_root)[:search_placeholder]}
%input.search-all-service-requests{type: 'text', placeholder: t(:admin_root)[:search_placeholder]}
%select#service_request_workflow_states
- number_of_ssrs = 0
- AVAILABLE_STATUSES.each do |key, value|
%option{:value => key, :selected => (key == (cookies[:status_filter_value] ? cookies[:status_filter_value] : "submitted"))} #{value} (#{@service_requests[key].try(:length) || 0})
- number_of_ssrs += (@service_requests[key].try(:length) || 0)
%option{value: "all", selected: cookies[:status_filter_value] == "all"} All (#{number_of_ssrs})
- AVAILABLE_STATUSES.each do |key, value|
%option{value: key, selected: (key == (cookies[:status_filter_value] ? cookies[:status_filter_value] : "submitted"))} #{value} (#{@service_requests[key].try(:length) || 0})

.admin_indicator
= image_tag 'portal/spinner.gif'
Expand All @@ -51,15 +55,24 @@
%col.last
%thead
%tr
%th= t(:admin_dashboard)[:id]
%th= t(:admin_dashboard)[:status]
%th= t(:admin_dashboard)[:short_title]
%th= t(:admin_root)[:date]
%th= t(:admin_root)[:service]
%th= t(:admin_root)[:requester]
%th= t(:admin_dashboard)[:pi]
%th= t(:admin_root)[:assigned]
%th.last= t(:admin_root)[:orgs]
%th
= t(:admin_dashboard)[:id]
%th
= t(:admin_dashboard)[:status]
%th
= t(:admin_dashboard)[:short_title]
%th
= t(:admin_root)[:date]
%th
= t(:admin_root)[:service]
%th
= t(:admin_root)[:requester]
%th
= t(:admin_dashboard)[:pi]
%th
= t(:admin_root)[:assigned]
%th.last
= t(:admin_root)[:orgs]
%tbody
- short_titles = []
- pis = []
Expand All @@ -69,38 +82,45 @@
- @service_requests.each do |status, ssrs|
- ssrs.each do |ssr|
- if user_can_view_ssr?(@study_tracker, ssr, @user)
- short_titles << {:value => ssr.try(:service_request).try(:protocol).try(:short_title), :id => pretty_tag(ssr.try(:service_request).try(:protocol).try(:short_title))}
- search_pis << {:value => ssr.try(:service_request).try(:protocol).try(:primary_principal_investigator).try(:full_name), :id => pretty_tag(ssr.try(:service_request).try(:protocol).try(:primary_principal_investigator).try(:full_name))}
- requesters << {:value => ssr.try(:service_request).try(:service_requester).try(:full_name), :id => pretty_tag(ssr.try(:service_request).try(:service_requester).try(:full_name))}
- srids << {:value => /(.*)-/.match(full_ssr_id(ssr))[1], :id => /(.*)-/.match(full_ssr_id(ssr))[1]}
- short_titles << {value: ssr.try(:service_request).try(:protocol).try(:short_title), id: pretty_tag(ssr.try(:service_request).try(:protocol).try(:short_title))}
- search_pis << {value: ssr.try(:service_request).try(:protocol).try(:primary_principal_investigator).try(:full_name), id: pretty_tag(ssr.try(:service_request).try(:protocol).try(:primary_principal_investigator).try(:full_name))}
- requesters << {value: ssr.try(:service_request).try(:service_requester).try(:full_name), id: pretty_tag(ssr.try(:service_request).try(:service_requester).try(:full_name))}
- srids << {value: /(.*)-/.match(full_ssr_id(ssr))[1], id: /(.*)-/.match(full_ssr_id(ssr))[1]}

%tr.admin_service_request{:class => "services #{pretty_tag(status)} all #{ssr.service_request.protocol.id} #{pretty_tag(ssr.try(:service_request).try(:service_requester).try(:full_name))} #{pretty_tag(ssr.try(:service_request).try(:protocol).try(:short_title))} #{pretty_tag(ssr.try(:service_request).try(:protocol).try(:principal_investigators).try(:first).try(:full_name))}", :style => default_display(status, cookies[:status_filter_value]), :'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id}
%td{:id => "service_request_ssr.id", :'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= full_ssr_id(ssr)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= AVAILABLE_STATUSES[ssr.status]
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= ssr.service_request.protocol.try(:short_title)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= ssr.service_request.submitted_at.try(:strftime, "%m/%d/%Y")
%td{:style => "max-width: 135px; word-wrap: break-word;"}
%tr.admin_service_request{class: "services #{pretty_tag(status)} all #{ssr.service_request.protocol.id} #{pretty_tag(ssr.try(:service_request).try(:service_requester).try(:full_name))} #{pretty_tag(ssr.try(:service_request).try(:protocol).try(:short_title))} #{pretty_tag(ssr.try(:service_request).try(:protocol).try(:principal_investigators).try(:first).try(:full_name))}", style: default_display(status, cookies[:status_filter_value]), :'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id}
%td{id: "service_request_ssr.id", :'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= full_ssr_id(ssr)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= AVAILABLE_STATUSES[ssr.status]
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= ssr.service_request.protocol.try(:short_title)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= ssr.service_request.submitted_at.try(:strftime, "%m/%d/%Y")
%td{style: "max-width: 135px; word-wrap: break-word;"}
%ul.services_first
%li.ui-corner-top
- services = ssr.line_items.map(&:service).sort_by{|srv| srv.name}.map(&:name)
- if services.size > 1
%span.ui-icon.ui-icon-triangle-1-e.open_close_services{:style => 'display:inline-block'}
%span.ui-icon.ui-icon-triangle-1-s.open_close_services{:style => 'display:none'}

%span= services.shift
%ul.services_rest{:style => 'display:none'}
%span.ui-icon.ui-icon-triangle-1-e.open_close_services{style: 'display:inline-block'}
%span.ui-icon.ui-icon-triangle-1-s.open_close_services{style: 'display:none'}
%span
= services.shift
%ul.services_rest{style: 'display:none'}
- services.each do |service|
%li= service
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= ssr.service_request.service_requester.try(:full_name)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= ssr.service_request.service_requester.try(:full_name)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
- pis = ssr.service_request.protocol.try(:principal_investigators).try(:map, &:full_name) || []
- if pis.size > 1
- pis.each do |pi|
= pi
- else
= pis[0]
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= ssr.owner.try(:full_name)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}= ssr.org_tree_display
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= ssr.owner.try(:full_name)
%td{:'data-sr_id' => ssr.service_request_id, :'data-ssr_id' => ssr.id, :class => @study_tracker ? "service_request_links_cwf" : "service_request_links"}
= ssr.org_tree_display
%input.values_test{:value => (short_titles + search_pis + requesters + srids).uniq.to_json, :type => 'hidden'}
%input.values_test{value: (short_titles + search_pis + requesters + srids).uniq.to_json, type: 'hidden'}
22 changes: 11 additions & 11 deletions config/constants.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,21 @@ study_type_answers: { '1' : [true, true, ~, ~, ~, ~],
'0': [false, ~, ~, true, false, false] }
funding_statuses: { 'Pending Funding': 'pending_funding',
'Funded': 'funded' }
available_statuses: { 'draft': 'Draft',
'submitted': 'Submitted',
'get_a_cost_estimate': 'Get a Cost Estimate',
'in_process': 'In Process',
'complete': 'Complete',
available_statuses: { 'ctrc_approved': 'Active',
'administrative_review': 'Administrative Review',
'approved': 'Approved',
'awaiting_pi_approval': 'Awaiting Requester Response',
'on_hold': 'On Hold',
'complete': 'Complete',
'declined': 'Declined',
'draft': 'Draft',
'get_a_cost_estimate': 'Get a Cost Estimate',
'invoiced': 'Invoiced',
'ctrc_review': 'In Admin Review',
'ctrc_approved': 'Active',
'administrative_review': 'Administrative Review',
'committee_review': 'In Committee Review',
'invoiced': 'Invoiced',
'fulfillment_queue': 'In Fulfillment Queue',
'approved': 'Approved',
'declined': 'Declined',
'in_process': 'In Process',
'on_hold': 'On Hold',
'submitted': 'Submitted',
'withdrawn': 'Withdrawn' }
default_statuses : ["draft", "submitted", "get_a_cost_estimate", "in_process", "complete", "awaiting_pi_approval", "on_hold"]
accordion_color_options: { "blue": 'blue-provider',
Expand Down

0 comments on commit d75946b

Please sign in to comment.