sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Approval info addition

This commit is contained in:
Carlos Lopez 2020-06-01 15:29:59 -06:00
parent c790737bf0
commit 3c2849f40d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crc/models/approval.py
View File

@ -69,23 +69,30 @@ class Approval(object):
instance.title = model.study.title instance.title = model.study.title
principal_investigator_id = model.study.primary_investigator_id principal_investigator_id = model.study.primary_investigator_id
instance.approver = {} instance.approver = {'uid': model.approver_uid}
instance.primary_investigator = {'uid': principal_investigator_id}
try: try:
ldap_service = LdapService() ldap_service = LdapService()
user_info = ldap_service.user_info(principal_investigator_id) # Primary investigator details
pi_info = ldap_service.user_info(principal_investigator_id)
instance.primary_investigator['uid'] = principal_investigator_id
instance.primary_investigator['display_name'] = pi_info.display_name
instance.primary_investigator['title'] = pi_info.title
instance.primary_investigator['department'] = pi_info.department
# Approver details
approver_info = ldap_service.user_info(model.approver_uid)
instance.approver['uid'] = model.approver_uid
instance.approver['display_name'] = approver_info.display_name
instance.approver['title'] = approver_info.title
instance.approver['department'] = approver_info.department
except (ApiError, LDAPSocketOpenError) as exception: except (ApiError, LDAPSocketOpenError) as exception:
user_info = None instance.primary_investigator['display_name'] = 'Primary Investigator details'
instance.approver['display_name'] = 'Primary Investigator details' instance.primary_investigator['department'] = 'currently not available'
instance.approver['display_name'] = 'Approver details'
instance.approver['department'] = 'currently not available' instance.approver['department'] = 'currently not available'
if user_info:
# TODO: Rename approver to primary investigator
instance.approver['uid'] = model.approver_uid
instance.approver['display_name'] = user_info.display_name
instance.approver['title'] = user_info.title
instance.approver['department'] = user_info.department
# TODO: Organize it properly, move it to services # TODO: Organize it properly, move it to services
# TODO: Rely on Dan's new service for file creation
doc_dictionary = FileService.get_reference_data(FileService.DOCUMENT_LIST, 'code', ['id']) doc_dictionary = FileService.get_reference_data(FileService.DOCUMENT_LIST, 'code', ['id'])
instance.associated_files = [] instance.associated_files = []
@ -118,7 +125,8 @@ class ApprovalSchema(ma.Schema):
class Meta: class Meta:
model = Approval model = Approval
fields = ["id", "study_id", "workflow_id", "version", "title", fields = ["id", "study_id", "workflow_id", "version", "title",
"version", "status", "message", "approver", "associated_files"] "version", "status", "message", "approver", "primary_investigator",
"associated_files", "date_created"]
unknown = INCLUDE unknown = INCLUDE
@marshmallow.post_load @marshmallow.post_load