Merge branch 'dev' of https://github.com/CDCgov/MicrobeTrace

AABoyles · Jun 11, 2020 · 59f0827 · 59f0827
2 parents 06363b2 + cfd1556
commit 59f0827
Show file tree

Hide file tree

Showing 11 changed files with 1,419 additions and 10 deletions.
diff --git a/components/files.html b/components/files.html
@@ -95,6 +95,7 @@
         <div class="col-7">
           <select id="default-view" class="form-control form-control-sm" title="Which view should MicrobeTrace render first, once it has successfully processed the data?">
             <option value="2d_network" selected>2D Network</option>
+            <option value="pixi">Pixi</option>
             <option value="3d_network">3D Network</option>
             <option value="bubbles">Bubbles</option>
             <option value="table">Table</option>
@@ -1058,7 +1059,7 @@ <h5 id="sequence-controls-title" class="modal-title">Sequence Settings</h5>
             let data = XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]], {header: 1, raw: false, dateNF: 'yyyy-mm-dd'});
             let nodeIDs = [], nn = 0, nl = 0;
 
-            if (data[0][0]) {  // triangle matrix
+            if (data[0][0].replace(/\"/g, '').replace(/\'/g, '')) { // triangle matrix
               let topNodeIDs = [''];
               data.forEach((row, i) => {
                 const nodeID = row[0];

diff --git a/components/flow_diagram.html b/components/flow_diagram.html
@@ -138,7 +138,7 @@ <h5 class="modal-title">Export Flow Diagram</h5>
       $($('#flow-variables').find('select')).each(function (i) { order.push(this.value); });
       let variables = order.length;
 
-      let values = [], source_values = [], target_values = [], all_values = [], labels = [];
+      let values = [], source_values = [], target_values = [], all_values = [], labels = [], vars = [];
       for (let i = 0; i < variables; i++) {
         variable = order[i];
         let n = data.length;
@@ -148,7 +148,8 @@ <h5 class="modal-title">Export Flow Diagram</h5>
         }
         n = values.length;
         for (let j = 0; j < n; j++) {
-          labels.push(MT.titleize(variable + ' ' + values[j]));
+          labels.push(MT.titleize(values[j]));
+          vars.push(MT.titleize(variable));
           let value = variable + '-' + values[j] + '-' + i;
           if (i < variables - 1) source_values.push(value);
           if (i > 0) target_values.push(value);
@@ -199,7 +200,9 @@ <h5 class="modal-title">Export Flow Diagram</h5>
             width: 0.5
           },
           label: labels.map(MT.titleize),
-          color: session.style.widgets['flow-showNodes'] ? session.style.widgets['node-color'] : session.style.widgets['link-color']
+          color: session.style.widgets['flow-showNodes'] ? session.style.widgets['node-color'] : session.style.widgets['link-color'],
+          customdata: vars.map(MT.titleize),
+          hovertemplate: "<b> %{customdata}:  %{label} </b><br>Incoming flow count: %{targetLinks.length} <br>Outgoing flow count: %{sourceLinks.length}"+ "<extra>%{value}</extra>"
         },
         link: { source, target, value }
       }], {

diff --git a/components/pixi.html b/components/pixi.html
diff --git a/dist/bundle.secondary.js b/dist/bundle.secondary.js
diff --git a/index.html b/index.html
@@ -62,6 +62,7 @@ <h4>MicrobeTrace requires CSS to run, but it looks like the appropriate CSS file
       <li class="nav-item dropdown">
         <a href="#" class="nav-link dropdown-toggle py-0" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">View</a>
         <div class="dropdown-menu">
+          <a href="#" class="dropdown-item viewbutton" data-href="pixi">Pixi</a>
           <a href="#" class="dropdown-item viewbutton" data-href="2d_network">2D Network</a>
           <a href="#" class="dropdown-item viewbutton" data-href="3d_network">3D Network</a>
           <a href="#" class="dropdown-item viewbutton" data-href="histogram">Histogram</a>
@@ -99,6 +100,9 @@ <h4>MicrobeTrace requires CSS to run, but it looks like the appropriate CSS file
           <a href="#" id="AboutTab" class="dropdown-item" data-toggle="modal" data-target="#about-modal">About</a>
         </div>
       </li>
+
+      <li><span id="development-version" style="margin-left: 40px; color: #0037ff; font-weight: bolder; font-size: x-small;"> non production environment </span></li>
+
     </ul>
     <div id="search-form" class="form-inline navbar-form">
       <label for="search">Search</label>