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

UI - Otf table #2333

Merged
merged 15 commits into from May 7, 2020
Merged

UI - Otf table #2333

merged 15 commits into from May 7, 2020

Conversation

Stuart-Johnson
Copy link
Collaborator

Recreation of pull request: #2321

Git history issues with the original.

Eric Embree and others added 15 commits April 28, 2020 11:54
Work on adding oft tables to cost analysis pdf
2d5fb49
OtfLineItem applicable_rate filled in
eb6f858
OtfTable and OtfLineItem name fixes
4f40a36
OtfTable summary row added
8fddff7
OtfTable changes to correctly group by ssr_id
4f50ac1
otf table units_per_quantity
41a9a1c 
Tweaks to column headers
Grant total table added to cost analysis
eea121a
Rearranged Generators::PDF calls to introduce a block variable for th…
262532c 
…e pdf object
Pdf generator rename update to setup_render for clarity
8cb56d3
Generators:PDF remove reliance on local variables in new block call s…
1185682 
…tyle
PDF render broken into several calls
2bd60e1
PDF render without the extra block manipulation
1d2f489
@chrisortman
Always show cost analysis button now
03b422f
@chrisortman
Merging otf table changes and 3.7 to try to get travis tests to pass
d44ca95
@Stuart-Johnson
Merge branch 'v3.7.0' into otf_table
7ca7e42
@Stuart-Johnson Stuart-Johnson mentioned this pull request May 7, 2020
Closed
@Stuart-Johnson
Copy link
Collaborator Author

Pivotal Link: https://www.pivotaltracker.com/n/projects/1918597/stories/171649105

@Stuart-Johnson Stuart-Johnson merged commit f35e730 into v3.7.0 May 7, 2020
@Stuart-Johnson Stuart-Johnson deleted the otf_table branch May 7, 2020 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement version 3.7.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Stuart-Johnson @chrisortman