pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,477 Commits 1 Branch 0 Tags
Commit Graph

7477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
graham-dds
52489b6bca Add upcoming_obligated_funds property to portfolio 2020-02-11 14:27:29 -05:00
leigh-mil
c47c6d57eb
Merge pull request #1409 from dod-ccpo/find-dod-text 
DoD help text
 2020-02-11 14:23:02 -05:00
Philip Kalinsky
441e81ba8d azure csp unit tests WIP 2020-02-11 14:11:11 -05:00
leigh-mil
d807b74175
Merge branch 'staging' into find-dod-text 2020-02-11 14:04:23 -05:00
tomdds
dffca12213
Merge pull request #1400 from dod-ccpo/portfolio-data-as-dict 
class method to export portfolio data as dictionary as an arg to stat…
 2020-02-11 14:03:28 -05:00
leigh-mil
cb4bcc593b Use .icon-tooltip--tight across the site instead of element specific classes 2020-02-11 14:01:25 -05:00
leigh-mil
e4e6c4d277 Add DoD ID tooltip to app member and portfolio member forms 2020-02-11 14:01:25 -05:00
tomdds
6079e01fb0 Ensure non-none value for csp_data state machine arg 2020-02-11 13:23:11 -05:00
tomdds
91d3795a92 Fix formatting issue 2020-02-11 13:21:53 -05:00
tomdds
2ed5c5b588
Merge branch 'staging' into portfolio-data-as-dict 2020-02-11 13:17:18 -05:00
dandds
aa35ef795b
Merge pull request #1393 from dod-ccpo/environment-role-creation 
Environment role creation
 2020-02-11 13:15:57 -05:00
dandds
10014e696d Merge branch 'staging' into environment-role-creation 2020-02-11 12:12:45 -05:00
tomdds
d1ee168270
Merge pull request #1387 from dod-ccpo/azure-initial-mgmt-grp 
azure initial management group creation
 2020-02-11 12:01:44 -05:00
tomdds
92bc848da5 Remove placeholder data in portfolio state machine test 2020-02-11 11:20:26 -05:00
tomdds
24414bc3a9 Fix DB migration conflict 2020-02-11 11:13:03 -05:00
tomdds
17b281b11a
Merge branch 'staging' into azure-initial-mgmt-grp 2020-02-11 11:06:28 -05:00
leigh-mil
8ee7cdc1cb
Merge pull request #1410 from dod-ccpo/fix-double-submit 
Prevent double submitting in multi-step forms
 2020-02-11 10:56:58 -05:00
leigh-mil
858312b2e0
Merge branch 'staging' into fix-double-submit 2020-02-11 10:31:53 -05:00
leigh-mil
935d44eaa2
Merge pull request #1407 from dod-ccpo/to-index-fixes 
TO index page fixes
 2020-02-11 10:31:01 -05:00
leigh-mil
7d867457fc
Merge branch 'staging' into to-index-fixes 2020-02-11 09:40:50 -05:00
dandds
49709cf8ea
Merge pull request #1413 from dod-ccpo/kombu-fix 
Separate config for Celery BROKER_URL.
 2020-02-11 09:20:56 -05:00
dandds
788f73b7a9 Separate config for Celery BROKER_URL. 
I found out the hard way that, despite the Celery docs saying it will
respect settings of "none", "required", etc for the ssl_cert_reqs option
on ths broker connection uri, one it's underlying dependencies does not.
That dependency, Kombu, requires that the option be set as the string
version of one of the constants available on the standard library's ssl
module ("CERT_NONE", etc.). This fixes our code to supply slightly
variant connection URIs for Celery and for the session library. This
change can be reverted when Kombu is updated with the correct behavior.
 2020-02-11 06:37:32 -05:00
dandds
a258bce84b
Merge pull request #1405 from dod-ccpo/dev-tenant 
K8s dev config
 2020-02-11 06:21:47 -05:00
dandds
93176073a9
Merge branch 'staging' into dev-tenant 2020-02-11 06:02:25 -05:00
leigh-mil
8522a786ce
Merge pull request #1398 from dod-ccpo/171115854-fix-sidenav 
Fix sidenav
 2020-02-10 19:56:38 -05:00
