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

7427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dandds
2d501525b4
Merge branch 'staging' into 171364906-billing-account-name-config 2020-02-26 11:02:33 -05:00
leigh-mil
64f5af4474
Merge pull request #1438 from dod-ccpo/design-tweaks 
Design tweaks
 2020-02-25 13:41:00 -05:00
leigh-mil
94caf37e7f Make hr full-width in revoke invite form 2020-02-24 10:00:19 -05:00
leigh-mil
b8ddbff145 Set max width on forms 2020-02-24 10:00:19 -05:00
dandds
4c9d14e10b
Merge pull request #1441 from dod-ccpo/ugh 
Don't check output status from ACR login in CI/CD.
 2020-02-21 15:53:20 -05:00
dandds
7ad97403ba Don't check output status from ACR login in CI/CD. 2020-02-21 15:35:27 -05:00
graham-dds
dd19a12381 Replace csp data factory with to_dictionary method 2020-02-21 14:31:29 -05:00
graham-dds
7b76210b6a Add Azure billing acct name for initial CSP data 2020-02-21 14:31:29 -05:00
graham-dds
bb886dbe0f Add tests for portfolio.initial_clin_dict property 
In doing this, fixed a bug on the clin.is_active property
 2020-02-21 14:31:29 -05:00
graham-dds
dba63cdd15 Refactor Portfolio to_dictionary method 
In refactoring this method, refactor some other areas:
- add a property to generate a dict needed for the "initial clin"
- add new relationship field to get all CLINs associated with a
  portfolio
- add a property to either get or generate a portfolio's domain name
- least importantly, sort imports

- On the CLIN model, add a property to get a JEDI clin type's number,
  i.e. JEDI_CLIN_3 -> 3. This should be the "initial_clin_type".
 2020-02-21 14:31:29 -05:00
graham-dds
d46ed2b5b4 Specify clin sorting in TO <> CLIN relationship 
This also removes the sorted_clins property on the task_order model
 2020-02-21 14:31:29 -05:00
graham-dds
612e254104 Add AZURE_BILLING_ACCOUNT_NAME config var 2020-02-21 13:23:19 -05:00
tomdds
08ca8eac79
Merge pull request #1433 from dod-ccpo/state-machine-unit-tests 
state machine unit tests
 2020-02-20 10:39:23 -05:00
tomdds
be53a1fd1a
Merge branch 'staging' into state-machine-unit-tests 2020-02-20 10:21:41 -05:00
leigh-mil
57ba7d5979
Merge pull request #1420 from dod-ccpo/update-clins 
Update CLINs
 2020-02-20 10:19:52 -05:00
leigh-mil
0bda0c481e Explicitly pass in kwargs instead of splatting clin and portfolio data 2020-02-19 16:07:45 -05:00
leigh-mil
5c7dfc428e Add new tests and refactor existing tests 2020-02-19 16:07:44 -05:00
leigh-mil
4dc5f2aa91 Add beat task to queue 2020-02-19 16:07:44 -05:00
leigh-mil
6ef3265cb5 Create celery task for create_billing_instruction 2020-02-19 16:03:30 -05:00
leigh-mil
aa2d353260 Add query for finding new CLINs that have not been sent. 
Use fixtures in tests.
 2020-02-19 15:59:24 -05:00
Philip Kalinsky
1f58f40cb0 state machine unit tests csp data factory 2020-02-19 14:43:56 -05:00
dandds
b0f946dd35
Merge pull request #1432 from dod-ccpo/ci-fix-again 
Set shell for failing docker login command.
 2020-02-19 14:19:30 -05:00
dandds
478a5b3e0b
Merge branch 'staging' into ci-fix-again 2020-02-19 13:53:50 -05:00
graham-dds
ad08160bfb
Merge pull request #1434 from dod-ccpo/bugfix/171243757-fix-report-header-inconsistency 
Tweak what "total portfolio value" represents
 2020-02-19 13:43:33 -05:00
graham-dds
a3e9400a0d Tweak what "total portfolio value" represents 
On the reports page, "total portfolio value" should represent the sum of
obligated funds for active task orders.
 2020-02-19 13:21:39 -05:00
