16ca4fa2c0
Merge branch 'rrt/dev' into feature/mail-system
2020-06-05 12:35:05 -06:00
f0db5b70fc
Adding some additional logic to the approval endpoint so that we take related approvals into account when setting the status. In addtion to prevous status options, there is a new status of "AWAITING" which means there are pending approvals before this approval that still need to be approved or canceled.
2020-06-05 14:33:00 -04:00
a6758fd555
Removing deprecation warnings
2020-06-05 12:08:46 -06:00
4fc1b51cbc
Approve/denied emails
2020-06-05 12:08:31 -06:00
b51b431534
Merge branch 'rrt/dev' into dev
2020-06-05 09:24:34 -04:00
6668ec8cf3
Merge branch 'rrt/testing' into rrt/staging
2020-06-05 09:24:21 -04:00
66cd490f8e
Merge branch 'rrt/dev' into rrt/testing
2020-06-05 09:24:09 -04:00
4727d87adb
Hooking up emails into process - start
2020-06-04 20:37:28 -06:00
b6abb0cbe2
using a restartable strategy to get around login errors
2020-06-04 18:03:59 -04:00
9cfe00dfd0
Don't bind all the time.
2020-06-04 15:38:45 -04:00
fed6e86f92
Trying to fix LDAP issues on production. Changing LDAP to static only methods, caching the connection and calling bind before all connection requests.
...
Also assuring we don't load the documents.xls file over and over again.
2020-06-04 14:59:36 -04:00
8c36d9f367
Email calls outline
2020-06-04 11:43:10 -06:00
cc6f31c850
Merge branch 'rrt/production' of github.com:sartography/cr-connect-workflow into rrt/production
2020-06-04 11:57:19 -04:00
50d2acac9c
Made a very stupid mistake with LDAP connections, pushing up quickly to production.
2020-06-04 11:57:00 -04:00
c576858667
Merge pull request #107 from sartography/rrt/dev
...
Rrt/dev
2020-06-04 11:03:02 -04:00
68aeaf1273
BE VERY CAREFUL where you create a new LdapService() - construction is expensive.
...
Adding a few more details to the "csv" endpoint for RRT.
2020-06-04 10:33:17 -04:00
bbcbfef1ba
Fixing the migrations so I don't break the universe.
2020-06-04 10:09:36 -04:00
1324533865
Some additional cleanup - when a file is "archived" it is no longer returned for any endpoints about files, but it
...
is directly accessible via id, in the event some request is made for it at a later date.
2020-06-04 09:49:42 -04:00
f581bd9f2b
Mails for approval process
2020-06-04 00:35:59 -06:00
217ecfc911
When you can't delete a file, mark it as archived. Don't include archived files in new approval requests.
2020-06-03 17:34:27 -04:00
c179c7781b
Do not process or return cancelled approvals via the API.
2020-06-03 16:50:47 -04:00
e102214809
minor cleanup of error codes.
2020-06-03 15:03:22 -04:00
0368a12eda
Merge branch 'rrt/dev' into dev
2020-06-03 10:32:57 -04:00
ac4279e533
Merge branch 'rrt/testing' into rrt/staging
2020-06-03 10:32:44 -04:00
2d5cddd957
Merge branch 'rrt/dev' into rrt/testing
2020-06-03 10:32:25 -04:00
3e1d492bb1
Merge branch 'rrt/production' of github.com:sartography/cr-connect-workflow into rrt/production
2020-06-03 08:09:58 -04:00
00a1902c71
Merge branch 'rrt/dev' into rrt/production
2020-06-03 07:59:05 -04:00
299ad4fc8b
Adding more details to the csv output, and assuring we don't miss people with outstanding approvals that were cancelled.
2020-06-03 07:58:48 -04:00
6bd2b65500
Merge branch 'rrt/dev' into dev
2020-06-03 00:02:52 -04:00
1c25e58900
Merge branch 'rrt/testing' into rrt/staging
2020-06-03 00:02:37 -04:00
09558984d1
Merge branch 'rrt/dev' into rrt/testing
2020-06-03 00:02:24 -04:00
7b8c797996
Merge pull request #103 from sartography/rrt/dev
...
Rrt/dev
2020-06-02 22:10:18 -04:00
4bf13b0718
Doing everything I can imagine to get a CSV dump out tomorrow.
2020-06-02 22:01:49 -04:00
e7c130054d
Fixing a test.
2020-06-02 20:07:56 -04:00
2424b9d78c
Don't overwrite the approval, just allow minor changes.
2020-06-02 19:36:06 -04:00
2cd6311666
as always, forgot the migration.
2020-06-02 18:17:51 -04:00
c7484267e1
For the main approval endpoints - we now group the approvals by study. So you get one record back for each study, but it may have other approvals along with it as "related_approvals".
...
We now cache the LDAP records - so we look in our own database for the record before calling out to ldap for the details when given a straight up computing id like dhf8r.
Added "date_approved" to the approval model.
And moved the approver and primary investigator into real associated models to make it easier to dump.
Fixed a problem with the validation that was causing it to throw incorrect errors on valid workflows. Getting it to behave a little more like the front end behaves, and respecting the read-only fields. But it was mainly to do with always returning all the data with each form submission.
2020-06-02 18:17:00 -04:00
a2696faa36
Merge branch 'rrt/dev' into dev
2020-06-02 08:51:18 -04:00
7cbcdc0dcd
Merge branch 'rrt/staging' into rrt/production
2020-06-02 08:50:37 -04:00
761d70eaf3
Merge branch 'rrt/testing' into rrt/staging
2020-06-02 08:50:27 -04:00
211797b843
Merge branch 'rrt/dev' into rrt/testing
2020-06-02 08:49:56 -04:00
59e91ec414
Don't add an empty approval record.
2020-06-02 08:35:19 -04:00
33a3a40586
Merge pull request #100 from sartography/rrt/dev
...
Rrt/dev
2020-06-02 07:52:41 -04:00
d8329e9eff
I completely missed pushing up my changes last night before handing back over to Carlos. Sorry about that.
...
Added checks to assure the approver matches g.uid of the current user - otherwise don't modify the approval record.
2020-06-02 07:43:19 -04:00
4090667a5d
Missed committing a pile of changes last night.
2020-06-02 07:08:29 -04:00
a78db8834c
Merge pull request #99 from sartography/feature/sentry
...
Enabling Sentry for boxes with the flag set
2020-06-02 06:28:06 -04:00
d0918e9ed3
Merge pull request #98 from sartography/fix/approvals-info
...
Approval info addition
2020-06-02 06:26:56 -04:00
95a3b22bf0
Enabling Sentry for boxes with the flag set
2020-06-01 19:59:55 -06:00
059c9f2aad
Merge branch 'feature/approvals_enhancements' of github.com:sartography/cr-connect-workflow into feature/approvals_enhancements
2020-06-01 21:49:40 -04:00
c2a1b0175a
Tweaks to approvals
2020-06-01 21:49:30 -04:00
Carlos Lopez
Dan Funk
Aaron Louie