leigh-mil
b3d952c35d
Merge branch 'staging' into 171115854-fix-sidenav 2020-02-10 19:36:03 -05:00
tomdds
ccbc61f34f
Merge branch 'staging' into azure-initial-mgmt-grp 2020-02-10 17:44:19 -05:00
tomdds
e225cfa551
Merge pull request #1411 from dod-ccpo/fix-kv-secret-update 
Ensure credential updates properly merge values.
 2020-02-10 17:36:14 -05:00
tomdds
6c0bc0dc47
Merge branch 'staging' into fix-kv-secret-update 2020-02-10 17:19:10 -05:00
dandds
9a05d64439
Merge pull request #1412 from dod-ccpo/redis-ssl-verify 
Set Redis verification mode for TLS connections.
 2020-02-10 17:18:24 -05:00
tomdds
0705b47e4d
Merge branch 'staging' into fix-kv-secret-update 2020-02-10 17:04:11 -05:00
dandds
f0ddc9b2aa
Merge branch 'staging' into redis-ssl-verify 2020-02-10 17:02:26 -05:00
dandds
f975249f07 Set Redis verification mode for TLS connections. 
If the app is making a TLS connection to Redis, the new config setting
REDIS_SSLMODE determines whether CA verification should be performed.
Acceptable values are Python `None` or strings "none", "optional", and
"required".
 2020-02-10 16:58:07 -05:00
graham-dds
f2be07ce42
Merge pull request #1396 from dod-ccpo/reporting-integration 
Reporting integration - Use cloud data in reporting view
 2020-02-10 16:20:04 -05:00
tomdds
e6d5369cb0 Ensure credential updates properly merge values. 
Previously updating the credentials would delete values from the existing crednetials if they weren't also present in the update. This adds a method for merging credentials to the KeyVaultCredentials model and adds tests to both the cloud provider and model.
 2020-02-10 16:14:42 -05:00
graham-dds
5b60a54dbc Remove fixture-based reporting methods 
These methods probably can be reused to handle real Azure reporting data
 2020-02-10 14:49:04 -05:00
graham-dds
4a78aa07c9 Remove non-MVP reporting elements 
- Edits views to only show spending at the portfolio level -- no longer
  broken out by JEDI CLIN
- Removes Monthly Spending table -- keeps the template, just no longer
  uses it.
- Removes amount unspent from the expired funding table
 2020-02-10 14:49:04 -05:00
graham-dds
63cb05249f Add Reports domain method to get portfolio spend 2020-02-10 14:49:04 -05:00
graham-dds
baa3f390d2 Extend graph width filter to handle 0/0 2020-02-10 14:49:04 -05:00
graham-dds
55736b723e Move calc of a portfolio's obligated funds to prop 
Add a property on the portfolio model to calculate the total
obligated funds for a portfolio. This replaces a one-off calculation
in a view function, and sets up functionality for future access
 2020-02-10 14:49:04 -05:00
graham-dds
2f1c57aef4 Add fn to prepare Azure reporting data for views 2020-02-10 14:49:04 -05:00
graham-dds
411d8a877c Add sample reporting data to mock cloud provider 2020-02-10 14:49:04 -05:00
graham-dds
5716e20b9e Edit query body to aggregate by month 2020-02-10 14:49:04 -05:00
leigh-mil
ec9da2d1c1
Merge pull request #1408 from dod-ccpo/to-number-text 
Update TO number text to remove references to 13-digits
 2020-02-10 14:48:24 -05:00
leigh-mil
4ee08c0c74
Merge branch 'staging' into to-number-text 2020-02-10 14:30:56 -05:00
leigh-mil
4479c9737e Prevent double submitting in multi-step forms 2020-02-10 14:27:45 -05:00
leigh-mil
e4f23a583e Move cookieName into a variable 2020-02-10 12:12:58 -05:00
leigh-mil
84e3e0603f
Merge pull request #1403 from dod-ccpo/app-settings-fixes 
App settings fixes
 2020-02-10 11:59:44 -05:00
leigh-mil
fbd4c890f3 Default to opening TO accordions with task orders on the TO index page 2020-02-10 11:48:15 -05:00
leigh-mil
ff82e39626 Remove unsigned from the display statuses, show unsigned TOs display status as DRAFT 2020-02-10 11:48:15 -05:00