leigh-mil
a6b8c673e2
Merge pull request #1430 from dod-ccpo/schedule-dispatch-send-to 
Schedule celery task for dispatch_send_task_order_files
 2020-02-19 13:18:54 -05:00
leigh-mil
1d8bb2811d Update name of function 2020-02-19 12:25:34 -05:00
leigh-mil
b8bf106a96 Move dispatch_send_task_order_files tests into a test class 2020-02-19 12:25:34 -05:00
leigh-mil
411f0477e9 Schedule celery task for dispatch_send_task_order_files 2020-02-19 12:25:34 -05:00
leigh-mil
0bb23a74ec
Merge pull request #1427 from dod-ccpo/new-portfolio-styling--v2 
portfolio form styling
 2020-02-19 12:10:08 -05:00
leigh-mil
437ed6d9b9 Update portfolio styling and move DoD component help text 2020-02-19 11:42:03 -05:00
leigh-mil
151d3f7454 Fix input width in TO form 2020-02-19 11:42:03 -05:00
leigh-mil
c5e31975e2 Fix inputs in member modal forms 2020-02-19 11:42:03 -05:00
leigh-mil
2665094136 Apply max width to all input elements. 
Update form class with better name and add form-conrainer--narrow class.
 2020-02-19 11:42:03 -05:00
leigh-mil
bd14955a6a
Merge pull request #1425 from dod-ccpo/email-notification-new-app-role 
Email notification for new app role
 2020-02-19 11:41:07 -05:00
leigh-mil
0deca6afcb Refactor tests 2020-02-19 11:12:24 -05:00
leigh-mil
207c34e536 Send email to user when App Role is created 2020-02-19 11:12:24 -05:00
tomdds
f956b41f98 Fully set up portfolio fixture for state machine tests 
Also fixes some formatting problems
 2020-02-19 10:40:06 -05:00
graham-dds
c3c9f23e53
Merge pull request #1429 from dod-ccpo/calculator-link 
Azure cloud method to get a url to the pricing calculator
 2020-02-18 16:32:22 -05:00
graham-dds
237848c2c9 Azure cloud method to get a url to the calculator 2020-02-18 16:15:07 -05:00
dandds
ce9540d755 Set shell for failing docker login command. 
On my last PR to fix this, I didn't notice that CircleCI was setting the
shell to execute with `/bin/sh -eo pipefail`, which means that the
commands will fail if any part of the command exits with 1, regardless
of whether the result is being piped anywhere else. This updates the
shell that that section of the config uses.

https://circleci.com/docs/2.0/configuration-reference/#default-shell-options
 2020-02-18 15:57:19 -05:00
Philip Kalinsky
daf4a0ba68 state machine unit tests 2020-02-18 15:56:01 -05:00
tomdds
e3397390d3
Merge pull request #1389 from dod-ccpo/state-machine-error-handling 
state machine triggers for resuming progress from a failed state
 2020-02-18 15:35:27 -05:00
tomdds
b7d044b3b1
Merge branch 'staging' into state-machine-error-handling 2020-02-18 13:08:33 -05:00
dandds
69754bbbd1
Merge pull request #1431 from dod-ccpo/ci-temp-fix 
Update Azure CLI login to container registry.
 2020-02-18 12:48:20 -05:00
dandds
9e501c1067 Update Azure CLI login to container registry. 
The Azure CLI now returns an exit code of "1" if there are any warnings
when logging into a container registry. Since our longterm goal is to
move away from CircleCI, I chose to fix this in-place rather than
integrate a credentials store or pass more config values to a `docker
login` command. Instead, this just grep the output from the Azure CLI
command to ensure it succeeded.
 2020-02-18 11:55:19 -05:00
leigh-mil
697efc92bc
Merge pull request #1414 from dod-ccpo/fix-view-only-in-ff 
Fix portfolio header in FF
 2020-02-18 09:51:14 -05:00
leigh-mil
541aa965fb Center portfolio name vertically 2020-02-17 16:54:36 -05:00
leigh-mil
b6b093850a Add div with col class around the div.row that contains the header links. 
Remove display:table from the .col styling
 2020-02-17 16:54:36 -05:00
leigh-mil
611672d449
Merge pull request #1428 from dod-ccpo/content-updates 
Content updates
 2020-02-17 16:48:47 -05:00