From 77445876cd6418526c1af277c2366fbde38324ad Mon Sep 17 00:00:00 2001 From: Alec Mattu Date: Wed, 28 Jun 2023 10:18:21 -0400 Subject: [PATCH 1/5] CRDCDH-33 Implement redesigned layout --- package-lock.json | 20 +- package.json | 2 +- src/components/ProgressBar/ProgressBar.tsx | 2 +- .../Questionnaire/AdditionalContact.tsx | 153 +- .../Questionnaire/AutocompleteInput.tsx | 6 + .../Questionnaire/FormContainer.tsx | 4 +- src/components/Questionnaire/TextInput.tsx | 4 +- src/config/InstitutionConfig.ts | 1548 +++++++++++++++++ src/content/questionnaire/FormView.tsx | 12 +- src/content/questionnaire/sections/A.tsx | 128 +- src/content/questionnaire/sections/B.tsx | 1 - src/types/Application.d.ts | 5 +- src/types/Globals.d.ts | 1 - 13 files changed, 1721 insertions(+), 165 deletions(-) create mode 100644 src/config/InstitutionConfig.ts diff --git a/package-lock.json b/package-lock.json index ee5e567b3..c16e6f2d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@apollo/client": "^3.7.15", "@emotion/react": "^11.11.0", "@emotion/styled": "^11.11.0", - "@jalik/form-parser": "^2.0.12", + "@jalik/form-parser": "^3.1.0", "@mui/icons-material": "^5.11.16", "@mui/lab": "^5.0.0-alpha.130", "@mui/material": "^5.13.1", @@ -2788,12 +2788,9 @@ } }, "node_modules/@jalik/form-parser": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@jalik/form-parser/-/form-parser-2.0.12.tgz", - "integrity": "sha512-/6P3MRO+oRJMdGyuITz2+oIBi/lS+yD/O6NR6ekfjNgDbRG43aDQgnUMnANyjgyA1XZ8b0xZlNff82yrhWyIMQ==", - "dependencies": { - "@babel/runtime": "^7.19.4" - } + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jalik/form-parser/-/form-parser-3.1.0.tgz", + "integrity": "sha512-srMaLCIJMpjwyR167Q8agKnC0f7rgpl9sRtNsrlBVjkDoQjJEpJ/NmjcbNHPOwNSVBvp6/khMrNlAKTU9rzROA==" }, "node_modules/@jest/console": { "version": "27.5.1", @@ -18693,12 +18690,9 @@ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" }, "@jalik/form-parser": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/@jalik/form-parser/-/form-parser-2.0.12.tgz", - "integrity": "sha512-/6P3MRO+oRJMdGyuITz2+oIBi/lS+yD/O6NR6ekfjNgDbRG43aDQgnUMnANyjgyA1XZ8b0xZlNff82yrhWyIMQ==", - "requires": { - "@babel/runtime": "^7.19.4" - } + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jalik/form-parser/-/form-parser-3.1.0.tgz", + "integrity": "sha512-srMaLCIJMpjwyR167Q8agKnC0f7rgpl9sRtNsrlBVjkDoQjJEpJ/NmjcbNHPOwNSVBvp6/khMrNlAKTU9rzROA==" }, "@jest/console": { "version": "27.5.1", diff --git a/package.json b/package.json index ea6f2018a..eeb987408 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@apollo/client": "^3.7.15", "@emotion/react": "^11.11.0", "@emotion/styled": "^11.11.0", - "@jalik/form-parser": "^2.0.12", + "@jalik/form-parser": "^3.1.0", "@mui/icons-material": "^5.11.16", "@mui/lab": "^5.0.0-alpha.130", "@mui/material": "^5.13.1", diff --git a/src/components/ProgressBar/ProgressBar.tsx b/src/components/ProgressBar/ProgressBar.tsx index 9c708a0ee..af9c64b88 100644 --- a/src/components/ProgressBar/ProgressBar.tsx +++ b/src/components/ProgressBar/ProgressBar.tsx @@ -22,7 +22,7 @@ type ProgressSection = { }; const StyledList = styled(List)({ - marginTop: "30px", + marginTop: "22px", width: '250px', "& a": { color: "inherit", diff --git a/src/components/Questionnaire/AdditionalContact.tsx b/src/components/Questionnaire/AdditionalContact.tsx index 5d6ab87d6..7090e3be8 100644 --- a/src/components/Questionnaire/AdditionalContact.tsx +++ b/src/components/Questionnaire/AdditionalContact.tsx @@ -1,14 +1,22 @@ import React, { FC } from "react"; -import { Button, Grid, Stack } from "@mui/material"; -import PersonRemoveIcon from '@mui/icons-material/PersonRemove'; -import { WithStyles, withStyles } from '@mui/styles'; +import { Grid, styled } from "@mui/material"; +import RemoveCircleIcon from "@mui/icons-material/RemoveCircle"; +import { Status as FormStatus, useFormContext } from "../Contexts/FormContext"; +import { filterNonNumeric, validateEmail } from "../../content/questionnaire/utils"; +import institutionConfig from "../../config/InstitutionConfig"; import TextInput from "./TextInput"; -import { Status as FormStatus, useFormContext } from '../Contexts/FormContext'; -import { filterNonNumeric, validateEmail } from '../../content/questionnaire/utils'; +import AddRemoveButton from "./AddRemoveButton"; +import AutocompleteInput from "./AutocompleteInput"; + +const GridContainer = styled(Grid)({ + border: "0.5px solid #DCDCDC !important", + borderRadius: "10px", + padding: "18px 15px", + marginLeft: "12px", +}); type Props = { index: number; - classes: WithStyles['classes']; contact: AdditionalContact | null; onDelete: () => void; }; @@ -19,77 +27,82 @@ type Props = { * @param {Props} props * @returns {JSX.Element} */ -const AdditionalContact: FC = ({ index, classes, contact, onDelete }: Props) => { +const AdditionalContact: FC = ({ index, contact, onDelete }: Props) => { const { status } = useFormContext(); - const { - firstName, lastName, email, phone, role, institution, + firstName, lastName, email, + phone, role, institution, } = contact; return ( - + + + + + + + + + - - - + } + iconColor="#F18E8E" + disabled={status === FormStatus.SAVING} + /> - - - - - - - + ); }; -const styles = (theme) => ({ - root: { - border: "0.5px solid #346798", - borderRadius: "8px", - padding: "10px", - marginTop: "20px", - marginLeft: "37px", - marginRight: "-27px", - "& .MuiGrid-item": { - padding: "0 16px", - }, - [theme.breakpoints.up("md")]: { - "& .MuiGrid-item:nth-child(2n)": { - paddingLeft: "16px", - paddingRight: "32px", - }, - "& .MuiGrid-item:nth-child(2n+1)": { - paddingRight: "16px", - paddingLeft: "32px", - }, - }, - }, - contactButton: { - color: "#346798", - marginLeft: "auto", - marginRight: "28px", - marginTop: "10px", - padding: "6px 20px", - minWidth: "115px", - borderRadius: "25px", - border: "2px solid #AFC2D8 !important", - background: "transparent", - "text-transform": "none", - "& .MuiButton-startIcon": { - marginRight: "14px", - }, - }, -}); - -export default withStyles(styles, { withTheme: true })(AdditionalContact); +export default AdditionalContact; diff --git a/src/components/Questionnaire/AutocompleteInput.tsx b/src/components/Questionnaire/AutocompleteInput.tsx index 67c6465a0..c77092757 100644 --- a/src/components/Questionnaire/AutocompleteInput.tsx +++ b/src/components/Questionnaire/AutocompleteInput.tsx @@ -29,6 +29,7 @@ type Props = { gridWidth?: 2 | 4 | 6 | 8 | 10 | 12; placeholder?: string; disableClearable?: boolean; + readOnly?: boolean; onChange?: (e: React.SyntheticEvent, v: string, r: string) => void; }; @@ -194,6 +195,11 @@ const styles = () => ({ padding: "12px !important", height: "20px", }, + "& .MuiOutlinedInput-input:read-only": { + backgroundColor: "#D9DEE4", + cursor: "not-allowed", + borderRadius: "8px", + }, }, }); diff --git a/src/components/Questionnaire/FormContainer.tsx b/src/components/Questionnaire/FormContainer.tsx index 8569aad38..42fc79ff0 100644 --- a/src/components/Questionnaire/FormContainer.tsx +++ b/src/components/Questionnaire/FormContainer.tsx @@ -4,7 +4,6 @@ import { WithStyles, withStyles } from '@mui/styles'; type Props = { classes: WithStyles['classes']; - title: string; description: string; children: React.ReactNode; formRef?: MutableRefObject; @@ -17,8 +16,7 @@ type Props = { * @returns {JSX.Element} */ const FormContainer: FC = ({ - title, description, classes, children, - formRef, + description, classes, children, formRef, }) => { const id = useId(); diff --git a/src/components/Questionnaire/TextInput.tsx b/src/components/Questionnaire/TextInput.tsx index 1d99c510b..bd8d3edcb 100644 --- a/src/components/Questionnaire/TextInput.tsx +++ b/src/components/Questionnaire/TextInput.tsx @@ -76,7 +76,7 @@ const TextInput: FC = ({ useEffect(() => { if (value) { - onChange(value.toString().trim()); + onChange(value.toString().trim()); } }, [value]); @@ -176,11 +176,13 @@ const styles = (theme) => ({ "&.MuiInputBase-multiline.Mui-readOnly": { backgroundColor: "#D9DEE4", cursor: "not-allowed", + borderRadius: "8px", }, // Target readOnly inputs "& .MuiOutlinedInput-input:read-only": { backgroundColor: "#D9DEE4", cursor: "not-allowed", + borderRadius: "8px", }, }, helperText: { diff --git a/src/config/InstitutionConfig.ts b/src/config/InstitutionConfig.ts new file mode 100644 index 000000000..50667bcd6 --- /dev/null +++ b/src/config/InstitutionConfig.ts @@ -0,0 +1,1548 @@ +/** + * Configuration for Questionnaire Institution option list + */ +const options: string[] = [ + "21MEDTECH LLC", + "2WITECH SOLUTIONS LLC", + "3-C INSTITUTE FOR SOCIAL DEVELOPMENT", + "3DT HOLDINGS, LLC", + "7 HILLS PHARMA, LLC", + "ABBRATECH, INC.", + "ABVACC, INC.", + "ABZYME THERAPEUTICS, LLC", + "ACADEMIC PEDIATRIC ASSOCIATION", + "ACADEMICAL MEDICAL CENTER", + "ACATECHOL, INC.", + "ACCEL DIAGNOSTICS, LLC", + "ACCELEVIR DIAGNOSTICS, LLC", + "ACCUHEALTH TECHNOLOGIES, INC.", + "ACENXION BIOSYSTEMS, INC.", + "ACEPRE, LLC", + "ACETAMINOPHEN TOXICITY DIAGNOSTICS, LLC", + "ACOUSTIC RANGE ESTIMATES, LLC", + "ACTIOX LLC", + "ACTUATED MEDICAL, INC.", + "ADA SCIENCE AND RESEARCH INSTITUTE LLC", + "ADAPT DESIGN WORKS, LLC", + "ADAPTELLIGENCE, LLC", + "ADDGENE, INC.", + "ADDIS ABABA UNIVERSITY", + "ADELPHI UNIVERSITY", + "ADENOPAINT, LLC", + "ADEPTRIX CORPORATION", + "ADERA", + "ADVAC THERAPEUTIC, LLC", + "ADVANCED BRAIN MONITORING, INC.", + "ADVANCED GENE TRANSFER COMPANY, INC.", + "ADVANCED IMAGING RESEARCH, INC.", + "ADVANCED MEDICAL ELECTRONICS CORPORATION", + "ADVANCED SCIENCE RESEARCH CENTER", + "ADVANCED TACTILE IMAGING, INC.", + "ADVANCES IN MINERAL METABOLISM", + "ADVENT THERAPEUTICS, INC.", + "ADVENTHEALTH ORLANDO", + "AEON RESPIRE, INC.", + "AEROSOL DYNAMICS, INC.", + "AETON THERAPEUTICS, INC.", + "AFRICA UNIVERSITY", + "AG BELL ASSN FOR DEAF & HARD OF HEARING", + "AGA KHAN UNIVERSITY (KENYA)", + "AGA KHAN UNIVERSITY (PAKISTAN)", + "AHMADU BELLO UNIVERSITY", + "AIMMAX THERAPEUTICS, INC.", + "AIVOCODE, LLP", + "ALABAMA FIRE COLLEGE", + "ALABAMA STATE UNIVERSITY", + "ALASKA PACIFIC UNIVERSITY", + "ALBANY COLLEGE OF PHARMACY", + "ALBANY MEDICAL COLLEGE", + "ALBERT EINSTEIN COLLEGE OF MEDICINE", + "ALBERT EINSTEIN HEALTHCARE NETWORK", + "ALFRED I. DU PONT HOSP FOR CHILDREN", + "ALIDA BIOSCIENCES, INC.", + "ALLEGHENY-SINGER RESEARCH INSTITUTE", + "ALLEN INSTITUTE", + "ALLERDIA INC", + "ALLEVIANT MEDICAL, INC.", + "ALLIED INNOVATIVE SYSTEMS, LLC", + "ALPHA YOUNG LLC", + "ALTALITY, INC.", + "ALTAMED HEALTH SERVICES CORPORATION", + "ALTEC, INC.", + "ALTIS BIOSYSTEMS, INC.", + "ALTIUS INSTITUTE FOR BIOMEDICAL SCIENCES", + "ALTRUMED LLC", + "ALZHEIMER'S ASSOCIATION", + "ALZHEON, INC.", + "AMERICAN ACADEMY OF AUDIOLOGY, INC.", + "AMERICAN ACADEMY-CHILD/ADOLESCENT PSYCH", + "AMERICAN AGING ASSOCIATION, INC.", + "AMERICAN ASSOCIATION FOR DENTAL, ORAL, AND CRANIOFACIAL RESEARCH", + "AMERICAN COCHLEAR IMPLANT ALLIANCE FDN", + "AMERICAN COLLEGE OF RADIOLOGY", + "AMERICAN GASTROENTEROLOGICAL ASSN/INST", + "AMERICAN MEDICAL INFORMATICS ASSN", + "AMERICAN PSYCHOLOGICAL ASSOCIATION", + "AMERICAN PSYCHOSOMATIC SOCIETY (APS)", + "AMERICAN SOCIETY FOR BONE & MINERAL RES", + "AMERICAN SOCIETY FOR NEUROCHEMISTRY", + "AMERICAN SOCIETY OF ADDICTION MEDICINE", + "AMERICAN SOCIETY OF ANDROLOGY", + "AMERICAN SOCIETY OF GENE & CELL THERAPY", + "AMERICAN SOCIETY OF PREVENTIVE ONCOLOGY, INC.", + "AMERICAN SPEECH-LANGUAGE-HEARING ASSN", + "AMERICAN UNIVERSITY", + "AMERICAN UNIVERSITY OF BEIRUT", + "AMPLIFIDX INC", + "AMPLIFIED SCIENCES, LLC", + "AMPLO BIOTECHNOLOGY, INC.", + "AMYLOIDOSIS RESEARCH CONSORTIUM, INC.", + "ANAGIN", + "ANTIDOTE THERAPEUTICS, INC.", + "ANTIGER THERAPEUTICS INC.", + "APEX ORTHOPAEDIC TECHNOLOGIES LLC", + "APEXIMMUNE THERAPEUTICS INC.", + "APHIOS CORPORATION", + "APIS THERAPEUTICS, LLC", + "APPLIED BIOMEDICAL SCIENCE INSTITUTE", + "APPLIED NANOSTRUCTURES, INC.", + "APPLIED PHYSICS SYSTEMS, INC.", + "APPLIED UNIVERSAL DYNAMICS CORPORATION", + "APREA THERAPEUTICS, INC.", + "APT THERAPEUTICS, INC.", + "APTITUDE MEDICAL SYSTEMS, INC.", + "APTUS BIOSCIENCES LLC", + "AQUILLIUS CORPORATION", + "ARACARI BIOSCIENCES, INC.", + "ARC BIO, LLC", + "ARCASCOPE, INC", + "ARCHE VR LLC", + "ARIETIS", + "ARIMA GENOMICS, INC.", + "ARISAN THERAPEUTICS, INC.", + "ARIZONA STATE UNIVERSITY-TEMPE CAMPUS", + "ARIZONA VETERANS RESEARCH AND EDUCATION FOUNDATION", + "ARKANSAS CHILDREN'S HOSPITAL RES INST", + "ARONORA, INC.", + "ARREVUS, INC.", + "ARTERY THERAPEUTICS, INC.", + "ASCAN L. L. C.", + "ASCENT BIO-NANO TECHNOLOGIES, INC.", + "ASCRIBE BIOSCIENCE INC.", + "ASELL, LLC", + "ASOCIACION CIVIL IMPACTA SALUD Y EDUCACN", + "ASTERO ERADO INC", + "ASTRAEA THERAPEUTICS, LLC", + "ATGC, INC.", + "AUBURN UNIVERSITY AT AUBURN", + "AUBURN UNIVERSITY AT MONTGOMERY", + "AUGUSTA UNIVERSITY", + "AUGUSTANA COLLEGE", + "AURORA ONCOLOGY, INC.", + "AURUM INSTITUTE NPC", + "AUSCULTECH DX, LLC", + "AUTOIVF, INC.", + "AUTOMATED IMAGING DIAGNOSTICS, LLC", + "AUTONOMOUS HEALTHCARE, INC.", + "AUXILIUM BIOTECHNOLOGIES INC.", + "AVENTUSOFT, LLC", + "AVERA MCKENNAN", + "AVERY DIGITAL DATA, INC.", + "AVM BIOTECHNOLOGY, LLC", + "AXONIS, INC.", + "AYUDA MEDICAL", + "AYUVIS RESEARCH, INC.", + "AZTEK BIO, INC.", + "BACKYARD BRAINS, INC.", + "BAEBIES, INC.", + "BAIRITONE HEALTH INC.", + "BALL STATE UNIVERSITY", + "BANNER HEALTH", + "BARNARD COLLEGE", + "BARRETT TECHNOLOGY, LLC", + "BARRON ASSOCIATES, INC.", + "BARUCH S. BLUMBERG INSTITUTE", + "BATTELLE CENTERS/PUB HLTH RES & EVALUATN", + "BATTELLE PACIFIC NORTHWEST LABORATORIES", + "BAYLOR COLLEGE OF MEDICINE", + "BAYLOR RESEARCH INSTITUTE", + "BAYLOR UNIVERSITY", + "BAYSTATE MEDICAL CENTER, INC.", + "BEAM DIAGNOSTICS, INC.", + "BEAVER HEALTH, INC.", + "BECKMAN RESEARCH INSTITUTE/CITY OF HOPE", + "BEHAIVIOR, LLC", + "BENAROYA RESEARCH INST AT VIRGINIA MASON", + "BENEDICT COLLEGE", + "BENNUBIO INC", + "BENTLEY UNIVERSITY", + "BERKSHIRE BIOMEDICAL CORPORATION", + "BERNARD M. BARUCH COLLEGE", + "BETH ISRAEL DEACONESS MEDICAL CENTER", + "BETTERHOPE LLC", + "BIG EYE DIAGNOSTICS, INC.", + "BIO TILLION, LLC", + "BIOCHIP LABS, INC.", + "BIOCIRCUIT TECHNOLOGIES, INC.", + "BIOLINQ INCORPORATED", + "BIOLOGICAL MIMETICS, INC.", + "BIOMED CONSULTING, INC.", + "BIOMEDICAL DEVELOPMENT CORPORATION", + "BIOMEDICAL ENGINEERING SOCIETY", + "BIOMEDICAL RESEARCH & TRAINING INSTITUTE", + "BIOSENSICS, LLC", + "BIOSENSING INSTRUMENT, INC.", + "BIOSURFACES", + "BIOTECHNOLOGY RESEARCH INSTITUTE-KALRO", + "BIOTHERAPEUTICS, INC.", + "BIOVINC, LLC", + "BIVACOR, INC.", + "BLOODWORKS", + "BLUE OAK PHARMACEUTICALS, INC.", + "BLUEWILLOW BIOLOGICS, INC.", + "BOISE STATE UNIVERSITY", + "BOLD TYPE LLC", + "BOLDEN THERAPEUTICS, INC.", + "BOLDER BIOTECHNOLOGY, INC.", + "BONDWELL TECHNOLOGIES LP", + "BOSTON CHILDREN'S HOSPITAL", + "BOSTON COLLEGE", + "BOSTON IMMUNE TECHNOLOGIES AND THERAPEUTICS, INC.", + "BOSTON MEDICAL CENTER", + "BOSTON UNIVERSITY (CHARLES RIVER CAMPUS)", + "BOSTON UNIVERSITY MEDICAL CAMPUS", + "BOSTON VA RESEARCH INSTITUTE, INC.", + "BOTSWANA-HARVARD AIDS INSTITUTE", + "BOWIE STATE UNIVERSITY", + "BOWLING GREEN STATE UNIVERSITY", + "BOYCE THOMPSON INST FOR PLANT RESEARCH", + "BRAIN ELECTROPHYSIOLOGY LABORATORY COMPANY, LLC", + "BRAIN THRIVE TECHNOLOGY LLC", + "BRANDEIS UNIVERSITY", + "BRIGHAM AND WOMEN'S HOSPITAL", + "BRIGHAM YOUNG UNIVERSITY", + "BRIGHT URO, INC.", + "BRIGHTSPEC, INC.", + "BRIOPRYME BIOLOGICS, INC.", + "BROAD INSTITUTE, INC.", + "BROOKLYN COLLEGE", + "BROWN UNIVERSITY", + "BUBBLEOLOGY RESEARCH INTERNATIONAL, INC.", + "BUCK INSTITUTE FOR RESEARCH ON AGING", + "BUCKNELL UNIVERSITY", + "BUTLER HOSPITAL (PROVIDENCE, RI)", + "CADRE BIOSCIENCE, LLC", + "CALIFORNIA INSTITUTE OF TECHNOLOGY", + "CALIFORNIA MEDICAL INNOVATIONS INSTITUTE", + "CALIFORNIA PACIFIC MED CTR RES INSTITUTE", + "CALIFORNIA POLY STATE U SAN LUIS OBISPO", + "CALIFORNIA STATE POLY U POMONA", + "CALIFORNIA STATE UNIV SAN BERNARDINO", + "CALIFORNIA STATE UNIV, MONTEREY BAY", + "CALIFORNIA STATE UNIV-DOMINGUEZ HILLS", + "CALIFORNIA STATE UNIVERSITY BAKERSFIELD AUXILIARY FOR SPONSORED PROGRAMS ADMINISTRATION", + "CALIFORNIA STATE UNIVERSITY FRESNO", + "CALIFORNIA STATE UNIVERSITY FULLERTON", + "CALIFORNIA STATE UNIVERSITY HAYWARD", + "CALIFORNIA STATE UNIVERSITY LONG BEACH", + "CALIFORNIA STATE UNIVERSITY LOS ANGELES", + "CALIFORNIA STATE UNIVERSITY NORTHRIDGE", + "CALIFORNIA STATE UNIVERSITY SACRAMENTO", + "CALIFORNIA STATE UNIVERSITY SAN MARCOS", + "CALIMETRIX, LLC", + "CAMBRIDGE HEALTH ALLIANCE", + "CAPTIS DIAGNOSTICS", + "CARAHSOFT TECHNOLOGY CORPORATION", + "CARDIFF UNIVERSITY", + "CARDIO-THERANOSTICS LLC", + "CARE.COACH CORPORATION", + "CARLE FOUNDATION", + "CARNEGIE INSTITUTION OF WASHINGTON, D.C.", + "CARNEGIE-MELLON UNIVERSITY", + "CAROGEN CORPORATION", + "CAROLINAS MEDICAL CENTER", + "CASE WESTERN RESERVE UNIVERSITY", + "CASTNER INCORPORATED", + "CATHOLIC UNIVERSITY OF AMERICA", + "CAUCASECO SCIENTIFIC RESEARCH CENTER", + "CEDARS-SINAI MEDICAL CENTER", + "CELDARA MEDICAL, LLC", + "CELESTIAL ONCOLOGY INC.", + "CELESTIAL THERAPEUTICS INC.", + "CELL MICROSYSTEMS, INC.", + "CELL PRESERVATION SERVICES, INC.", + "CELLARCUS BIOSCIENCES INC", + "CELLCHORUS INC.", + "CELLECTGEN, INC.", + "CELLIA SCIENCE, INC.", + "CENTER FOR CONSTRUCTION RES AND TRAINING", + "CENTER FOR OPEN SCIENCE", + "CENTRAL MICHIGAN UNIVERSITY", + "CENTRE DE RECHERCHE DE L'HOPITAL DOUGLAS", + "CENTRE FOR ADDICTION AND MENTAL HEALTH", + "CENTRE FOR CHRONIC DISEASE CONTROL", + "CENTRE/AIDS PROGRAMME/RES/SOUTH AFRICA", + "CENTREXION THERAPEUTICS CORPORATION", + "CENTRO INTERNACIONAL (CIDEIM)", + "CERAMEDIX HOLDING, LLC", + "CEREVEL THERAPEUTICS, LLC", + "CFD RESEARCH CORPORATION", + "CG SCIENTIFIC, INC.", + "CHAPMAN UNIVERSITY", + "CHARLES R. DREW UNIVERSITY OF MED & SCI", + "CHARLES RIVER ANALYTICS, INC.", + "CHEMILY, LLC", + "CHESS MOBILE HEALTH, INC.", + "CHESTNUT HEALTH SYSTEMS, INC.", + "CHIANG MAI UNIVERSITY", + "CHICAGO ASSN FOR RESEARCH & EDUC IN SCI", + "CHICAGO BIOSOLUTIONS, INC.", + "CHILD MIND INSTITUTE, INC.", + "CHILDREN'S CANCER THERAPY DEVELOP/INST", + "CHILDREN'S HOSP OF PHILADELPHIA", + "CHILDREN'S HOSPITAL MED CTR OF AKRON", + "CHILDREN'S HOSPITAL OF LOS ANGELES", + "CHILDREN'S HOSPITAL OF ORANGE COUNTY", + "CHILDREN'S HOSPITAL OF WISCONSIN", + "CHILDREN'S HOSPITALS AND CLINICS", + "CHILDREN'S MERCY HOSP (KANSAS CITY, MO)", + "CHILDREN'S RESEARCH INSTITUTE", + "CHINA MEDICAL UNIVERSITY", + "CHITOZAN HEALTH, LLC", + "CHLAMYDIA BASIC RESEARCH SOCIETY", + "CHRISTIAN MEDICAL COLLEGE", + "CINCINNATI CHILDRENS HOSP MED CTR", + "CITY COLLEGE OF NEW YORK", + "CITY LABS, INC.", + "CLAFLIN UNIVERSITY", + "CLAIRIGENE, LLC", + "CLARAMETYX BIOSCIENCE, INC.", + "CLARITYTEK, INC.", + "CLARK ATLANTA UNIVERSITY", + "CLARK UNIVERSITY (WORCESTER, MA)", + "CLARKSON UNIVERSITY", + "CLEARVOYA LLC", + "CLEMSON UNIVERSITY", + "CLEU DIAGNOSTICS, LLC", + "CLEVELAND CLINIC LERNER COM-CWRU", + "CLEVELAND STATE UNIVERSITY", + "CMTX BIOTECH, INC.", + "CND LIFE SCIENCES, INC.", + "COAPT, LLC", + "COASTAL MARINE BIOLABS", + "COGNITA LABS, LLC", + "COHERE-MED, INC.", + "COLD SPRING HARBOR LABORATORY", + "COLLABORATIONS PHARMACEUTICALS, INC.", + "COLLABORATIVE DRUG DISCOVERY, INC.", + "COLLAGEN MEDICAL, LLC", + "COLLEGE AT OSWEGO", + "COLLEGE OF MEDICINE, UNIVERSITY OF IBADAN", + "COLLEGE OF NEW JERSEY", + "COLLEGE OF STATEN ISLAND", + "COLLEGE OF WILLIAM AND MARY", + "COLLEGE ON PROBLEMS OF DRUG DEPENDENCE", + "COLORADO SCHOOL OF MINES", + "COLORADO STATE UNIVERSITY", + "COLUMBIA UNIV NEW YORK MORNINGSIDE", + "COLUMBIA UNIVERSITY HEALTH SCIENCES", + "COLUMBIA UNIVERSITY TEACHERS COLLEGE", + "COMMONWEALTH SCIENTIFIC & INDUST RES ORG", + "COMPREHENSIVE CANCER CENTER/ UNIV/PR", + "COMPUTER TECHNOLOGY ASSOCIATES, INC.", + "CONNECTICUT AGRICULTURAL EXPERIMENT STA", + "CONNECTICUT CHILDREN'S MEDICAL CENTER", + "CONSTANTIAM BIOSCIENCES INC.", + "CONTINUOUS PRECISION MEDICINE, INC.", + "CONVERGENT ENGINEERING, INC.", + "COOK CHILDREN'S MEDICAL CENTER", + "CORIDEA, LLC", + "CORIELL INSTITUTE FOR MEDICAL RESEARCH", + "CORNELL UNIVERSITY", + "COVIRA SURGICAL", + "CREATIVE MICRO DESIGNS, INC.", + "CREIGHTON UNIVERSITY", + "CREMEDICAL CORPORATION", + "CRIMSON BIOPHARM INC", + "CRM MEDICAL DEVICES, INC.", + "CRYOCRATE, LLC", + "CUNY GRADUATE SCH AND UNIV CTR", + "CURATIX, LLC", + "CURE NETWORK DOLBY ACCELERATION PARTNERS LLC", + "CURI BIO INC", + "CURIO BIOSCIENCE INC.", + "CURRENT SURGICAL INC.", + "CYANVAC, LLC", + "CYTEX THERAPEUTICS INC.", + "CYTOCYBERNETICS, INC.", + "CYTODEL, INC.", + "CYTOSORBENTS, INC.", + "DANA-FARBER CANCER INST", + "DARTMOUTH COLLEGE", + "DARTMOUTH-HITCHCOCK CLINIC", + "DAYI THERAPEUTICS, INC.", + "DE PAUL UNIVERSITY", + "DEEP CREEK PHARMA, LLC", + "DEEP SOUTH CENTER FOR ENVIRONMENTAL JUSTICE, INC.", + "DEGRANIN THERAPEUTICS, LLC", + "DELAWARE STATE UNIVERSITY", + "DENVER HEALTH AND HOSPITAL AUTHORITY", + "DESICORP, INC.", + "DESMOND TUTU HIV FOUNDATION", + "DFUSION, INC.", + "DIGITAL HEALTH NAVIGATION SOLUTIONS, LLC", + "DIGITAL SCIENCE AND RESEARCH SOLUTIONS, INC.", + "DIGNIFY THERAPEUTICS, LLC", + "DILLARD UNIVERSITY", + "DL ADV-TECH, LLC", + "DNASTAR, INC.", + "DOHENY EYE INSTITUTE", + "DORDT COLLEGE", + "DOTY SCIENTIFIC, INC.", + "DOXY.ME, LLC", + "DPLEXBIO INC.", + "DREXEL UNIVERSITY", + "DRINKSAVVY, INC.", + "DRYAD", + "DUKE UNIVERSITY", + "DUQUESNE UNIVERSITY", + "DXDISCOVERY, INC.", + "DYAD MEDICAL, INC.", + "DYNAMOID, LLC", + "DYNOCARDIA, INC.", + "EAST CAROLINA UNIVERSITY", + "EAST TENNESSEE STATE UNIVERSITY", + "EASTERN VIRGINIA MEDICAL SCHOOL", + "ECLIPSE LIFE SCIENCES, INC.", + "ECOG-ACRIN MEDICAL RESEARCH FOUNDATION", + "ECOHEALTH ALLIANCE, INC.", + "EDUCATION DEVELOPMENT CENTER, INC.", + "EFFECTORBIO, INC.", + "EIP PHARMA, INC.", + "ELDEC PHARMACEUTICALS, INC.", + "ELECTRONIC BIOSCIENCES, INC.", + "ELECTRONUCLEICS, INC.", + "ELEMENTS ENDOSCOPY INC", + "ELIAZ THERAPEUTICS, INC.", + "ELLISON INSTITUTE, LLC", + "ELPIDATEC INC.", + "ELSEVIER, INC.", + "ELYSIUM HEALTH, INC.", + "EMMA PENDLETON BRADLEY HOSPITAL", + "EMMUNE, INC", + "EMMYON, INC.", + "EMOCHA MOBILE HEALTH, INC.", + "EMORY UNIVERSITY", + "E-MSION, INC.", + "ENABLE BIOSCIENCES, INC.", + "ENDOCRINE SOCIETY", + "ENSPECTRA HEALTH, INC.", + "ENUMERIX, INC.", + "EPICYPHER, INC.", + "EPIGEN BIOSCIENCES, INC.", + "EPIODYNE, INC.", + "EPITEL, INC.", + "EQUITI FOODS, LLC", + "ERASMUS MEDICAL CENTER", + "ESPIRA, INC.", + "EUROPEAN MOLECULAR BIOLOGY LABORATORY", + "EVA PERON ACUTE INTERZONAL GEN HOSPITAL", + "EVIDENCE-BASED PRACTICE INSTITUTE, INC.", + "EVON MEDICS, LLC", + "EVRYS BIO, LLC", + "EXBAQ LLC", + "FACULTAD LATINOAMERICANA DE CIENCIAS SOCIALES", + "FAMILY HEALTH INTERNATIONAL", + "FATHER FLANAGAN'S BOYS' HOME", + "FAYETTEVILLE STATE UNIVERSITY", + "FEDERAL UNIVERSITY OF BAHIA", + "FEDERATION OF AMER SOC FOR EXPER BIOLOGY", + "FEINSTEIN INSTITUTE FOR MEDICAL RESEARCH", + "FERROLOGIX, INC.", + "FETAL LIFE, LLC", + "FIBROTHERAPEUTICS, INC.", + "FIMBRION THERAPEUTICS, INC.", + "FIRST LIGHT DIAGNOSTICS , INC.", + "FISCHER IMAGING, INC.", + "FISTULA SOLUTION CORPORATION", + "FLORIDA AGRICULTURAL AND MECHANICAL UNIV", + "FLORIDA ATLANTIC UNIVERSITY", + "FLORIDA INSTITUTE OF TECHNOLOGY", + "FLORIDA INTERNATIONAL UNIVERSITY", + "FLORIDA STATE UNIVERSITY", + "FLUENT BIOSCIENCES INC.", + "FORDHAM UNIVERSITY", + "FORSYTH INSTITUTE", + "FORT LEWIS COLLEGE", + "FOUNDATION FOR AIDS RESEARCH", + "FOUNDATION FOR APPLIED MOLECULAR EVOLUTN", + "FOUNDATION FOR RESEARCH DEVELOPMENT", + "FOUNDATION FOR THE NIH", + "FOUR POINTS TECHNOLOGY, LLC", + "FOX CHASE CHEMICAL DIVERSITY CENTER, INC", + "FRED HUTCHINSON CANCER CENTER", + "FRIENDS RESEARCH INSTITUTE, INC.", + "FRONTIER SCI & TECHNOLOGY RSCH FDN, INC", + "FUNDACAO FACULDADE DE MEDICINA", + "FUNDACAO MANHICA", + "FUNDACAO OSWALDO CRUZ", + "FURANICA, INC.", + "FURMAN UNIVERSITY", + "FZATA, INC.", + "G5 BIOLOGICAL INNOVATIONS L.L.C.", + "GEISINGER CLINIC", + "GELSANA THERAPEUTICS, INC.", + "GENEIAL LLC", + "GENERAL NUTRACEUTICAL TECHNOLOGY, LLC", + "GENETAG TECHNOLOGY, INC.", + "GENNEXT TECHNOLOGIES, INC.", + "GEORGE MASON UNIVERSITY", + "GEORGE WASHINGTON UNIVERSITY", + "GEORGETOWN UNIVERSITY", + "GEORGIA INSTITUTE OF TECHNOLOGY", + "GEORGIA SOUTHERN UNIVERSITY", + "GEORGIA STATE UNIVERSITY", + "GERONTOLOGICAL SOCIETY OF AMERICA", + "GHESKIO CENTER", + "GIGAMUNE, INC.", + "GINER, INC.", + "GLOBAL ALLIANCE FOR TB DRUG DEVELOPMENT", + "GLYCAN THERAPEUTICS CORPORATION", + "GLYCOSCIENTIFIC, LLC", + "GLYCOT THERAPEUTICS, LLC", + "GODX, INC.", + "GOEPPERT, LLC", + "GORDON RESEARCH CONFERENCES", + "GRADUATE SCHOOL OF PUBLIC HEALTH AND HEALTH POLICY", + "GRIFFITH UNIVERSITY", + "GRYPHON BIO, INC.", + "GUIDING TECHNOLOGIES CORPORATION", + "H. LEE MOFFITT CANCER CTR & RES INST", + "HABITAWARE, INC.", + "HACKENSACK UNIVERSITY MEDICAL CENTER", + "HAFION, LLC", + "HAIMA THERAPEUTICS, LLC", + "HALOMINE, INC.", + "HAMPTON UNIVERSITY", + "HANOI MEDICAL UNIVERSITY", + "HARLINGENE LIFE SCIENCES LLC", + "HARTFORD HOSPITAL", + "HARVARD MEDICAL SCHOOL", + "HARVARD PILGRIM HEALTH CARE, INC.", + "HARVARD SCHOOL OF PUBLIC HEALTH", + "HARVARD UNIVERSITY", + "HAUPTMAN-WOODWARD MEDICAL RESEARCH INST", + "HAVA HEALTH INC", + "HAWAII BIOTECH, INC.", + "HDT BIO CORPORATION", + "HEALTHPARTNERS INSTITUTE", + "HEARING LOSS ASSOCIATION OF AMERICA", + "HEBREW REHABILITATION CENTER FOR AGED", + "HEBREW UNIVERSITY OF JERUSALEM", + "HEKTOEN INSTITUTE FOR MEDICAL RESEARCH", + "HELIGENICS INC", + "HELIXBIND, INC.", + "HELLO ROBOT INC", + "HEMEX HEALTH, INC.", + "HENNEPIN HEALTHCARE RESEARCH INSTITUTE", + "HENRY FORD HEALTH SYSTEM", + "HENRY M. JACKSON FDN FOR THE ADV MIL/MED", + "HERBERT H. LEHMAN COLLEGE", + "HESPEROS, LLC", + "HIGH POINT UNIVERSITY", + "HILIGHT SURGICAL, INC.", + "HILLHURST BIOPHARMACEUTICALS, INC.", + "HOFSTRA UNIVERSITY", + "HOLOCLARA, INC.", + "HOMESRENEWED VENTURES LLC", + "HOSPITAL FOR SICK CHLDRN (TORONTO)", + "HOSPITAL FOR SPECIAL SURGERY", + "HOWARD UNIVERSITY", + "HUGO W. MOSER RES INST KENNEDY KRIEGER", + "HUMAN CELL CO", + "HUNGRY HEART MEDIA, INC.", + "HUNTER COLLEGE", + "HUNTINGTON MEDICAL RESEARCH INSTITUTES", + "HYDROCISION INC", + "HYPNOSCIENTIFIC, INC.", + "IAS", + "ICAHN SCHOOL OF MEDICINE AT MOUNT SINAI", + "IDAHO STATE UNIVERSITY", + "IDAHO VETERANS RESEARCH / EDUCATION FDN", + "IDEAL MEDICAL TECHNOLOGIES, INC.", + "I-FUNCTION, INC.", + "IHC HEALTH SERVICES, INC.", + "IHP THERAPEUTICS, INC.", + "ILIAD BIOTECHNOLOGIES, LLC", + "ILLINOIS INSTITUTE OF TECHNOLOGY", + "IMMUNEXT, INC.", + "IMPERIAL COLLEGE OF SCIENCE, TECHNOLOGY AND MEDICINE", + "INDIANA UNIV-PURDUE UNIV AT INDIANAPOLIS", + "INDIVIOR, INC.", + "INDOOR BIOTECHNOLOGIES", + "INFECTIOUS DISEASES INSTITUTE", + "INFECTIOUS DISEASES RES COLLABORATION", + "INFINITE BIOMEDICAL TECHNOLOGIES, LLC", + "INFIXION BIOSCIENCE, INC.", + "INFLAMED, INC.", + "INFOTECH SOFT, INC.", + "INHALON BIOPHARMA, INC.", + "INJECTSENSE, INC.", + "INNOVAGYN, INC.", + "INNOVATION RESEARCH AND TRAINING, INC.", + "INNOVATIVE BIOTHERAPIES, INC.", + "INOVODEL, INC.", + "INSERM STRASBOURG", + "INSOMA BIO, INC.", + "INSTANOSIS, INC.", + "INSTITUT JEAN PAOLI & IRENE CALMETTES CENTRE REGIONAL DE LUTTE CONTRE LE CANCER", + "INSTITUT PASTEUR DE TUNIS", + "INSTITUT PASTEUR DU CAMBODGE", + "INSTITUTE FOR BASIC RES IN DEV DISABIL", + "INSTITUTE FOR MOLECULAR MEDICINE", + "INSTITUTE FOR SYSTEMS BIOLOGY", + "INSTITUTE OF HUMAN VIROLOGY", + "INSTITUTE/PRACTICE/PROVIDER/PERF/ IMPROV", + "INSTITUTO DE EFECTIVIDAD CLINICA Y SANIT", + "INTACT THERAPEUTICS, INC.", + "INTEGRAL MOLECULAR", + "INTEGRATED MEDICAL SENSORS", + "INTERNATIONAL AGENCY FOR RES ON CANCER", + "INTERNATIONAL AIDS VACCINE INITIATIVE", + "INTERNATIONAL ASSOCIATION FIRE FIGHTERS", + "INTERNATIONAL BROTHERHOOD OF TEAMSTERS", + "INTERNATIONAL CANNABINOID RES SOCIETY", + "INTERNATIONAL CHEMICAL WORKERS UNION", + "INTERNATIONAL CTR/DIARRHOEAL DIS RES", + "INTERNATIONAL EOSINOPHIL SOCIETY, INC.", + "INTERNATIONAL MAMMALIAN GENOME SOCIETY", + "INTERNATIONAL UNION, UAW OF AMER AFL-CIO", + "INTRALYTIX, INC.", + "INVENIO IMAGING INC.", + "INXSOL, LLC", + "IOWA STATE UNIVERSITY", + "IRX REMINDER, LLC", + "ISA ASSOCIATES, INC.", + "ISABL INC.", + "ISCA TECHNOLOGIES, INC.", + "ISOFORMIX, INC.", + "ISTOVISR", + "J P LABORATORIES, INC", + "J. CRAIG VENTER INSTITUTE, INC.", + "J. DAVID GLADSTONE INSTITUTES", + "JACKSON LABORATORY", + "JACKSON STATE UNIVERSITY", + "JAEB CENTER FOR HEALTH RESEARCH, INC.", + "JAMES MADISON UNIVERSITY", + "JAN BIOTECH, INC.", + "JB HEALTHTECH, INC.", + "JBS SCIENCE, INC.", + "JOHN JAY COLLEGE OF CRIMINAL JUSTICE", + "JOHNS HOPKINS UNIVERSITY", + "JOINT CLINICAL RESEARCH CENTER", + "JORDAN UNIVERSITY/SCIENCE & TECHNOLOGY", + "JORVEC CORPORATION", + "JOSLIN DIABETES CENTER", + "KAISER FOUNDATION RESEARCH INSTITUTE", + "KALOCYTE, INC.", + "KANSAS STATE UNIVERSITY", + "KARIOS TECHNOLOGIES, LLC", + "KAROLINSKA INSTITUTE", + "KATHOLIEKE UNIVERSITEIT LEUVEN", + "KAYOTHERA INC.", + "KECK GRADUATE INST OF APPLIED LIFE SCIS", + "KENNESAW STATE UNIVERSITY", + "KENT COUNTY MEMORIAL HOSPITAL", + "KENT STATE UNIVERSITY", + "KENYA MEDICAL RESEARCH INSTITUTE (KEMRI)", + "KENYATTA NATIONAL HOSPITAL", + "KENYATTA UNIVERSITY", + "KENYON COLLEGE", + "KEPHERA DIAGNOSTICS, LLC", + "KESSLER FOUNDATION, INC.", + "KEYSTONE SYMPOSIA", + "KHON KAEN UNIVERSITY", + "KILIMANJARO CHRISTIAN MEDICAL CENTRE", + "KILLER SNAILS LLC", + "KINETA, INC.", + "KINETIC RIVER CORPORATION", + "KINIMA, INC.", + "KINOXIS THERAPEUTICS PTY LTD", + "KINTO", + "KITWARE, INC.", + "KLEIN BUENDEL, INC.", + "KORONIS BIOMEDICAL TECHNOLOGIES CORPORAT", + "KOVINA THERAPEUTICS INC.", + "KSANA HEALTH, INC.", + "KWAZULU-NATAL RESEARCH INSTITUTE TB-HIV", + "KYEVO-MOGYLYANSKA AKADEMIYA, NATSIONALNY UNIVERSYTET", + "LA JOLLA INSTITUTE FOR IMMUNOLOGY", + "LAMPROGEN, INC.", + "LANKENAU INSTITUTE FOR MEDICAL RESEARCH", + "LARIX BIOSCIENCE, LLC", + "LAUREATE INSTITUTE FOR BRAIN RESEARCH", + "LAWRENCE LIVERMORE NATIONAL SECURITY, LLC", + "LEBRUN LABS, LLC", + "LEGACY EMANUEL HOSPITAL AND HEALTH CENTER", + "LEHIGH UNIVERSITY", + "LEIDEN UNIVERSITY MEDICAL CENTER", + "LENA BIOSCIENCES, INC.", + "LEWIS AND CLARK COLLEGE", + "LIEBER INSTITUTE, INC.", + "LIFE ANALYTICS, INC.", + "LIFECANVAS TECHNOLOGIES, INC.", + "LIFEGENE-BIOMARKS, INC.", + "LIGHTOPTECH CORPORATION", + "LIGO ANALYTICS, INC.", + "LINNAEUS THERAPEUTICS, LLC", + "LIPELLA PHARMACEUTICALS, INC.", + "LITRON LABORATORIES, LTD.", + "LOMA LINDA UNIVERSITY", + "LOMA LINDA VETERANS ASSN RESEARCH & EDUC", + "LONDON SCH/HYGIENE & TROPICAL MEDICINE", + "LONG ISLAND UNIVERSITY BROOKLYN CAMPUS", + "LOUISIANA STATE UNIV A&M COL BATON ROUGE", + "LOUISIANA STATE UNIV AGRICULTURAL CENTER", + "LOUISIANA STATE UNIV HSC SHREVEPORT", + "LOUISIANA TECH UNIVERSITY", + "LOVELACE BIOMEDICAL RESEARCH INSTITUTE", + "LOXIGEN, INC.", + "LOYOLA MARYMOUNT UNIVERSITY", + "LOYOLA UNIVERSITY CHICAGO", + "LOYOLA UNIVERSITY OF CHICAGO", + "LSU HEALTH SCIENCES CENTER", + "LSU PENNINGTON BIOMEDICAL RESEARCH CTR", + "LUCEOME BIOTECHNOLOGIES, LLC", + "LUDWIG INSTITUTE FOR CANCER RES LTD", + "LUNDQUIST INSTITUTE FOR BIOMEDICAL INNOVATION AT HARBOR-UCLA MEDICAL CENTER", + "LURIE CHILDREN'S HOSPITAL OF CHICAGO", + "LUXMED SYSTEMS, INC.", + "LYNNTECH, INC.", + "LYNTHERA CORPORATION", + "LYSSN.IO, INC.", + "MAGEE-WOMEN'S RES INST AND FOUNDATION", + "MAGGIE'S PEARL, LLC", + "MAGNUS MEDICAL INC", + "MAGPAD, LLC", + "MAINEHEALTH", + "MAKERERE UNIVERSITY", + "MAKERERE UNIVERSITY WALTER REED PROJECT", + "MAKSCIENTIFIC, LLC", + "MANAGED HEALTH CONNECTIONS, LLC", + "MAPHABIT, INC.", + "MARIAN UNIVERSITY", + "MARINE BIOLOGICAL LABORATORY", + "MARPAM PHARMA, LLC", + "MARQUETTE UNIVERSITY", + "MARSHALL UNIVERSITY", + "MARSHFIELD CLINIC RESEARCH FOUNDATION", + "MARYMOUNT UNIVERSITY", + "MASONIC MEDICAL RESEARCH LABORATORY, INC", + "MASSACHUSETTS EYE AND EAR INFIRMARY", + "MASSACHUSETTS GENERAL HOSPITAL", + "MASSACHUSETTS INSTITUTE OF TECHNOLOGY", + "MATREGENIX", + "MAX BIOPHARMA, INC.", + "MAX PLANCK FLORIDA CORPORATION", + "MAYO CLINIC JACKSONVILLE", + "MAYO CLINIC ARIZONA", + "MAYO CLINIC ROCHESTER", + "MBARARA UNIVERSITY/SCIENCE/ TECHNOLOGY", + "MCGILL UNIVERSITY", + "MCLEAN HOSPITAL", + "MCMASTER UNIVERSITY", + "MDDRIVEN LLC", + "MDI THERAPEUTICS, INC.", + "MEDICAL COLLEGE OF WISCONSIN", + "MEDICAL UNIVERSITY OF SOUTH CAROLINA", + "MEDIGEN, INC.", + "MEDITATI INC.", + "MEDITRACE LLC", + "MEHARRY MEDICAL COLLEGE", + "MELAX TECHNOLOGIES, INC.", + "MENTIA DTX, INC.", + "MERCER UNIVERSITY MACON", + "MERRIMACK COLLEGE", + "MESO SCALE DIAGNOSTICS, LLC", + "METALMARK INNOVATIONS, PBC", + "METHODIST HOSPITAL RESEARCH INSTITUTE", + "METIS FOUNDATION", + "MGH INSTITUTE OF HEALTH PROFESSIONS", + "MIAMI UNIVERSITY OXFORD", + "MICHIGAN STATE UNIVERSITY", + "MICHIGAN TECHNOLOGICAL UNIVERSITY", + "MICROBIAL IMAGING, LLC", + "MICROBIOTIX, INC", + "MICROBRIGHTFIELD, LLC", + "MICROGEN, LLC", + "MICRO-LEADS, INC.", + "MICROVASCULAR THERAPEUTICS, LLC", + "MIDDLE TENNESSEE STATE UNIVERSITY", + "MIDWESTERN UNIVERSITY", + "MINNESOTA HEALTHSOLUTIONS CORPORATION", + "MIRESOURCE, INC.", + "MIRIAM HOSPITAL", + "MIRIMUS, INC.", + "MISSISSIPPI STATE UNIVERSITY", + "MISSOURI UNIVERSITY OF SCIENCE & TECHNOLOGY", + "MITOCHONDRIA IN MOTION, INC.", + "MITOTHERAPEUTIX, LLC", + "MITRALPRINT INC.", + "MMJ LABS, LLC", + "MODULATION THERAPEUTICS, INC.", + "MOLECULAR EXPRESS, INC.", + "MOLECULAR INSTRUMENTS, INC.", + "MOLECULAR MEDICINE RESEARCH INSTITUTE", + "MOLECULAR TARGETING TECHNOLOGIES, INC.", + "MONELL CHEMICAL SENSES CENTER", + "MONTANA MOLECULAR, LLC", + "MONTANA STATE UNIVERSITY - BOZEMAN", + "MONTCLAIR STATE UNIVERSITY", + "MOONLIGHT THERAPEUTICS, INC.", + "MORAVIAN UNIVERSITY", + "MOREHEAD STATE UNIVERSITY", + "MOREHOUSE SCHOOL OF MEDICINE", + "MORGAN STATE UNIVERSITY", + "MORGRIDGE INSTITUTE FOR RESEARCH, INC.", + "MOTHER'S MILK IS BEST, INC.", + "MOUNT DESERT ISLAND BIOLOGICAL LAB", + "MOUNT KENYA UNIVERSITY", + "MSTM, LLC", + "MUCOMMUNE, LLC", + "MUHIMBILI UNIVERSITY/ ALLIED HLTH SCIS", + "MU-JHU CARE", + "MURDOCH CHILDREN'S RESEARCH INSTITUTE", + "MYOLEX, INC.", + "MYOSIN THERAPEUTICS INC.", + "N8 MEDICAL, INC.", + "NABGEN, INC.", + "NAMI DIAGNOSTICS LLC", + "NASONI LLC", + "NATHAN S. KLINE INSTITUTE FOR PSYCH RES", + "NATIONAL BUREAU OF ECONOMIC RESEARCH", + "NATIONAL DISEASE RESEARCH INTERCHANGE", + "NATIONAL JEWISH HEALTH", + "NATIONAL MEDICAL ASSOCIATION", + "NATIONAL OPINION RESEARCH CENTER", + "NATIONAL PARTNERSHIP/ENVIRONMNTL/TECH/ED", + "NATIONAL RESEARCH COUNCIL OF ARGENTINA", + "NATIONAL UNIVERSITY OF NATURAL MEDICINE", + "NATIONAL UNIVERSITY OF RWANDA", + "NDRI-USA, INC.", + "NECTAGEN, INC.", + "NEMAGEN DISCOVERIES, INC", + "NEMOURS CHILDREN'S CLINIC", + "NEMOURS CHILDREN'S HOSPITAL, ORLANDO", + "NEOOLIFE, INC.", + "NEPHROPATHOLOGY ASSOCIATES", + "NEURANO BIOSCIENCE", + "NEUREXIS THERAPEUTICS, INC.", + "NEURODON LLC", + "NEUROEM THERAPEUTICS, INC.", + "NEUROENE THERAPEUTICS INC", + "NEUROPACE, INC.", + "NEW ENGLAND COLLEGE OF OPTOMETRY", + "NEW ENGLAND RESEARCH INSTITUTES, INC.", + "NEW HAMPSHIRE ACADEMY OF SCIENCE, INC.", + "NEW JERSEY INSTITUTE OF TECHNOLOGY", + "NEW MEXICO STATE UNIVERSITY LAS CRUCES", + "NEW YORK BLOOD CENTER", + "NEW YORK GENOME CENTER", + "NEW YORK HALL OF SCIENCE", + "NEW YORK INST OF TECHNOLOGY", + "NEW YORK MEDICAL COLLEGE", + "NEW YORK STATE PSYCHIATRIC INSTITUTE DBA RESEARCH FOUNDATION FOR MENTAL HYGIENE, INC", + "NEW YORK STRUCTURAL BIOLOGY CENTER", + "NEW YORK UNIVERSITY", + "NEW YORK UNIVERSITY SCHOOL OF MEDICINE", + "NEWHAPTICS CORP.", + "NEXTGENJANE, INC.", + "NEXTSTEP ROBOTICS, LLC", + "NIGERIAN INSTITUTE OF MEDICAL RESEARCH", + "NIGHTHAWK BIOSCIENCES, INC.", + "NIRVANA SCIENCES, INC.", + "NORTH AMERICAN ASSN/CENTRAL CANCER REG", + "NORTH CAROLINA AGRI & TECH ST UNIV", + "NORTH CAROLINA CENTRAL UNIVERSITY", + "NORTH CAROLINA STATE UNIVERSITY RALEIGH", + "NORTH DAKOTA STATE UNIVERSITY", + "NORTH JERSEY AIDS ALLIANCE ,INC. (NJCRI)", + "NORTHEAST OHIO MEDICAL UNIVERSITY", + "NORTHEASTERN ILLINOIS UNIVERSITY", + "NORTHEASTERN UNIVERSITY", + "NORTHERN ARIZONA UNIVERSITY", + "NORTHERN CALIFORNIA INSTITUTE/RES/EDU", + "NORTHERN ILLINOIS UNIVERSITY", + "NORTHERN KENTUCKY UNIVERSITY", + "NORTHERN VERMONT UNIVERSITY-JOHNSON", + "NORTHSHORE UNIVERSITY HEALTHSYSTEM", + "NORTHUMBRIA UNIVERSITY", + "NORTHWEST PREVENTION SCIENCE INC", + "NORTHWESTERN UNIVERSITY", + "NORTHWESTERN UNIVERSITY AT CHICAGO", + "NOUS IMAGING, INC.", + "NOVA SOUTHEASTERN UNIVERSITY", + "NOVAFLUX, INC.", + "NOVAN, INC.", + "NOVERATECH, LLC", + "NOVOBIOTIC PHARMACEUTICALS, LLC", + "NOVOMEDIX, INC.", + "NRG ONCOLOGY FOUNDATION, INC.", + "NUBAD, LLC", + "NUTRIFORWARD, LLC", + "NUVOX PHARMA, LLC", + "NXTECH INC", + "NYU LONG ISLAND SCHOOL OF MEDICINE", + "NZUMBE EPIGENETICS", + "OAI, INC.", + "OAK CREST INSTITUTE OF SCIENCE", + "OAKLAND UNIVERSITY", + "OASIS PHARMACEUTICALS", + "OCEAN STATE RESEARCH INSTITUTE, INC.", + "OCMS BIO, LLC", + "OHIO STATE UNIVERSITY", + "OHIO UNIVERSITY ATHENS", + "OKLAHOMA MEDICAL RESEARCH FOUNDATION", + "OKLAHOMA STATE UNIVERSITY STILLWATER", + "OLD DOMINION UNIVERSITY", + "OLEOLIVE, INC.", + "OLERA INC.", + "OLIGOMERIX, INC", + "OMEGAQUANT ANALYTICS, LLC", + "OMEROS CORPORATION", + "OMICSCRAFT, LLC", + "OMVAX, INC.", + "ONCOSPHERIX, INC.", + "ONCTERNAL THERAPEUTICS, INC.", + "OPALGENIX, INC.", + "OPIAID, INC.", + "OPSICLEAR LLC", + "OPTICENT, INC.", + "OPTIMA INTEGRATED HEALTH, INC.", + "O-RAY PHARMA, INC.", + "OREGON HEALTH & SCIENCE UNIVERSITY", + "OREGON RES BEHAVIORAL INTERVENTION STRAT", + "OREGON RESEARCH INSTITUTE", + "OREGON SOCIAL LEARNING CENTER, INC.", + "OREGON STATE UNIVERSITY", + "ORGANOS, INC.", + "ORLANCE, INC.", + "OSLC DEVELOPMENTS", + "OSU CENTER FOR HEALTH SCIENCES", + "OUI THERAPEUTICS, LLC", + "OUTCOME REFERRALS INC", + "OUTLIER TECHNOLOGY, LLC", + "OVARYIT, LLC", + "OYAGEN, INC.", + "PACE UNIVERSITY NEW YORK", + "PACIFIC INSTITUTE FOR RES AND EVALUATION", + "PACIFIC NORTHWEST RESEARCH INSTITUTE", + "PALO ALTO UNIVERSITY", + "PALO ALTO VETERANS INSTIT FOR RESEARCH", + "PARABON NANOLABS, INC.", + "PARMEDICS, INC.", + "PARTNERSHIP FOR RESEARCH/ACTION/HEALTH", + "PATH", + "PATH BIOTECH, LLC", + "PATH2CAREGIVING LLC", + "PATHWARE INC.", + "PDX PHARMACEUTICALS, INC.", + "PEDIAMETRIX INC.", + "PENDERIA TECHNOLOGIES, INC.", + "PENNSYLVANIA STATE UNIV HERSHEY MED CTR", + "PENNSYLVANIA STATE UNIVERSITY, THE", + "PEOPLE DESIGNS, INC.", + "PHAGEPRO, INC.", + "PHANES BIOTECH, INC.", + "PHARMAIN CORPORATION", + "PHASE GENOMICS, INC.", + "PHASE, INC.", + "PHI OPTICS, INC.", + "PHOENIX NEST, INC.", + "PHOENIX PHARMALABS, INC.", + "PHYLLOTECH, LLC", + "PHYSICAL SCIENCES, INC", + "PLANET BIOTECHNOLOGY, INC.", + "PLUREXA LLC", + "PONCE SCHOOL OF MEDICINE", + "POPULATION COUNCIL", + "POPULATION REFERENCE BUREAU", + "PORTLAND STATE UNIVERSITY", + "PORTLAND VA RESEARCH FOUNDATION, INC.", + "POSIT SCIENCE CORPORATION", + "POWERTECH WATER, INC.", + "PPD DEVELOPMENT LP", + "PRAETEGO, INC.", + "PRAIRIE VIEW AGRI & MECH UNIVERSITY", + "PRAPELA, INC.", + "PRENOSIS, INC.", + "PRENTKE ROMICH COMPANY", + "PREVENTION STRATEGIES, LLC", + "PRIMORDIAL GENETICS, INC", + "PRINCE OF SONGKLA UNIVERSITY", + "PRINCETON UNIVERSITY", + "PRIVO TECHNOLOGIES, LLC", + "PRO-CHANGE BEHAVIOR SYSTEMS, INC.", + "PRODA BIOTECH, LLC", + "PROKARYOTICS, INC.", + "PROMETHEUS TECHNOLOGIES, LLC", + "PROTEAN BIO INC.", + "PROTEGO BIOPHARMA, INC.", + "PROTEINACEOUS, INC.", + "PROTEOVISTA, LLC", + "PROVIDENCE HEALTH & SERVICES - OREGON", + "PROVIDENCE PORTLAND MEDICAL CENTER", + "PROVINCIAL HEALTH SERVICES AUTHORITY", + "PUBLIC HEALTH FOUNDATION ENTERPRISES", + "PUBLIC HEALTH FOUNDATION OF INDIA", + "PUBLIC HEALTH INSTITUTE", + "PULVINAR NEURO LLC", + "PURDUE UNIVERSITY", + "Q2I, LLC", + "QATCH TECHNOLOGIES, LLC", + "Q-CHEM, INC.", + "QUADRIDOX, INC.", + "QUANTUM SIMULATION TECHNOLOGIES, INC.", + "QUANTUMBIO, INC.", + "QUEENS COLLEGE", + "QUEEN'S MEDICAL CENTER", + "QUEEN'S UNIVERSITY AT KINGSTON", + "QUEL IMAGING LLC", + "QUENCH MEDICAL, INC.", + "QUERCUS MOLECULAR DESIGN, LLC", + "RADY PEDIATRIC GENOMICS & SYSTEMS MEDICINE INSTITUTE", + "RAFT PHARMACEUTICALS, LLC", + "RAMAPO COLLEGE OF NEW JERSEY", + "RAND CORPORATION", + "RASOPATHIES NETWORK USA", + "RBHS-SCHOOL OF PUBLIC HEALTH", + "REBISCAN, LLC", + "RED GENOMICS, INC", + "REGENERATIVE RESEARCH FOUNDATION", + "REGENERATIVE SOLUTIONS, INC.", + "REGENNOVA, INC.", + "REGION HOVEDSTADEN", + "REHABILITATION INSTITUTE OF CHICAGO D/B/A SHIRLEY RYAN ABILITYLAB", + "REIA, LLC", + "RELIANT GLYCOSCIENCES LLC", + "REMMIE, INC.", + "RENDEVER, INC.", + "RENEUROGEN, LLC", + "RENSSELAER POLYTECHNIC INSTITUTE", + "RESBIOTIC, INC.", + "RESCUE BIOMEDICAL, LLC", + "RESEARCH INST NATIONWIDE CHILDREN'S HOSP", + "RESEARCH INST OF FOX CHASE CAN CTR", + "RESEARCH TRIANGLE INSTITUTE", + "RESTOREAR DEVICES, LLC", + "RETAIN HEALTH INC", + "RETINA FOUNDATION OF THE SOUTHWEST", + "REVBIO, INC.", + "REVEAL PHARMA", + "RH STUDIO 2 OPCO 22, INC.", + "RHO FEDERAL SYSTEMS DIVISION, INC.", + "RHODE ISLAND HOSPITAL", + "RICE UNIVERSITY", + "RIDGELINE THERAPEUTICS, LLC", + "RIGAKU AMERICAS CORPORATION", + "RIPARIAN PHARMACEUTICALS, INC.", + "RISE THERAPEUTICS, LLC", + "RNA NANOTHERAPEUTICS LLC", + "RNET TECHNOLOGIES, INC.", + "ROCHESTER INSTITUTE OF TECHNOLOGY", + "ROCK IMMUNE LLC", + "ROCKEFELLER UNIVERSITY", + "ROSALIND FRANKLIN UNIV OF MEDICINE & SCI", + "ROSE LI AND ASSOCIATES, INC.", + "ROSKAMP INSTITUTE, INC.", + "ROSWELL PARK CANCER INSTITUTE CORP", + "ROWAN UNIVERSITY", + "ROWAN UNIVERSITY SCHOOL/OSTEOPATHIC MED", + "RUMI SCIENTIFIC, INC.", + "RUSH UNIVERSITY MEDICAL CENTER", + "RUTGERS BIOMEDICAL AND HEALTH SCIENCES", + "RUTGERS THE STATE UNIV OF NJ CAMDEN", + "RUTGERS THE STATE UNIV OF NJ NEWARK", + "RUTGERS, THE STATE UNIV OF N.J.", + "S-3 RESEARCH, LLC", + "SACHI BIOWORKS, INC.", + "SAFETYSPECT, INC.", + "SAINT LOUIS UNIVERSITY", + "SAINT LUKE'S HOSPITAL", + "SAINT REGIS MOHAWK TRIBE", + "SAINTE-JUSTINE UNIVERSITY HOSPITAL CTR", + "SALISH KOOTENAI COLLEGE", + "SALK INSTITUTE FOR BIOLOGICAL STUDIES", + "SALUS DISCOVERY, LLC", + "SALUS UNIVERSITY", + "SAN DIEGO BIOMEDICAL RESEARCH INSTITUTE", + "SAN DIEGO STATE UNIVERSITY", + "SAN FRANCISCO DEPARTMENT OF PUBLIC HEALTH", + "SAN FRANCISCO STATE UNIVERSITY", + "SAN JOSE STATE UNIVERSITY", + "SANARENTERO LLC", + "SANARIA, INC.", + "SANFORD BURNHAM PREBYS MEDICAL DISCOVERY INSTITUTE", + "SANFORD RESEARCH NORTH", + "SANFORD RESEARCH/USD", + "SANO HEALTHCARE CONSULTANTS, LLC", + "SAPIENCE THERAPEUTICS, INC.", + "SCANOGEN, INC.", + "SCARLESS LABORATORIES, INC.", + "SCHEPENS EYE RESEARCH INSTITUTE", + "SCINTILLON INSTITUTE FOR PHOTOBIOLOGY", + "SCIOGEN, LLC", + "SCITOVATION, LLC", + "SCRIPPS HEALTH", + "SCRIPPS RESEARCH INSTITUTE, THE", + "SEATTLE CHILDREN'S HOSPITAL", + "SEATTLE INST FOR BIOMEDICAL/CLINICAL RES", + "SECOND SIGHT MEDICAL PRODUCTS, INC.", + "SEE YOURSELF HEALTH, LLC", + "SEFAKO MAKGATHO HEALTH SCIENCES UNIVERSITY", + "SENSYDIA CORPORATION", + "SHARP MEMORIAL HOSPITAL", + "SHASQI, INC.", + "SHEPHERD CENTER", + "SHIFT PHARMACEUTICALS HOLDINGS, INC.", + "SIENA COLLEGE", + "SIGRAY, INC.", + "SIGT, LLC", + "SILENT SPRING INSTITUTE", + "SILICON KIDNEY, LLC", + "SIMMARON RESEARCH INC", + "SIMMERSION, LLC.", + "SIMON FRASER UNIVERSITY", + "SIMPORE, INC.", + "SIMULATIONS PLUS, INC.", + "SINAI HEALTH SYSTEM", + "SINOPIA BIOSCIENCES, INC.", + "SIOLTA THERAPEUTICS, INC.", + "SITEONE THERAPEUTICS, INC.", + "SLEEP RESEARCH SOCIETY", + "SLOAN-KETTERING INST CAN RESEARCH", + "SMITH-KETTLEWELL EYE RESEARCH INSTITUTE", + "SOCIETY FOR ACUPUNCTURE RESEARCH, INC.", + "SOCIETY FOR INVESTIGATIVE DERMATOLOGY", + "SOCIETY FOR MUSCLE BIOLOGY", + "SOCIETY FOR NEUROSCIENCE", + "SOCIETY FOR PREVENTION RESEARCH, INC.", + "SOCIETY OF BEHAVIORAL MEDICINE", + "SOCIETY OF TOXICOLOGY", + "SOFT IMAGING, LLC", + "SOLARIS VACCINES, INC.", + "SONALASENSE INC", + "SONOSA MEDICAL, INC.", + "SOTERIX MEDICAL,INC.", + "SOUTH DAKOTA STATE UNIVERSITY", + "SOUTHCENTRAL FOUNDATION", + "SOUTHERN ILLINOIS UNIV AT EDWARDSVILLE", + "SOUTHERN ILLINOIS UNIVERSITY CARBONDALE", + "SOUTHERN ILLINOIS UNIVERSITY SCH OF MED", + "SOUTHERN METHODIST UNIVERSITY", + "SOUTHERN RESEARCH INSTITUTE", + "SOUTHERN UNIV A&M COL BATON ROUGE", + "SPACERX LLC", + "SPARK NEURO INC.", + "SPATIAL GENOMICS, INC.", + "SPAULDING REHABILITATION HOSPITAL", + "SPECTRAGENETICS", + "SPEECH TECHNOLOGY/APPLIED RESEARCH CORP.", + "SPELMAN COLLEGE", + "SPINOGENIX, INC.", + "SRI INTERNATIONAL", + "ST. CATHERINE UNIVERSITY", + "ST. JOHN'S UNIVERSITY", + "ST. JOSEPH'S HOSPITAL AND MEDICAL CENTER", + "ST. JUDE CHILDREN'S RESEARCH HOSPITAL", + "ST. JUDE CHILDREN'S RESEARCH HOSPITAL GRADUATE SCHOOL OF BIOMEDICAL SCIENCES, LLC", + "ST. LOUIS COLLEGE OF PHARMACY", + "ST. MARY'S UNIVERSITY", + "STANFORD UNIVERSITY", + "STASYS MEDICAL CORPORATION", + "STATE COLLEGE OF OPTOMETRY", + "STATE UNIVERSITY NEW YORK STONY BROOK", + "STATE UNIVERSITY OF NEW YORK AT ALBANY", + "STATE UNIVERSITY OF NEW YORK AT BUFFALO", + "STATE UNIVERSITY OF NY,BINGHAMTON", + "STEADMAN PHILIPPON RESEARCH INSTITUTE", + "STEELWORKER CHARITABLE/EDUCATIONAL ORG", + "STELLENBOSCH UNIVERSITY", + "STEMBIOSYS, INC.", + "STEMCULTURES, LLC", + "STEVENS INSTITUTE OF TECHNOLOGY", + "STEXOLE LLC", + "STICHTING RADBOUD UNIVERSITAIR MEDISCH CENTRUM I.O.", + "STILLMAN COLLEGE", + "STINGINN, LLC", + "STOWERS INSTITUTE FOR MEDICAL RESEARCH", + "STRESS THERAPEUTICS, INC.", + "STRM.BIO, INC.", + "SUNY DOWNSTATE MEDICAL CENTER", + "SUPERIOR STATISTICAL RESEARCH, LLC", + "SUR180 THERAPEUTICS, LLC", + "SURGIVANCE, INC.", + "SUSTAINABLE WORKPLACE ALLIANCE, INC.", + "SWARTHMORE COLLEGE", + "SWEDISH MEDICAL CENTER, FIRST HILL", + "SYGNAMAP, INC.", + "SYMPHONY BIOSCIENCES, INC.", + "SYNAPTICURE, INC.", + "SYNBAL, INC.", + "SYNTHIS THERAPEUTICS, INC.", + "SYRACUSE UNIVERSITY", + "TAMUROBIO INC.", + "TANGO BIOSCIENCES, INC.", + "TANZEN MEDICAL, INC.", + "TARGEPEUTICS, INC.", + "TEACHLEY, LLC", + "TECHIMMUNE, LLC", + "TEMPLE UNIV OF THE COMMONWEALTH", + "TENDEL THERAPIES INC.", + "TENGEN BIOMEDICAL CO.", + "TENNESSEE STATE UNIVERSITY", + "TERATOLOGY SOCIETY", + "TEXAS A&M AGRILIFE RESEARCH", + "TEXAS A&M UNIVERSITY", + "TEXAS A&M UNIVERSITY HEALTH SCIENCE CTR", + "TEXAS A&M UNIVERSITY-CORPUS CHRISTI", + "TEXAS A&M UNIVERSITY-KINGSVILLE", + "TEXAS BIOMEDICAL RESEARCH INSTITUTE", + "TEXAS CHRISTIAN UNIVERSITY", + "TEXAS ENGINEERING EXPERIMENT STATION", + "TEXAS HEART INSTITUTE", + "TEXAS SOUTHERN UNIVERSITY", + "TEXAS STATE UNIVERSITY", + "TEXAS TECH UNIVERSITY", + "TEXAS TECH UNIVERSITY HEALTH SCIENCES CENTER AT EL PASO", + "TEXAS TECH UNIVERSITY HEALTH SCIS CENTER", + "TEXAS WOMAN'S UNIVERSITY", + "THE ACADEMY OF NATURAL SCIENCES OF PHILADELPHIA", + "THE FEDERAL UNIVERSITY OF TECHNOLOGY, AKURE, NIGERIA", + "THEIA IMAGING LLC", + "THERANOSTEC, INC.", + "THERAPYX, INC.", + "THERASOURCE, LLC", + "THETIS PHARMACEUTICALS, LLC", + "THOMAS JEFFERSON UNIVERSITY", + "THRIVE NEUROMEDICAL, LLC", + "THYMMUNE THERAPEUTICS, INC", + "THYREOS, INC", + "TING THERAPEUTICS LLC", + "TISSUE TESTING TECHNOLOGIES, LLC", + "TMLIVERPOOL SCHOOL OF TROPICAL MEDICINE", + "TONIX PHARMACEUTICALS, INC.", + "TORNADO THERAPEUTICS, INC.", + "TOURO UNIVERSITY OF CALIFORNIA", + "TOWSON UNIVERSITY", + "TRACE-ABILITY, INC.", + "TRAINING AND IMPLEMENTATION ASSOCIATES, LLC", + "TRANSCENDENT INTERNATIONAL, LLC", + "TRANSCERA, INC", + "TRANSCODE THERAPEUTICS, INC.", + "TRANSLATIONAL GENOMICS RESEARCH INST", + "TRANSMURAL SYSTEMS, LLC", + "TREKKA THERAPEUTICS, LLC", + "TREOVIR, INC", + "TRETHERA CORPORATION", + "TRIAD NATIONAL SECURITY, LLC", + "TRIANGLE BIOTECHNOLOGY, INC.", + "TRINITY COLLEGE DUBLIN", + "TRINITY UNIVERSITY", + "TRITONX INC.", + "TRUDEAU INSTITUTE, INC.", + "TRULY TECHNOLOGIES LLC", + "TRUSTEES OF INDIANA UNIVERSITY", + "TSRL, INC.", + "TUFTS MEDICAL CENTER", + "TUFTS UNIVERSITY BOSTON", + "TUFTS UNIVERSITY MEDFORD", + "TULANE UNIVERSITY OF LOUISIANA", + "TUSKEGEE UNIVERSITY", + "U.S. NATIONAL INST DIABETES/DIGST/KIDNEY", + "UCHICAGO ARGONNE, LLC", + "UGANDA VIRUS RESEARCH INSTITUTE", + "UNION COLLEGE", + "UNITED STATES ASSOCIATION FOR THE STUDY OF PAIN, INC.", + "UNIV OF ARKANSAS FOR MED SCIS", + "UNIV OF MARYLAND, COLLEGE PARK", + "UNIV OF MASSACHUSETTS MED SCH WORCESTER", + "UNIV OF NORTH CAROLINA CHAPEL HILL", + "UNIV OF SCIENCES, TECH & TECH OF BAMAKO", + "UNIVERSIDAD CENTRAL DEL CARIBE", + "UNIVERSIDAD DE SAN MARTIN DE PORRES", + "UNIVERSIDAD PERUANA CAYETANO HEREDIA", + "UNIVERSITAT BERN", + "UNIVERSITE DE STRASBOURG", + "UNIVERSITY COLLEGE LONDON", + "UNIVERSITY HEALTH NETWORK", + "UNIVERSITY OF AKRON", + "UNIVERSITY OF ALABAMA AT BIRMINGHAM", + "UNIVERSITY OF ALABAMA IN HUNTSVILLE", + "UNIVERSITY OF ALABAMA IN TUSCALOOSA", + "UNIVERSITY OF ALASKA ANCHORAGE", + "UNIVERSITY OF ALASKA FAIRBANKS", + "UNIVERSITY OF ALBERTA", + "UNIVERSITY OF ARIZONA", + "UNIVERSITY OF ARKANSAS AT FAYETTEVILLE", + "UNIVERSITY OF BRITISH COLUMBIA", + "UNIVERSITY OF CALGARY", + "UNIVERSITY OF CALIF-LAWRENC BERKELEY LAB", + "UNIVERSITY OF CALIFORNIA AT DAVIS", + "UNIVERSITY OF CALIFORNIA BERKELEY", + "UNIVERSITY OF CALIFORNIA LOS ANGELES", + "UNIVERSITY OF CALIFORNIA RIVERSIDE", + "UNIVERSITY OF CALIFORNIA SANTA BARBARA", + "UNIVERSITY OF CALIFORNIA SANTA CRUZ", + "UNIVERSITY OF CALIFORNIA, MERCED", + "UNIVERSITY OF CALIFORNIA, SAN DIEGO", + "UNIVERSITY OF CALIFORNIA, SAN FRANCISCO", + "UNIVERSITY OF CALIFORNIA-IRVINE", + "UNIVERSITY OF CAMBRIDGE", + "UNIVERSITY OF CAPE TOWN", + "UNIVERSITY OF CENTRAL FLORIDA", + "UNIVERSITY OF CHICAGO", + "UNIVERSITY OF CINCINNATI", + "UNIVERSITY OF COLORADO", + "UNIVERSITY OF COLORADO DENVER", + "UNIVERSITY OF CONNECTICUT SCH OF MED/DNT", + "UNIVERSITY OF CONNECTICUT STORRS", + "UNIVERSITY OF DELAWARE", + "UNIVERSITY OF DENVER (COLORADO SEMINARY)", + "UNIVERSITY OF DETROIT MERCY", + "UNIVERSITY OF EXETER", + "UNIVERSITY OF FLORIDA", + "UNIVERSITY OF GEORGIA", + "UNIVERSITY OF GHANA", + "UNIVERSITY OF GHANA MEDICAL CENTRE", + "UNIVERSITY OF GLASGOW", + "UNIVERSITY OF GUAM", + "UNIVERSITY OF HAWAII AT MANOA", + "UNIVERSITY OF HOUSTON", + "UNIVERSITY OF IDAHO", + "UNIVERSITY OF ILLINOIS AT CHICAGO", + "UNIVERSITY OF ILLINOIS AT URBANA-CHAMPAIGN", + "UNIVERSITY OF IOWA", + "UNIVERSITY OF KANSAS LAWRENCE", + "UNIVERSITY OF KANSAS MEDICAL CENTER", + "UNIVERSITY OF KENTUCKY", + "UNIVERSITY OF KWAZULU-NATAL", + "UNIVERSITY OF LAGOS- COLLEGE OF MEDICINE", + "UNIVERSITY OF LEEDS", + "UNIVERSITY OF LOUISIANA AT LAFAYETTE", + "UNIVERSITY OF LOUISIANA AT MONROE", + "UNIVERSITY OF LOUISVILLE", + "UNIVERSITY OF MAINE ORONO", + "UNIVERSITY OF MALAYA", + "UNIVERSITY OF MARYLAND BALTIMORE", + "UNIVERSITY OF MARYLAND BALTIMORE COUNTY", + "UNIVERSITY OF MARYLAND EASTERN SHORE", + "UNIVERSITY OF MASSACHUSETTS AMHERST", + "UNIVERSITY OF MASSACHUSETTS BOSTON", + "UNIVERSITY OF MASSACHUSETTS LOWELL", + "UNIVERSITY OF MELBOURNE", + "UNIVERSITY OF MEMPHIS", + "UNIVERSITY OF MIAMI CORAL GABLES", + "UNIVERSITY OF MIAMI ROSENTEIL SCHOOL", + "UNIVERSITY OF MIAMI SCHOOL OF MEDICINE", + "UNIVERSITY OF MICHIGAN AT ANN ARBOR", + "UNIVERSITY OF MICHIGAN AT FLINT", + "UNIVERSITY OF MINNESOTA", + "UNIVERSITY OF MISSISSIPPI", + "UNIVERSITY OF MISSISSIPPI MED CTR", + "UNIVERSITY OF MISSOURI KANSAS CITY", + "UNIVERSITY OF MISSOURI-COLUMBIA", + "UNIVERSITY OF MISSOURI-ST. LOUIS", + "UNIVERSITY OF MONTANA", + "UNIVERSITY OF MONTREAL", + "UNIVERSITY OF MONTREAL HOSPITAL", + "UNIVERSITY OF NAIROBI", + "UNIVERSITY OF NEBRASKA LINCOLN", + "UNIVERSITY OF NEBRASKA MEDICAL CENTER", + "UNIVERSITY OF NEBRASKA OMAHA", + "UNIVERSITY OF NEVADA LAS VEGAS", + "UNIVERSITY OF NEVADA RENO", + "UNIVERSITY OF NEW ENGLAND", + "UNIVERSITY OF NEW HAMPSHIRE", + "UNIVERSITY OF NEW MEXICO", + "UNIVERSITY OF NEW MEXICO HEALTH SCIS CTR", + "UNIVERSITY OF NEWCASTLE", + "UNIVERSITY OF NORTH CAROLINA ASHEVILLE", + "UNIVERSITY OF NORTH CAROLINA CHARLOTTE", + "UNIVERSITY OF NORTH CAROLINA GREENSBORO", + "UNIVERSITY OF NORTH CAROLINA WILMINGTON", + "UNIVERSITY OF NORTH DAKOTA", + "UNIVERSITY OF NORTH FLORIDA", + "UNIVERSITY OF NORTH TEXAS", + "UNIVERSITY OF NORTH TEXAS HLTH SCI CTR", + "UNIVERSITY OF NOTRE DAME", + "UNIVERSITY OF OKLAHOMA", + "UNIVERSITY OF OKLAHOMA HLTH SCIENCES CTR", + "UNIVERSITY OF OREGON", + "UNIVERSITY OF OXFORD", + "UNIVERSITY OF PENNSYLVANIA", + "UNIVERSITY OF PITTSBURGH AT PITTSBURGH", + "UNIVERSITY OF PORTLAND", + "UNIVERSITY OF PR CAYEY UNIVERSITY COLL", + "UNIVERSITY OF PRETORIA", + "UNIVERSITY OF PUERTO RICO AT HUMACAO", + "UNIVERSITY OF PUERTO RICO MED SCIENCES", + "UNIVERSITY OF PUERTO RICO PONCE", + "UNIVERSITY OF QUEENSLAND", + "UNIVERSITY OF RHODE ISLAND", + "UNIVERSITY OF ROCHESTER", + "UNIVERSITY OF SAN FRANCISCO", + "UNIVERSITY OF SAO PAULO", + "UNIVERSITY OF SOUTH ALABAMA", + "UNIVERSITY OF SOUTH CAROLINA", + "UNIVERSITY OF SOUTH CAROLINA AT COLUMBIA", + "UNIVERSITY OF SOUTH DAKOTA", + "UNIVERSITY OF SOUTH FLORIDA", + "UNIVERSITY OF SOUTHERN CALIFORNIA", + "UNIVERSITY OF SOUTHERN DENMARK", + "UNIVERSITY OF SOUTHERN MISSISSIPPI", + "UNIVERSITY OF TENNESSEE CHATTANOOGA", + "UNIVERSITY OF TENNESSEE HEALTH SCI CTR", + "UNIVERSITY OF TENNESSEE KNOXVILLE", + "UNIVERSITY OF TEXAS ARLINGTON", + "UNIVERSITY OF TEXAS AT AUSTIN", + "UNIVERSITY OF TEXAS DALLAS", + "UNIVERSITY OF TEXAS EL PASO", + "UNIVERSITY OF TEXAS HLTH CTR AT TYLER", + "UNIVERSITY OF TEXAS HLTH SCI CTR HOUSTON", + "UNIVERSITY OF TEXAS HLTH SCIENCE CENTER", + "UNIVERSITY OF TEXAS MED BR GALVESTON", + "UNIVERSITY OF TEXAS RIO GRANDE VALLEY", + "UNIVERSITY OF TEXAS SAN ANTONIO", + "UNIVERSITY OF TEXAS TYLER", + "UNIVERSITY OF THE ANDES", + "UNIVERSITY OF THE INCARNATE WORD", + "UNIVERSITY OF THE PACIFIC-STOCKTON", + "UNIVERSITY OF THE VALLEY OF GUATEMALA", + "UNIVERSITY OF THE VIRGIN ISLANDS", + "UNIVERSITY OF TOLEDO", + "UNIVERSITY OF TOLEDO HEALTH SCI CAMPUS", + "UNIVERSITY OF TORONTO", + "UNIVERSITY OF TULSA", + "UNIVERSITY OF TX MD ANDERSON CAN CTR", + "UNIVERSITY OF UTAH", + "UNIVERSITY OF VERMONT & ST AGRIC COLLEGE", + "UNIVERSITY OF VICTORIA", + "UNIVERSITY OF VIRGINIA", + "UNIVERSITY OF WASHINGTON", + "UNIVERSITY OF WEST FLORIDA", + "UNIVERSITY OF WESTERN AUSTRALIA", + "UNIVERSITY OF WESTERN ONTARIO", + "UNIVERSITY OF WISCONSIN EAU CLAIRE", + "UNIVERSITY OF WISCONSIN MILWAUKEE", + "UNIVERSITY OF WISCONSIN-MADISON", + "UNIVERSITY OF WYOMING", + "UNIVERSITY OF ZAMBIA", + "UNLOCKED LABS INC.", + "UPSTATE MEDICAL UNIVERSITY", + "UT SOUTHWESTERN MEDICAL CENTER", + "UTAH STATE UNIVERSITY", + "VAN ANDEL RESEARCH INSTITUTE", + "VANDERBILT UNIVERSITY", + "VANDERBILT UNIVERSITY MEDICAL CENTER", + "VARIGEN BIOSCIENCES CORPORATION", + "VASADE BIOSCIENCES, INC.", + "VASOPTIC MEDICAL, INC.", + "VASSAR COLLEGE", + "VAXESS TECHNOLOGIES, INC.", + "VAXNEWMO, LLC", + "VECTECH, LLC", + "VELLUM BIOSCIENCES LLC", + "VELUM, INC.", + "VENA VITALS, INC.", + "VENATORX PHARMACEUTICALS, INC.", + "VERACHEM, LLC", + "VERGENT BIOSCIENCE, INC.", + "VERRA THERAPEUTICS, LLC", + "VERSITI WISCONSIN, INC.", + "VETERANS EDUCATION AND RESEARCH ASSOCIATION OF MICHIGAN", + "VETERANS HEALTH RESEARCH INSTITUTE OF CENTRAL NEW YORK, INC.", + "VETERANS MEDICAL RESEARCH FDN/SAN DIEGO", + "VIC FOUNDRY, INC.", + "VIGNET, INC.", + "VIRGINIA COMMONWEALTH UNIVERSITY", + "VIRGINIA POLYTECHNIC INST AND ST UNIV", + "VIRTICI, LLC", + "VISIONQUEST BIOMEDICAL INC", + "VISITING NURSE SERVICE OF NEW YORK", + "VITAKEY, INC.", + "VITALANT", + "VITALEX BIOSCIENCES, LLC", + "VIVITA TECHNOLOGIES, INC.", + "VIVLI, INC.", + "VIVREON BIOSCIENCES, LLC", + "VIZMA LIFE SCIENCES, INC.", + "VOICELOVE LLC", + "VOLUMETRIX, LLC", + "VOLVER HEALTH LLC", + "VOX BIOMEDICAL LLC", + "VULINTUS, LLC", + "WADSWORTH CENTER", + "WAKE FOREST UNIVERSITY", + "WAKE FOREST UNIVERSITY HEALTH SCIENCES", + "WALTER AND ELIZA HALL INST MEDICAL RES", + "WALTER REED ARMY INSTITUTE OF RESEARCH", + "WASHINGTON STATE UNIVERSITY", + "WASHINGTON UNIVERSITY", + "WAVE 80 BIOSCIENCES, INC.", + "WAYNE STATE UNIVERSITY", + "WEILL MEDICAL COLL OF CORNELL UNIV", + "WEIZMANN INSTITUTE OF SCIENCE", + "WELLESLEY COLLEGE", + "WELLSAID.AI, LLC", + "WESLEYAN UNIVERSITY", + "WEST VIRGINIA UNIVERSITY", + "WESTAT, INC.", + "WESTERN MICHIGAN UNIV SCHOOL OF MEDICINE", + "WESTERN MICHIGAN UNIVERSITY", + "WESTERN UNIVERSITY OF HEALTH SCIENCES", + "WHEELING JESUIT UNIVERSITY", + "WHIPLASH TECHNOLOGY, INC.", + "WHITE MOUNTAIN APACHE TRIBE", + "WHITEHEAD INSTITUTE FOR BIOMEDICAL RES", + "WICHITA STATE UNIVERSITY", + "WICKED SHEETS, LLC", + "WIK DEVICES, LLC", + "WILD DOG PHYSICS, LLC", + "WILLIAM BEAUMONT HOSPITAL RESEARCH INST", + "WILLIAMS COLLEGE", + "WINDWARD ISLANDS RESEARCH & ED FDN", + "WINIFRED MASTERSON BURKE MED RES INST", + "WISTAR INSTITUTE", + "WITS HEALTH CONSORTIUM (PTY), LTD", + "WNTRIX, INC.", + "WOMEN AND INFANTS HOSPITAL-RHODE ISLAND", + "WOODS HOLE OCEANOGRAPHIC INSTITUTION", + "WORCESTER POLYTECHNIC INSTITUTE", + "WORLD HEALTH ORGANIZATION", + "WORLD MOLECULAR IMAGING SOCIETY", + "WRIGHT STATE UNIVERSITY", + "WYNNVISION, LLC", + "W-Z BIOTECH, LLC", + "XAVIER UNIVERSITY OF LOUISIANA", + "XLERATEHEALTH, LLC", + "XONA MICROFLUIDICS, LLC", + "XR NAVIGATION INC.", + "XYKEN, LLC", + "XYLOCOR THERAPEUTICS INC", + "XYLYX BIO, INC.", + "YALE UNIVERSITY", + "YESHIVA UNIVERSITY", + "YORK COLLEGE", + "YORK UNIVERSITY", + "Z BIOTECH, LLC", + "ZALGEN LABS, LLC", + "ZBEATS, INC.", + "ZENA THERAPEUTICS INC.", + "ZETEO TECH, INC.", + "ZVITAMBO INSTITUTE FOR MATERNAL AND CHILD HEALTH RESEARCH", + "ZYLO THERAPEUTICS, INC.", + "Other", +]; + +export default options; diff --git a/src/content/questionnaire/FormView.tsx b/src/content/questionnaire/FormView.tsx index 62bcaddac..c27a20633 100644 --- a/src/content/questionnaire/FormView.tsx +++ b/src/content/questionnaire/FormView.tsx @@ -27,7 +27,7 @@ const validateSection = (section: string) => typeof map[section] !== 'undefined' const StyledSidebar = styled(Stack)({ position: "sticky", top: "25px", - paddingTop: "10px", + paddingTop: "45px", }); const StyledDivider = styled(Divider)({ @@ -275,16 +275,6 @@ const styles = () => ({ height: "300px", background: "#F2F4F8", }, - sidebar: { - position: "sticky" as const, // Ignore TS error - top: "25px", - }, - divider: { - height: "250px", - width: "1px", - borderRightWidth: "2px", - margin: "0 0 0 15px", - }, content: { maxWidth: "980px", marginLeft: '64px', diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx index 0c945161b..a40099428 100644 --- a/src/content/questionnaire/sections/A.tsx +++ b/src/content/questionnaire/sections/A.tsx @@ -1,14 +1,16 @@ import React, { FC, useEffect, useRef, useState } from "react"; -import { Button, Grid, Stack } from '@mui/material'; -import { withStyles } from "@mui/styles"; -import PersonAddIcon from '@mui/icons-material/PersonAdd'; +import { Checkbox, FormControlLabel, Grid } from '@mui/material'; import { parseForm } from '@jalik/form-parser'; import { cloneDeep } from 'lodash'; +import AddCircleIcon from "@mui/icons-material/AddCircle"; import { Status as FormStatus, useFormContext } from "../../../components/Contexts/FormContext"; import AdditionalContact from "../../../components/Questionnaire/AdditionalContact"; import FormContainer from "../../../components/Questionnaire/FormContainer"; import SectionGroup from "../../../components/Questionnaire/SectionGroup"; import TextInput from "../../../components/Questionnaire/TextInput"; +import AutocompleteInput from '../../../components/Questionnaire/AutocompleteInput'; +import institutionConfig from "../../../config/InstitutionConfig"; +import AddRemoveButton from '../../../components/Questionnaire/AddRemoveButton'; import { filterNonNumeric, mapObjectWithKey, validateEmail } from '../utils'; type KeyedContact = { @@ -21,11 +23,11 @@ type KeyedContact = { * @param {FormSectionProps} props * @returns {JSX.Element} */ -const FormSectionA: FC = ({ refs, classes }: FormSectionProps) => { +const FormSectionA: FC = ({ SectionOption, refs }: FormSectionProps) => { const { status, data } = useFormContext(); + const { pi, primaryContact } = data; - const [pi] = useState(data.pi); - const [primaryContact] = useState(data.primaryContact); + const [piAsPrimaryContact, setPiAsPrimaryContact] = useState(data?.piAsPrimaryContact || false); const [additionalContacts, setAdditionalContacts] = useState(data.additionalContacts?.map(mapObjectWithKey) || []); const formRef = useRef(); @@ -89,21 +91,24 @@ const FormSectionA: FC = ({ refs, classes }: FormSectionProps) return ( {/* Principal Investigator */} - + - + = ({ refs, classes }: FormSectionProps) {/* Primary Contact */} - - - - - - - + + + setPiAsPrimaryContact(!piAsPrimaryContact)} + /> + )} + /> + + + + + + + + {/* Additional Contacts */} - + } + onClick={addContact} + disabled={status === FormStatus.SAVING} + /> + )} + > {additionalContacts.map((contact: KeyedContact, idx: number) => ( = ({ refs, classes }: FormSectionProps) onDelete={() => removeContact(contact.key)} /> ))} - - - - - ); }; -const styles = () => ({ - contactButton: { - color: "#346798", - margin: "25px", - marginBottom: "0px", - padding: "6px 20px", - minWidth: "115px", - borderRadius: "25px", - border: "2px solid #AFC2D8 !important", - background: "transparent", - "text-transform": "none", - "& .MuiButton-startIcon": { - marginRight: "14px", - }, - }, - noContentButton: { - marginTop: "-25px", - }, -}); - -export default withStyles(styles, { withTheme: true })(FormSectionA); +export default FormSectionA; diff --git a/src/content/questionnaire/sections/B.tsx b/src/content/questionnaire/sections/B.tsx index d5b302b6b..41b9cb245 100644 --- a/src/content/questionnaire/sections/B.tsx +++ b/src/content/questionnaire/sections/B.tsx @@ -205,7 +205,6 @@ const FormSectionB: FC = ({ refs }: FormSectionProps) => { return ( diff --git a/src/types/Application.d.ts b/src/types/Application.d.ts index d5e7e562b..3a3a3ef3b 100644 --- a/src/types/Application.d.ts +++ b/src/types/Application.d.ts @@ -2,6 +2,7 @@ type Application = { _id: number; sections: Section[]; pi: PI; + piAsPrimaryContact: boolean; primaryContact: PrimaryContact; additionalContacts: AdditionalContact[]; program: Program; @@ -40,11 +41,11 @@ type PrimaryContact = { email: string; phone: string; institution: string; - position: string; + role: string; }; type AdditionalContact = { - role: string; // NOTE: this needs to become position, currently matches GQL schema + role: string; firstName: string; lastName: string; institution: string; diff --git a/src/types/Globals.d.ts b/src/types/Globals.d.ts index 41d3abd7f..e0eda4b12 100644 --- a/src/types/Globals.d.ts +++ b/src/types/Globals.d.ts @@ -1,5 +1,4 @@ type FormSectionProps = { - classes?: any; refs: { saveFormRef: React.RefObject; submitFormRef: React.RefObject; From 5765a08564ab18f04cc16c8c224c7bad5999ee43 Mon Sep 17 00:00:00 2001 From: Alec Mattu Date: Wed, 28 Jun 2023 14:23:59 -0400 Subject: [PATCH 2/5] CRDCDH-33 Make primaryContact nullable --- .../Questionnaire/AdditionalContact.tsx | 5 ++- src/content/questionnaire/sections/A.tsx | 32 ++++++++++++++++--- src/types/Application.d.ts | 2 +- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/components/Questionnaire/AdditionalContact.tsx b/src/components/Questionnaire/AdditionalContact.tsx index 7090e3be8..acc7c0fa9 100644 --- a/src/components/Questionnaire/AdditionalContact.tsx +++ b/src/components/Questionnaire/AdditionalContact.tsx @@ -2,7 +2,6 @@ import React, { FC } from "react"; import { Grid, styled } from "@mui/material"; import RemoveCircleIcon from "@mui/icons-material/RemoveCircle"; import { Status as FormStatus, useFormContext } from "../Contexts/FormContext"; -import { filterNonNumeric, validateEmail } from "../../content/questionnaire/utils"; import institutionConfig from "../../config/InstitutionConfig"; import TextInput from "./TextInput"; import AddRemoveButton from "./AddRemoveButton"; @@ -64,9 +63,9 @@ const AdditionalContact: FC = ({ index, contact, onDelete }: Props) => { = ({ index, contact, onDelete }: Props) => { diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx index a40099428..7017bd2c9 100644 --- a/src/content/questionnaire/sections/A.tsx +++ b/src/content/questionnaire/sections/A.tsx @@ -11,7 +11,7 @@ import TextInput from "../../../components/Questionnaire/TextInput"; import AutocompleteInput from '../../../components/Questionnaire/AutocompleteInput'; import institutionConfig from "../../../config/InstitutionConfig"; import AddRemoveButton from '../../../components/Questionnaire/AddRemoveButton'; -import { filterNonNumeric, mapObjectWithKey, validateEmail } from '../utils'; +import { mapObjectWithKey } from '../utils'; type KeyedContact = { key: string; @@ -50,10 +50,12 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection const formObject = parseForm(formRef.current, { nullify: false }); const combinedData = { ...cloneDeep(data), ...formObject }; - // Reset additional contacts if none are provided if (!formObject.additionalContacts || formObject.additionalContacts.length === 0) { combinedData.additionalContacts = []; } + if (formObject.piAsPrimaryContact) { + combinedData.primaryContact = null; + } return { ref: formRef, data: combinedData }; }; @@ -99,7 +101,13 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection - + = ({ SectionOption, refs }: FormSection - + = ({ SectionOption, refs }: FormSection disableClearable required /> - + {/* Additional Contacts */} diff --git a/src/types/Application.d.ts b/src/types/Application.d.ts index 3a3a3ef3b..152b97daa 100644 --- a/src/types/Application.d.ts +++ b/src/types/Application.d.ts @@ -3,7 +3,7 @@ type Application = { sections: Section[]; pi: PI; piAsPrimaryContact: boolean; - primaryContact: PrimaryContact; + primaryContact: PrimaryContact | null; additionalContacts: AdditionalContact[]; program: Program; study: Study; From 2b691116fd8876855b0a78f6e8d3b6c4c477cc86 Mon Sep 17 00:00:00 2001 From: Alec Mattu Date: Thu, 29 Jun 2023 15:13:31 -0400 Subject: [PATCH 3/5] CRDCDH-33 Update to match GQL changes --- src/components/Questionnaire/AdditionalContact.tsx | 7 ++----- src/components/Questionnaire/PlannedPublication.tsx | 1 + src/components/Questionnaire/Repository.tsx | 6 +++--- src/config/InstitutionConfig.ts | 1 - src/content/questionnaire/sections/A.tsx | 6 ++++-- src/content/questionnaire/sections/B.tsx | 1 - 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/Questionnaire/AdditionalContact.tsx b/src/components/Questionnaire/AdditionalContact.tsx index 155ae896d..bfeb41fdd 100644 --- a/src/components/Questionnaire/AdditionalContact.tsx +++ b/src/components/Questionnaire/AdditionalContact.tsx @@ -71,15 +71,12 @@ const AdditionalContact: FC = ({ index, contact, onDelete }: Props) => { = ({ name={`study[plannedPublications][${index}][expectedDate]`} initialValue={expectedDate} gridWidth={6} + format="MM/DD/YYYY" required tooltipText="Data made available for secondary research only after investigators have obtained approval from diff --git a/src/components/Questionnaire/Repository.tsx b/src/components/Questionnaire/Repository.tsx index a03ff8930..324689c42 100644 --- a/src/components/Questionnaire/Repository.tsx +++ b/src/components/Questionnaire/Repository.tsx @@ -31,7 +31,7 @@ const Repository: FC = ({ }: Props) => { const { status } = useFormContext(); - const { name, studyID } = repository; + const { name, studyID, submittedDate } = repository; return ( @@ -56,8 +56,8 @@ const Repository: FC = ({ /> = ({ SectionOption, refs }: FormSection = ({ SectionOption, refs }: FormSection Date: Fri, 30 Jun 2023 13:21:23 -0400 Subject: [PATCH 4/5] CRDCDH-33 Add missing placeholders --- src/content/questionnaire/sections/A.tsx | 82 ++++++++++++++++++------ 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx index 0bc1e7a18..d0d036b09 100644 --- a/src/content/questionnaire/sections/A.tsx +++ b/src/content/questionnaire/sections/A.tsx @@ -60,12 +60,6 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection return { ref: formRef, data: combinedData }; }; - /** - * Add a empty additional contact to the list - * - * @param {void} - * @returns {void} - */ const addContact = () => { setAdditionalContacts([ ...additionalContacts, @@ -81,12 +75,6 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection ]); }; - /** - * Remove an additional contact from the list - * - * @param {string} key The generated key for the contact - * @returns {void} - */ const removeContact = (key: string) => { setAdditionalContacts(additionalContacts.filter((c) => c.key !== key)); }; @@ -98,14 +86,36 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection > {/* Principal Investigator */} - - - + + + = ({ SectionOption, refs }: FormSection disableClearable freeSolo /> - + = ({ SectionOption, refs }: FormSection readOnly /> - - - + + + @@ -180,7 +219,8 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection type="phone" label="Phone number" name="primaryContact[phone]" - value={primaryContact.phone} + value={primaryContact?.phone || ""} + placeholder="Enter phone number" maxLength={25} readOnly={piAsPrimaryContact} /> From 59d615648d5609601b23de1527f75cbed5ae236a Mon Sep 17 00:00:00 2001 From: Alec Mattu Date: Fri, 30 Jun 2023 16:07:41 -0400 Subject: [PATCH 5/5] CRDCDH-33 Fix checkbox styling --- src/content/questionnaire/sections/A.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/content/questionnaire/sections/A.tsx b/src/content/questionnaire/sections/A.tsx index d0d036b09..c892e64e1 100644 --- a/src/content/questionnaire/sections/A.tsx +++ b/src/content/questionnaire/sections/A.tsx @@ -1,5 +1,5 @@ import React, { FC, useEffect, useRef, useState } from "react"; -import { Checkbox, FormControlLabel, Grid } from '@mui/material'; +import { Checkbox, FormControlLabel, Grid, styled } from '@mui/material'; import { parseForm } from '@jalik/form-parser'; import { cloneDeep } from 'lodash'; import AddCircleIcon from "@mui/icons-material/AddCircle"; @@ -17,6 +17,14 @@ type KeyedContact = { key: string; } & Contact; +const StyledFormControlLabel = styled(FormControlLabel)({ + transform: "translateY(-15px)", + "& .MuiFormControlLabel-label": { + color: "#083A50", + fontWeight: "700", + }, +}); + /** * Form Section A View * @@ -149,7 +157,7 @@ const FormSectionA: FC = ({ SectionOption, refs }: FormSection {/* Primary Contact */} -