diff --git a/crc/services/file_service.py b/crc/services/file_service.py index 13466a0e..3585b047 100644 --- a/crc/services/file_service.py +++ b/crc/services/file_service.py @@ -108,7 +108,6 @@ class FileService(object): return file_extension.lower().strip()[1:] @staticmethod - def update_file(file_model, binary_data, content_type): session.flush() # Assure the database is up-to-date before running this. diff --git a/crc/static/bpmn/research_rampup/BuildingList.xls b/crc/static/bpmn/research_rampup/BuildingList.xls new file mode 100644 index 00000000..a0b46032 Binary files /dev/null and b/crc/static/bpmn/research_rampup/BuildingList.xls differ diff --git a/crc/static/bpmn/rrt/DepartmentList-Architecture.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-Architecture.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-Architecture.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-Architecture.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList-ArtsSciences.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-ArtsSciences.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-ArtsSciences.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-ArtsSciences.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList-Education.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-Education.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-Education.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-Education.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList-Engineering.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-Engineering.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-Engineering.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-Engineering.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList-Medicine.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-Medicine.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-Medicine.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-Medicine.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList-ProvostOffice.xlsx b/crc/static/bpmn/research_rampup/DepartmentList-ProvostOffice.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList-ProvostOffice.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList-ProvostOffice.xlsx diff --git a/crc/static/bpmn/rrt/DepartmentList.xlsx b/crc/static/bpmn/research_rampup/DepartmentList.xlsx similarity index 100% rename from crc/static/bpmn/rrt/DepartmentList.xlsx rename to crc/static/bpmn/research_rampup/DepartmentList.xlsx diff --git a/crc/static/bpmn/research_rampup/LabSpaces.xlsx b/crc/static/bpmn/research_rampup/LabSpaces.xlsx new file mode 100644 index 00000000..04349be1 Binary files /dev/null and b/crc/static/bpmn/research_rampup/LabSpaces.xlsx differ diff --git a/crc/static/bpmn/research_rampup/RTT_Approvers.dmn b/crc/static/bpmn/research_rampup/RTT_Approvers.dmn new file mode 100644 index 00000000..7333b325 --- /dev/null +++ b/crc/static/bpmn/research_rampup/RTT_Approvers.dmn @@ -0,0 +1,277 @@ + + + + + + + PISchool + + + + + + + + + + "Architecture" + + + "Architecture" + + + PISupervisor.data.uid + + + "Supervisor" + + + "agc9a" + + + "Associate Research Dean" + + + + + "Arts & Sciences" + + + "Arts & Sciences" + + + PISupervisor.data.uid + + + "Supervisor" + + + "dh2t" + + + "Associate Research Dean" + + + + + "Commerce" + + + "Commerce" + + + "dcs8f" + + + "Associate Research Dean" + + + + + + + + + + + "Darden" + + + "Darden" + + + "mw4m" + + + "Associate Research Dean" + + + + + + + + + + + "Data Science" + + + "Data Science" + + + "cws3v" + + + "Associate Research Dean" + + + + + + + + + + + "Education" + + + "Education" + + + PISupervisor.data.uid + + + "Supervisor" + + + "cpb8g" + + + "Associate Research Dean" + + + + + "Engineering" + + + "Engineering" + + + "sb5mc" + + + "Associate Research Dean" + + + + + + + + + + + "Law" + + + "Law" + + + "kendrick" + + + "Associate Research Dean" + + + + + + + + + + + "Leadership & Public Policy" + + + "Leadership & Public Policy" + + + "jps3va" + + + "Associate Research Dean" + + + + + + + + + + + "Medicine" + + + "Medicine" + + + PISupervisor.data.uid + + + "Supervisor" + + + "mas3x" + + + "Associate Research Dean" + + + + + "Nursing" + + + "Nursing" + + + "jla7e" + + + "Associate Research Dean" + + + + + + + + + + + "Continuing Education" + + + "Continuing Education" + + + "ado4v" + + + "Associate Research Dean" + + + + + + + + + + + "Provost Office" + + + "Provost Office" + + + "rammk" + + + "VP of Research" + + + + + + + + + + + diff --git a/crc/static/bpmn/rrt/ResearchRampUpPlan.docx b/crc/static/bpmn/research_rampup/ResearchRampUpPlan.docx similarity index 59% rename from crc/static/bpmn/rrt/ResearchRampUpPlan.docx rename to crc/static/bpmn/research_rampup/ResearchRampUpPlan.docx index e01d0dac..1bc52f56 100644 Binary files a/crc/static/bpmn/rrt/ResearchRampUpPlan.docx and b/crc/static/bpmn/research_rampup/ResearchRampUpPlan.docx differ diff --git a/crc/static/bpmn/rrt/SchoolList.xls b/crc/static/bpmn/research_rampup/SchoolList.xls similarity index 100% rename from crc/static/bpmn/rrt/SchoolList.xls rename to crc/static/bpmn/research_rampup/SchoolList.xls diff --git a/crc/static/bpmn/rrt/rrt.bpmn b/crc/static/bpmn/research_rampup/research_rampup.bpmn similarity index 71% rename from crc/static/bpmn/rrt/rrt.bpmn rename to crc/static/bpmn/research_rampup/research_rampup.bpmn index f58f29bc..8e6195e9 100644 --- a/crc/static/bpmn/rrt/rrt.bpmn +++ b/crc/static/bpmn/research_rampup/research_rampup.bpmn @@ -5,27 +5,45 @@ SequenceFlow_05ja25w - ### UNIVERSITY OF VIRGINIA RESEARCH -#### Request to Ramp Up Research Activities + ## Beta Stage: All data entered will be destroyed before public launch -Please note that only “critical research” deemed critical by the PI, department, and school will be ramped up in this phase II. As you fill out the names of personnel/students to request access for in this application, you will be asked for a brief description of the research they will be performing and why it is critical research. +### UNIVERSITY OF VIRGINIA RESEARCH +[From Research Ramp-up Guidance](https://research.virginia.edu/research-ramp-guidance) + + +#### Support +Report problems and/or submit questions to: askresearch@virginia.edu + +#### Research Guidance + +Our general principle is that only research activities requiring on-Grounds presence would be conducted on-Grounds. All other research-related work would continue to be performed by telework until restrictions are lifted. Separate school, department and building specific plans should supplement these guidelines. + + +For research that needs to be on Grounds, the plan is to ramp up in phases with emphasis on safety. The goal of this document is to provide a central framework for resuming activities while allowing for coordinated school specific implementation strategies. + + +The success of the ramp up depends on each researcher placing the safety of themselves and the people around them first, while conducting their research. In order to reduce our risks as much as possible, this must be a partnership between the researchers and the administration. + + +Schools are developing a process for the approval of ramp up requests and enforcement of safety guidelines described in this document. The VPR office is working with the schools to provide the necessary support for business process infrastructure, and working with the COO’s office to coordinate the acquisition of supplies necessary including face coverings and sanitizing supplies. **Instructions for Submitting:** -1. Add a Request for each lab space you manage in a building. If your lab spans multiple rooms or floors in a single building, one request will be required for that lab. If your lab spans multiple buildings, one request for each building will be required for that lab. The primary reason for this differentiation is that in addition to obtaining approval to restart operations, this information will also be used after start up to assist with any contact tracing that may be needed. -2. Select each Request added and step through each form presented, responding to all required and applicable fields. You may be presented with different questions if activities in each lab differ. + +1. The Research Ramp-up Plan allows for one request to be entered for a single Principle Investigator. In the form that follows enter the Primary Investigator this request is for and other identifying information. The PI's School and Supervisor will be used as needed for approval routing. +2. Provide all available information in the forms that follow to provide an overview of where the research will resume, who will be involved, what supporting resources will be needed and what steps you have taken to assure compliance with [Research Ramp-up Guidance](https://research.virginia.edu/research-ramp-guidance). 3. After all forms have been completed, you will be presented with the option to create your Research Recovery Plan in Word format. Download the document and review it. If you see any corrections that need to be made, return to the corresponding form and make the correction. -4. Once the generated Research Recovery Plan is finalize, use the web site to submit it to the Office of the Vice President for Research for review. +4. Once the generated Research Recovery Plan is finalize, proceed to the Plan Submission step to submit your plan for approval. SequenceFlow_05ja25w SequenceFlow_0h50bp3 - + - + @@ -100,6 +118,7 @@ Please note that only “critical research” deemed critical by the PI, departm + @@ -125,6 +144,8 @@ Information on all researchers you are requesting approval for reentry into the + + @@ -143,7 +164,7 @@ Information on all researchers you are requesting approval for reentry into the - + @@ -152,21 +173,10 @@ Information on all researchers you are requesting approval for reentry into the - - - - - - - - - - - - + @@ -174,6 +184,11 @@ Information on all researchers you are requesting approval for reentry into the + + + + + Flow_1eiud85 @@ -204,97 +219,20 @@ Information on all researchers you are requesting approval for reentry into the #### End of Workflow Place instruction here, - Flow_00y3047 + Flow_05w8yd6 - - - Review plan, make changes if needed, continue of ready to submit. - Flow_06873ag + + + Your Research Ramp-up Plan has been generated and is available in the Files pop-out found in the upper left hand corner of this application Click on the file name link to download the MS Word file to download, open and review. If changes are needed, choose the appropriate menu choice to make your edits, clicking Save when done. Note that you will need to revisit subsequent steps so the application can check to see if your edits impacted future workflow decisions. All your data will be persevered and you will need to click the Save button on each step to proceed. + +When your Research Ramp-up Plan is complete and ready to submit for review and approval, click the Continue button below. + Flow_0aqgwvu Flow_1e2qi9s - - #### Space used by {{ PIComputingID.label }} and shared with other PIs. + + #### Space used by {{ PIComputingID.label }} and shared with other PIs. If all space is exclusive and not shared with one or more other investigators, Click Save to skip this section and proceed to the next section. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -311,12 +249,19 @@ Place instruction here, + + + + + + + - + @@ -333,7 +278,6 @@ Place instruction here, - @@ -345,35 +289,46 @@ Place instruction here, + + + + + + + + + + Flow_19xeq76 Flow_16342pm - Flow_16y8glw + Flow_1v7r1tg Flow_19xeq76 Flow_0qf2y84 Flow_15zy1q7 Flow_0ya8hw8 - Flow_16342pm Flow_0tk64b6 Flow_12ie6w0 Flow_0zz2hbq + Flow_16342pm Flow_1eiud85 - - - + + + - - #### Space managed exclusively by {{ PIComputingID.label }} + + #### Space managed exclusively by {{ PIComputingID.label }} +Submit one entry for each space the PI is the exclusive investigator. If all space is shared with one or more other investigators, Click Save to skip this section and proceed to the Shared Space section. - + @@ -385,6 +340,17 @@ Place instruction here, + + + + + + + + + + + @@ -396,21 +362,12 @@ Place instruction here, - - - - - - - - - - + - + @@ -429,7 +386,6 @@ Place instruction here, - @@ -532,9 +488,9 @@ Maintain social distancing by designing space between people to be at least 9 fe Flow_0zrsh65 - + #### Health Safety Requirements: -Use EHS lab safety manual template for COVID (available May 25) to create and upload a copy of your laboratory policy statement to all members which includes at a minimum the following details: +Use EHS [Lab Safety Plan During COVID 19 template](https://www.google.com/url?q=http://ehs.virginia.edu/files/Lab-Safety-Plan-During-COVID-19.docx&source=gmail&ust=1590687968958000&usg=AFQjCNE83uGDFtxGkKaxjuXGhTocu-FDmw) to create and upload a copy of your laboratory policy statement to all members which includes at a minimum the following details: - Laboratory face covering rules, use of other PPE use as required - Adherence to individual schedules, check-in, check out requirements - Completion of online EHS safety training requirement @@ -544,7 +500,7 @@ Use EHS lab safety manual template for COVID (available May 25) to create and up - Where and how to obtain PPE including face covering - + Flow_1yqkpgu @@ -597,20 +553,19 @@ Use EHS lab safety manual template for COVID (available May 25) to create and up Flow_1c6m5wv Flow_0qbi47d - #### By submitting this request, you understand that every member listed in this form for on Grounds laboratory access will: - Complete online COVID awareness & precaution training module (link forthcoming-May 25) - Complete daily health acknowledgement form signed (electronically) –email generated daily to those listed on your plan for access to on Grounds lab/research space - Fill out daily work attendance log for all lab members following your school process to check-in and out of work each day. - Flow_1e2qi9s - Flow_1tmzfwl + Flow_08njvvi + Flow_0j4rs82 - + Flow_0zrsh65 Flow_0tz5c2v @@ -618,190 +573,287 @@ Use EHS lab safety manual template for COVID (available May 25) to create and up Flow_0qbi47d Flow_06873ag - - Flow_1tmzfwl - Flow_00y3047 + Flow_06873ag + Flow_0aqgwvu CompleteTemplate ResearchRampUpPlan.docx RESEARCH_RAMPUP + + + + + + + + + + + + + + + + + + + + + + + + + + + + Flow_07ge8uf + Flow_1ufh44h + + + + + Flow_1e2qi9s + Flow_08njvvi + + + Flow_0cpmvcw + Flow_05w8yd6 + + + + Flow_1ufh44h + Flow_0cpmvcw + + + Flow_0j4rs82 + Flow_07ge8uf + RequestApproval ApprvlApprvr1 ApprvlApprvr2 + + + + Flow_16y8glw + Flow_1v7r1tg + UpdateStudy title:PIComputingID.label pi:PIComputingID.value + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - + + + - - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + diff --git a/crc/static/bpmn/rrt/BuildingList.xls b/crc/static/bpmn/rrt/BuildingList.xls deleted file mode 100644 index 3bde7a70..00000000 Binary files a/crc/static/bpmn/rrt/BuildingList.xls and /dev/null differ diff --git a/crc/static/bpmn/rrt_top_level_workflow/rrt_top_level_workflow.bpmn b/crc/static/bpmn/rrt_top_level_workflow/rrt_top_level_workflow.bpmn new file mode 100644 index 00000000..26b2fe37 --- /dev/null +++ b/crc/static/bpmn/rrt_top_level_workflow/rrt_top_level_workflow.bpmn @@ -0,0 +1,26 @@ + + + + + SequenceFlow_0lvudp8 + + + + SequenceFlow_0lvudp8 + + + + + + + + + + + + + + + + + diff --git a/example_data.py b/example_data.py index 954c233c..98746c50 100644 --- a/example_data.py +++ b/example_data.py @@ -209,19 +209,17 @@ class ExampleDataLoader: db.session.add(category) db.session.commit() - - self.create_spec(id="empty_workflow", - name="empty_workflow", + self.create_spec(id="rrt_top_level_workflow", + name="rrt_top_level_workflow", display_name="Top Level Workflow", description="Does nothing, we don't use the master workflow here.", category_id=None, - master_spec=True, - from_tests=True) + master_spec=True) - self.create_spec(id="rrt", - name="rrt", + self.create_spec(id="research_rampup", + name="research_rampup", display_name="Research Ramp-up Toolkit", - description="The workflow for the Research Ramp-up.", + description="Process for creating a new research ramp-up request.", category_id=0, master_spec=False)