Merge pull request #15 from eipm/develop

Develop

README.md

@@ -4,7 +4,7 @@
 
 # AI Biopsy
 
-[![Actions Status](https://github.com/eipm/ai-biopsy/workflows/Docker/badge.svg)](https://github.com/eipm/ai-biopsy/actions) [![Github](https://img.shields.io/badge/github-1.1.0-green?style=flat&logo=github)](https://github.com/eipm/ai-biopsy) [![EIPM Docker Hub](https://img.shields.io/badge/EIPM%20docker%20hub-1.1.0-blue?style=flat&logo=docker)](https://hub.docker.com/repository/docker/eipm/ai-biopsy) [![GitHub Container Registry](https://img.shields.io/badge/GitHub%20Container%20Registry-1.1.0-blue?style=flat&logo=docker)](https://github.com/orgs/eipm/packages/container/package/ai-biopsy) [![Python 3.7.9](https://img.shields.io/badge/python-3.7.9-blue.svg)](https://www.python.org/downloads/release/python-379/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Actions Status](https://github.com/eipm/ai-biopsy/workflows/Docker/badge.svg)](https://github.com/eipm/ai-biopsy/actions) [![Github](https://img.shields.io/badge/github-1.1.1-green?style=flat&logo=github)](https://github.com/eipm/ai-biopsy) [![EIPM Docker Hub](https://img.shields.io/badge/EIPM%20docker%20hub-1.1.1-blue?style=flat&logo=docker)](https://hub.docker.com/repository/docker/eipm/ai-biopsy) [![GitHub Container Registry](https://img.shields.io/badge/GitHub%20Container%20Registry-1.1.1-blue?style=flat&logo=docker)](https://github.com/orgs/eipm/packages/container/package/ai-biopsy) [![Python 3.7.9](https://img.shields.io/badge/python-3.7.9-blue.svg)](https://www.python.org/downloads/release/python-379/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 ## AI Biopsy Requirements
 

src/api/version.py

@@ -1,4 +1,5 @@
-version = '1.1.0'
+version = '1.1.1'
+
 
 def api_version():
-    return version
+    return version

src/static/assets/ai_biopsy.js

@@ -130,12 +130,12 @@ function calculateCumulativeResult() {
 };
 
 resultBadges = {
-    'N/A': { badge: '<span class="new badge" data-badge-caption>N/A</span>', description: 'Not applicable', group: 'Generic' },
-    'Undetermined': { badge: '<span class="new grey badge" data-badge-caption>Undetermined</span>', description: 'More images are required in order to make a decision.', group: 'Generic' },
-    'Cancer': { badge: '<span class="new red darken-4 badge" data-badge-caption>Cancer</span>', description: 'Cancer has been detected.', group: 'Prostate Tissue Assessment' },
-    'Benign': { badge: '<span class="new green badge" data-badge-caption>Benign</span>', description: 'No cancer has been detected.', group: 'Prostate Tissue Assessment' },
-    'High Risk': { badge: '<span class="new orange darken-4 badge" data-badge-caption>High Risk</span>', description: 'Cancer cells are poorly differentiated (grade group = 3, 4, and 5)', group: 'Risk Assessment' },
-    'Low Risk': { badge: '<span class="new orange badge" data-badge-caption>Low Risk</span>', description: 'Cancer cells are likely to grow slowly (grade group = 1 and 2)', group: 'Risk Assessment' },
+    'N/A': { badge: '<span class="new badge" data-badge-caption>N/A</span>', colorClass: '', description: 'Not applicable', group: 'Generic' },
+    'Undetermined': { badge: '<span class="new grey badge" data-badge-caption>Undetermined</span>', colorClass: 'grey', description: 'More images are required in order to make a decision.', group: 'Generic' },
+    'Cancer': { badge: '<span class="new red darken-4 badge" data-badge-caption>Cancer</span>', colorClass: 'red darken-4', description: 'Cancer has been detected.', group: 'Prostate Tissue Assessment' },
+    'Benign': { badge: '<span class="new green badge" data-badge-caption>Benign</span>', colorClass: 'green', description: 'No cancer has been detected.', group: 'Prostate Tissue Assessment' },
+    'High Risk': { badge: '<span class="new orange darken-4 badge" data-badge-caption>High Risk</span>', colorClass: 'orange darken-4', description: 'Cancer cells are poorly differentiated (grade group = 3, 4, and 5)', group: 'Risk Assessment' },
+    'Low Risk': { badge: '<span class="new orange badge" data-badge-caption>Low Risk</span>', colorClass: 'orange', description: 'Cancer cells are likely to grow slowly (grade group = 1 and 2)', group: 'Risk Assessment' },
 };
 
 function updateResultsUI(result) {
@@ -341,17 +341,17 @@ function createImagesUIFromFiles(files, imagesPlaceholder) {
                         <li>
                             <div class="collapsible-header">Image Results</div>
                             <div class="collapsible-body">
-                                <div class="poor">
-                                    <div class="good bar"></div>
+                                <div class="${resultBadges.Cancer.colorClass}">
+                                    <div class="${resultBadges.Benign.colorClass} bar"></div>
                                 </div>
-                                <div class="legend-item"><div class="legend-marker good"></div>Benign: <span class="good-text1"></span></div>
-                                <div class="legend-item"><div class="legend-marker poor"></div>Cancer: <span class="poor-text1"></span></div>
+                                <div class="legend-item"><div class="legend-marker ${resultBadges.Benign.colorClass}"></div>Benign: <span class="good-text1"></span></div>
+                                <div class="legend-item"><div class="legend-marker ${resultBadges.Cancer.colorClass}"></div>Cancer: <span class="poor-text1"></span></div>
                                 </br>
-                                <div class="poor">
-                                    <div class="good bar"></div>
+                                <div class="${resultBadges['High Risk'].colorClass}">
+                                    <div class="${resultBadges['Low Risk'].colorClass} bar"></div>
                                 </div>
-                                <div class="legend-item"><div class="legend-marker good"></div>Low Risk: <span class="good-text2"></span></div>
-                                <div class="legend-item"><div class="legend-marker poor"></div>High Risk: <span class="poor-text2"></span></div>
+                                <div class="legend-item"><div class="legend-marker ${resultBadges['Low Risk'].colorClass}"></div>Low Risk: <span class="good-text2"></span></div>
+                                <div class="legend-item"><div class="legend-marker ${resultBadges['High Risk'].colorClass}"></div>High Risk: <span class="poor-text2"></span></div>
                             </div>
                         </li>
                     </ul>

src/static/index.html

@@ -77,7 +77,7 @@ <h6>Results</h6>
     </div>
     <footer>
         <div>Copyright © <span id="year"></span> Englander Institute for Precision Medicine</div>
-        <div>AI Biopsy Version 1.1.0</div>
+        <div>AI Biopsy Version 1.1.1</div>
         <img alt="logo" class="footer-logo" src="assets/LOGO_ENGLANDER_2LINE_RGB.png">
     </footer>
 

src/static/login.html

@@ -32,7 +32,7 @@ <h5 class="login-title">Log in</h5>
         </div>
         <footer>
             <div>Copyright © <span id="year"></span> Englander Institute for Precision Medicine</div>
-            <div>AI Biopsy Version 1.1.0</div>
+            <div>AI Biopsy Version 1.1.1</div>
             <img alt="logo" class="footer-logo" src="assets/LOGO_ENGLANDER_2LINE_RGB.png">
         </footer>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.1/jquery.min.js"></script>