Skip to content

Commit

Permalink
added usg omb text
Browse files Browse the repository at this point in the history
  • Loading branch information
@hams7504
hams7504 committed Sep 20, 2023
1 parent 7b3439f commit 259d828
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 159 deletions.
4 changes: 2 additions & 2 deletions src/Routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ const Routes = (props) => (
{/* Order is important for processing links with embedded dataRequestIds */}
<AuthenticatedRoute path="/dar_application/:dataRequestId" component={DataAccessRequestApplication} props={props} rolesAllowed={[USER_ROLES.researcher]} />
<AuthenticatedRoute path="/dar_application" component={DataAccessRequestApplication} props={props} rolesAllowed={[USER_ROLES.researcher]} />
<AuthenticatedRoute path="/signing_official_console/researchers" component={ensureSoHasDaaAcknowledgement(SigningOfficialResearchers)} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.signingOfficial]} />
<AuthenticatedRoute path="/signing_official_console/researchers" component={ensureSoHasDaaAcknowledgement(SigningOfficialResearchers, true)} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.signingOfficial]} />
<AuthenticatedRoute path="/signing_official_console/dar_requests" component={ensureSoHasDaaAcknowledgement(SigningOfficialDarRequests)} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.signingOfficial]} />
{checkEnv(envGroups.NON_STAGING) && <AuthenticatedRoute path="/signing_official_console/data_submitters" component={ensureSoHasDaaAcknowledgement(SigningOfficialDataSubmitters, true)} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.signingOfficial]} />}
{checkEnv(envGroups.NON_STAGING) && <AuthenticatedRoute path="/signing_official_console/data_submitters" component={ensureSoHasDaaAcknowledgement(SigningOfficialDataSubmitters, false, true)} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.signingOfficial]} />}
<AuthenticatedRoute path="/dataset_registration/:datasetId" component={DatasetRegistration} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.chairperson]} />
<AuthenticatedRoute path="/dataset_update/:datasetId" component={DatasetUpdateForm} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.chairperson]} />
<AuthenticatedRoute path="/dataset_registration" component={DatasetRegistration} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.chairperson]} />
Expand Down
16 changes: 12 additions & 4 deletions src/components/SigningOfficialDaaAgreementWrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,18 @@ export const SigningOfficialDaaAgreementWrapper = (props) => {
// Wraps component and ensures that SO agrees to the
// Broad and NIH agreements before proceeding to the given
// component.
export const ensureSoHasDaaAcknowledgement = (component, isDataSubmitterTab=false) => {
return (props) => h(SigningOfficialDaaAgreementWrapper, {isDataSubmitterTab}, [
h(component, props),
]);
export const ensureSoHasDaaAcknowledgement = (component, isLibraryCardIssueTable = false, isDataSubmitterTab = false) => {
return (props) => (
div({}, [
h(SigningOfficialDaaAgreementWrapper, { isDataSubmitterTab }, [
h(component, props),
]),
isLibraryCardIssueTable && div({ style: { marginTop: '50px', background: '#eee', padding: '20px' } }, [
p({}, ['OMB No.: 0925-7775']),
p({}, ['Expiration Date: 06/30/2025']),
p({}, ['Public reporting burden for this collection of information is estimated to average 45 minutes per response, including the time for reviewing instructions, searching existing data sources, gathering and maintaining the data needed, and completing and reviewing the collection of information. An agency may not conduct or sponsor, and a person is not required to respond to, a collection of information unless it displays a currently valid OMB control number. Send comments regarding this burden estimate or any other aspect of this collection of information, including suggestions for reducing this burden to: NIH, Project Clearance Branch, 6705 Rockledge Drive, MSC 7974, Bethesda, MD 20892-7974, ATTN: PRA (0925-7775). Do not return the completed form to this address.']),
])
]));
};

export default SigningOfficialDaaAgreementWrapper;
51 changes: 29 additions & 22 deletions src/pages/DataSubmissionForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,36 +152,43 @@ export const DataSubmissionForm = (props) => {
};


return !failedInit && <div style={Styles.PAGE} >
<div style={{ display: 'flex', justifyContent: 'space-between', width: '112%', marginLeft: '-6%', padding: '0 2.5%' }}>
<div className='left-header-section' style={Styles.LEFT_HEADER_SECTION} >
<div style={Styles.ICON_CONTAINER}>
<img id='lock-icon' src={lockIcon} style={Styles.HEADER_IMG} />
</div>
<div style={Styles.HEADER_CONTAINER}>
<div style={Styles.TITLE}>
Study Registration Form
<div style={Styles.MEDIUM_DESCRIPTION}>
Submit new datasets to DUOS
return <div>
{!failedInit && <div style={Styles.PAGE} >
<div style={{ display: 'flex', justifyContent: 'space-between', width: '112%', marginLeft: '-6%', padding: '0 2.5%' }}>
<div className='left-header-section' style={Styles.LEFT_HEADER_SECTION} >
<div style={Styles.ICON_CONTAINER}>
<img id='lock-icon' src={lockIcon} style={Styles.HEADER_IMG} />
</div>
<div style={Styles.HEADER_CONTAINER}>
<div style={Styles.TITLE}>
Study Registration Form
<div style={Styles.MEDIUM_DESCRIPTION}>
Submit new datasets to DUOS
</div>
</div>
</div>
</div>
</div>
</div>

<form style={{ margin: 'auto', maxWidth: 800}}>
<form style={{ margin: 'auto', maxWidth: 800}}>


<DataSubmissionStudyInformation onChange={onChange} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NihAnvilUse onChange={onChange} formData={formData} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NIHAdministrativeInformation formData={formData} onChange={onChange} institutions={institutions} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NIHDataManagement formData={formData} onChange={onChange} onFileChange={onFileChange} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<DataAccessGovernance onChange={onChange} onFileChange={onFileChange} validation={formValidation} onValidationChange={onValidationChange} setAllConsentGroupsSaved={setAllConsentGroupsSaved} studyEditMode={studyEditMode}/>
<DataSubmissionStudyInformation onChange={onChange} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NihAnvilUse onChange={onChange} formData={formData} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NIHAdministrativeInformation formData={formData} onChange={onChange} institutions={institutions} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<NIHDataManagement formData={formData} onChange={onChange} onFileChange={onFileChange} validation={formValidation} onValidationChange={onValidationChange} studyEditMode={studyEditMode}/>
<DataAccessGovernance onChange={onChange} onFileChange={onFileChange} validation={formValidation} onValidationChange={onValidationChange} setAllConsentGroupsSaved={setAllConsentGroupsSaved} studyEditMode={studyEditMode}/>

<div className='flex flex-row' style={{justifyContent: 'flex-end', marginBottom: '2rem'}}>
<a className='button button-white' onClick={submit}>Submit</a>
</div>
</form>
<div className='flex flex-row' style={{justifyContent: 'flex-end', marginBottom: '2rem'}}>
<a className='button button-white' onClick={submit}>Submit</a>
</div>
</form>
</div>}
<div style={{ marginTop: '20px', background: '#eee', padding: '20px' }}>
<p>OMB No.: 0925-7775</p>
<p>Expiration Date: 06/30/2025</p>
<p>Public reporting burden for this collection of information is estimated to average 45 minutes per response, including the time for reviewing instructions, searching existing data sources, gathering and maintaining the data needed, and completing and reviewing the collection of information. An agency may not conduct or sponsor, and a person is not required to respond to, a collection of information unless it displays a currently valid OMB control number. Send comments regarding this burden estimate or any other aspect of this collection of information, including suggestions for reducing this burden to: NIH, Project Clearance Branch, 6705 Rockledge Drive, MSC 7974, Bethesda, MD 20892-7974, ATTN: PRA (0925-7775). Do not return the completed form to this address.</p>
</div>
</div>;
};

Expand Down
Loading

0 comments on commit 259d828

Please sign in to comment.