des/2506-changes-to-simulation-project-type

designsafe/static/scripts/data-depot/components/projects/pipeline-selection/pipeline-selection-sim.template.html

@@ -88,8 +88,8 @@ <h3 class="text-center">
  <i class="fa fa-spinner fa-spin"></i> Loading...
  </h3>
  </div>
- <!-- Simulation Reports -->
- <div ng-hide="$ctrl.ui.loading" ng-repeat="report in $ctrl.browser.project.report_set | orderBy: 'value.title'"
+ <!-- Simulation Reports --> <!-- this shouldn't be showing outside of the Simulation itself -->
+ <!-- <div ng-hide="$ctrl.ui.loading" ng-repeat="report in $ctrl.browser.project.report_set | orderBy: 'value.title'"
  ng-if="$ctrl.matchingGroup(simulation, report)"
  >
  <div class="dropdown dropdown-spacer-sm" id="details-{{report.uuid}}">
@@ -110,7 +110,8 @@ <h3 class="text-center">
  on-browse="$ctrl.onBrowse(file)"
  >&nbsp;</files-listing> </div>
  </div>
- </div>
+ </div> -->
+
  <div ng-hide="$ctrl.ui.loading" ng-repeat="simulation in $ctrl.browser.project.simulation_set">
  <div class="dropdown dropdown-spacer-lg" id="details-{{simulation.uuid}}" style="margin-top: 15px">
  <a ng-click="$ctrl.selectEntity(simulation)">Select this Simulation and all of its files</a>

designsafe/static/scripts/data-depot/components/projects/publication-preview/publication-preview-sim.component.html

@@ -37,7 +37,7 @@ <h3 class="text-center">
  </h3>
  </div>
  <!-- Project Reports -->
- <div ng-if="$ctrl.matchingGroup(simulation, report) && !$ctrl.ui.fileNav && !$ctrl.ui.loading"
+ <!-- <div ng-if="$ctrl.matchingGroup(simulation, report) && !$ctrl.ui.fileNav && !$ctrl.ui.loading"
  ng-repeat="report in $ctrl.project.report_set | orderBy: 'value.title'"
  >
  <div class="dropdown dropdown-spacer-sm" id="details-{{report.uuid}}">
@@ -72,7 +72,8 @@ <h3 class="text-center">
  listing="$ctrl.FileListingService.listings.main"
  on-browse="$ctrl.onBrowse(file)"
  >&nbsp;</files-listing>
- </div>
+ </div> -->
+
  <div ng-if="!$ctrl.ui.fileNav && !$ctrl.ui.loading" ng-repeat="simulation in $ctrl.project.simulation_set" style="margin-bottom:20px">
  <div class="dropdown dropdown-spacer-sm" id="details-{{simulation.uuid}}">
  <div class="citation-gray" id="anchor-{{simulation.uuid}}"> 

designsafe/static/scripts/ng-designsafe/services/project-service.js

@@ -217,9 +217,10 @@ export class ProjectService {
  sensor_list: 'Sensor Information',
  event: 'Event',
  simulation: 'Simulation',
- model: 'Model',
+ model: 'Model', 
  input: 'Input',
  output: 'Output',
+ report: 'Report',
  hybrid_simulation: 'Hybrid Simulation',
  global_model: 'Global Model',
  coordinator: 'Coordinator',
@@ -311,13 +312,18 @@ export class ProjectService {
  Simulation Requirements:
  Condition 1)
  + If a Simulation is published it must have:
- - Model Set
+ - Model Set (no files required)
  - Input Set
  - Output Set
+ - Report Set
  + Sets must include categorized files
  */
- let requirements = ['model', 'input', 'output'];
- let subentities = [].concat(project.model_set || [], project.input_set || [], project.output_set || []);
+ let requirements = ['model', 'input', 'output', 'report'];
+ let subentities = [].concat(
+ project.model_set || [], 
+ project.input_set || [], 
+ project.output_set || [], 
+ project.report_set || []);
  let simulations = selPrimEnts.filter((ent) => ent.name.endsWith('simulation'));
  // let reports = selPrimEnts.filter(ent => ent.name.endsWith('report'));
  if (simulations.length) {

designsafe/static/scripts/projects/components/manage-categories/manage-categories.component.html

@@ -47,21 +47,22 @@ <h3 class="text-center">
  <!-- Simulation Categories -->
  <div ng-if="$ctrl.ui.simulation">
  <div>
- <span class="category-blue">Simulation Model</span> Files and/or information describing the design, geometry, and/or code of a simulation.
+ <span class="category-blue">Simulation Model</span> Information and/or files describing the design, geometry, workflow, 
+ runtime environment and/or code of a simulation. This includes referencing research software or a community model and version when applicable.
  </div>
  <div>
- <span class="category-teal">Simulation Input</span> Files containing the parameters of the simulation.
+ <span class="category-teal">Simulation Input</span> Files and references to the files containing the parameters of the simulation.
  </div>
  <div>
  <span class="category-yellow">Simulation Output</span> Files containing the results of a simulation.
  </div>
  <div>
- <span class="category-light-blue">Analysis</span> Tables, graphs, visualizations, Jupyter Notebooks,
- or other representations of the results.
+ <span class="category-light-blue">Analysis</span> Tables, graphs, visualizations, Jupyter Notebooks, or other representations of the results.
  </div>
  <div>
- <span class="category-gray">Report</span> Written accounts made to convey information about an
- entire project or simulation.
+ <span class="category-gray">Report</span> Detailed written account/s to convey information about the way in which the simulation was organized, 
+ how to run it, about the file contents and the file naming convention used. It could be one or a group of files including a readme file and 
+ a data dictionary, depending on the complexity and components of the simulation.
  </div>
  </div>
  <!-- Hybrid Simulation Categories -->
@@ -177,7 +178,8 @@ <h3 class="text-center">
  Summarize the purpose of the category and its files. What is it about? What are its features?
  </div>
  <div>
- <textarea class="form-textbox" type="text" id="add-exp-desc" ng-model="$ctrl.form.projectTagToAdd.description" ng-minlength="50" ng-maxlength="5000"></textarea>
+ <textarea ng-required="$ctrl.form.projectTagToAdd.name === 'designsafe.project.simulation.model'" 
+ class="form-textbox" type="text" id="add-exp-desc" ng-model="$ctrl.form.projectTagToAdd.description" ng-minlength="50" ng-maxlength="5000"></textarea>
  <span ng-if="addForm.$error.minlength[0].$invalid || addForm.$error.maxlength[0].$invalid" class="label-form-desc-error">Description length is invalid </span>
  </div>
  </div>

designsafe/static/scripts/projects/components/manage-simulations/manage-simulations.template.html

@@ -7,6 +7,14 @@ <h4 class="modal-title" style="border:none;">
  </h4>
 </div>
 <div class="modal-body">
+ <div style="margin-bottom: 20px;">
+ <span style="font-weight: bold;">
+ Simulation: </span>
+ <span>
+ A stand-alone dataset published under a unique citation and DOI. 
+ One or more can be published under a project and each can be published progressively.
+ </span>
+ </div>
  <div class="error" ng-if="$ctrl.ui.error">
  {{$ctrl.ui.error}}
  </div>