Merge pull request #1213 from USGS-WiM/bulkuploadbug

fixes bulkupload bug and temp fix for #1197
USGS-WiM · Jun 11, 2021 · dfab7d5 · dfab7d5
2 parents 802b9c8 + 01cbd59
commit dfab7d5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -78,6 +78,6 @@
       }
     </style>
   </app-root>
-<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.4fe429747ab56eeddc25.js"></script><script type="text/javascript" src="scripts.c7033f5da8062c6a581d.js"></script><script type="text/javascript" src="main.b37cc91b8f6cc0509b44.js"></script></body>
+<script type="text/javascript" src="runtime.ec2944dd8b20ec099bf3.js"></script><script type="text/javascript" src="polyfills.4fe429747ab56eeddc25.js"></script><script type="text/javascript" src="scripts.c7033f5da8062c6a581d.js"></script><script type="text/javascript" src="main.38eae6f362a87b66d71e.js"></script></body>
 
 </html>
diff --git a/dist/main.b37cc91b8f6cc0509b44.js → dist/main.38eae6f362a87b66d71e.js b/dist/main.b37cc91b8f6cc0509b44.js → dist/main.38eae6f362a87b66d71e.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "whispers",
-  "version": "2.16.8",
+  "version": "2.16.9",
   "description": "Wildlife Health Information Sharing Partnership event reporting system (WHISPers)",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/bulk-upload/bulk-upload.component.ts b/src/app/bulk-upload/bulk-upload.component.ts
@@ -124,7 +124,7 @@ export class BulkUploadComponent implements OnInit {
     const array = [];
     const stringArray = JSON.parse('[' + diagnosisIDArray + ']');
     for (const item of stringArray) {
-      array.push({ 'diagnosis': item });
+      if (item !== undefined && item !== null ) {array.push({ 'diagnosis': item })};
     }
     return array;
   }

diff --git a/src/app/search-results-summary-report/search-results-summary-report.component.ts b/src/app/search-results-summary-report/search-results-summary-report.component.ts
@@ -805,7 +805,7 @@ export class SearchResultsSummaryReportComponent implements OnInit {
         // calc for Number of Animals Affected
         number_animals_affected += element.affected_count;
 
-        // initial calc for Species Most Affected
+        // initial calc for Most Frequent Species
         if (speciesArray.length === 0) {
           element.species.forEach(species => {
             speciesArray.push({ name: species.name, count: 1 });
@@ -1092,7 +1092,7 @@ export class SearchResultsSummaryReportComponent implements OnInit {
                     [{ border: [false, false, true, false], text: 'Most Frequent Event Diagnosis', bold: true, alignment: 'right' }, { text: most_frequent_diagnosis, alignment: 'left' }],
                     [{ border: [false, false, true, false], text: '# of Animals Affected', bold: true, alignment: 'right' }, number_animals_affected],
                     [{ border: [false, false, true, false], text: '# of Species Affected', bold: true, alignment: 'right' }, number_species_affected],
-                    [{ border: [false, false, true, false], text: 'Species Most Affected', bold: true, alignment: 'right' }, { text: species_most_affected, alignment: 'left' }],
+                    [{ border: [false, false, true, false], text: 'Most Frequent Species', bold: true, alignment: 'right' }, { text: species_most_affected, alignment: 'left' }],
                     [{ border: [false, false, true, false], text: 'Average Event Time Span', bold: true, alignment: 'right' }, average_event_time_span.toFixed(0).toString() + ' days'],
                     [{ border: [false, false, true, false], text: 'Event with Most Affected', bold: true, alignment: 'right' }, [{ text: eventsAndlinksAffected, alignment: 'left' }]],
                     [{ border: [false, false, true, false], text: 'Longest Running Event', bold: true, alignment: 'right' }, [{ text: eventsAndlinksLongest, alignment: 'left' }]],
@@ -1180,7 +1180,7 @@ export class SearchResultsSummaryReportComponent implements OnInit {
                 [{ text: 'Most Frequent Event Diagnosis', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.mostFrequentEvtDiag, border: [false, false, false, false] }],
                 [{ text: '# of Animals Affected', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.numAnimalsAffectedDefinition, border: [false, false, false, false] }],
                 [{ text: '# of Species Affected', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.numSpeciesAffectedDefinition, border: [false, false, false, false] }],
-                [{ text: 'Species Most Affected', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.speciesMostAffectedDefinition, border: [false, false, false, false] }],
+                [{ text: 'Most Frequent Species', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.speciesMostAffectedDefinition, border: [false, false, false, false] }],
                 [{ text: 'Average Event Time Span', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.avgEventTimeSpan, border: [false, false, false, false] }],
                 [{ text: 'Event with Most Affected', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.eventWithMostAffected, border: [false, false, false, false] }],
                 [{ text: 'Longest Running Event', border: [false, false, true, false], alignment: 'right', bold: true }, { text: this.longestRunningEvent, border: [false, false, false, false] }],