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

JM - (SPARCRequest Step 2B & SPARCDashboard-Admin Edit) Hide Services… #1156

Merged
merged 1 commit into from
Oct 17, 2017
Merged

JM - (SPARCRequest Step 2B & SPARCDashboard-Admin Edit) Hide Services… #1156

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
3 changes: 2 additions & 1 deletion app/assets/stylesheets/service_calendar.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
/* 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.*/
.custom-pull-right
margin-left: 71%
margin-left: 75%
margin-bottom: 1%
margin-top: -6%

.btn-custom-green
color: green
Expand Down
6 changes: 4 additions & 2 deletions app/views/service_requests/show.xlsx.axlsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ wb.add_worksheet(name: "Review") do |sheet|

##### beginning of arms
if has_per_patient_per_visit_services
@service_request.arms.each do |arm|

arms_to_be_displayed = @display_all_services ? @service_request.arms : Arm.where(protocol: @service_request.protocol).joins(:line_items_visits).joins(:visits).where.not( "research_billing_qty = 0 and insurance_billing_qty = 0 and effort_billing_qty = 0" ).uniq

arms_to_be_displayed.each do |arm|
services_row = ["Selected Services", "CPT Code", "Order Code", "Notes"]
services_row << "Current Cost" if @admin_offset
services_row += ["Your Cost", "# of Subjects"]
Expand All @@ -118,7 +121,6 @@ wb.add_worksheet(name: "Review") do |sheet|

num_visits = arm.visit_count
visit_group_name_sizes = []

arm.visit_groups.each do |vg|
visit_group_name_sizes << vg.name.size
services_row << "#{vg.name}"
Expand Down