0.10.12

Daylily-Informatics · Dec 11, 2024 · 8c34c5d · 8c34c5d
1 parent 70054e7
commit 8c34c5d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Bloom : Templated Abstract Polymorphic (and opinionated) LIMS 
-_a conceptual gambit in collaboration with chatGPT4_  /// _POC v0.10.11_
+_a conceptual gambit in collaboration with chatGPT4_  /// _POC v0.10.12_
 
 
 [![BLOOM LIMS Build Tests, MacOS, Ubuntu & CentOS](https://github.com/Daylily-Informatics/bloom/actions/workflows/macos.yaml/badge.svg)](https://github.com/Daylily-Informatics/bloom/actions/workflows/macos.yaml) [![BLOOM LIMS Build Tests, MacOS, Ubuntu & CentOS](https://github.com/Daylily-Informatics/bloom/actions/workflows/ubuntu.yaml/badge.svg)](https://github.com/Daylily-Informatics/bloom/actions/workflows/ubuntu.yaml) _ARM hardware is not supported_

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="bloom_lims",
-    version="0.10.11",
+    version="0.10.12",
     packages=find_packages(),
     install_requires=[
         # Add dependencies here,

diff --git a/templates/euid_details.html b/templates/euid_details.html
@@ -67,20 +67,24 @@ <h1>Object Details : {{ object.euid }}</h1>
         </tr>
         <tr>
             <td>EUID</td>
-            <td><a class="reference-link" href="euid_details?euid={{ object.euid }}">{{ object.euid }}</a></td>
-        </tr>
-        <tr>
-            <td>UUID</td>
-            <td><a class="reference-link" href="uuid_details?uuid={{ object.uuid }}">{{ object.uuid }}</a></td>
+            <td><a class="reference-link" href="euid_details?euid={{ object.euid }}">{{ object.euid }}</a>
+
+                {%if  object.json_addl.properties.ref_type and object.json_addl['properties']['ref_type']  == "presigned_url" %}
+                -- ( <a href="file_set_urls?fs_euid={{ object.euid }}">presigned urls</a> )
+		     {% else %}
+
+		    {% endif %}
+
+
+            </td>
         </tr>
+
         <tr>
-            <td>DB Name<ul>Given Name<br>Lab Code</ul></td>
-            <td>{{ object.name }}<ul>{%if  object.json_addl['properties']['name']  == "signed urls" %}<a href="file_set_urls?fs_euid={{ object.euid }}">{{ object.json_addl['properties']['name'] }}</a>
-													     {% else %}
-													     <b>{{ object.json_addl['properties']['name'] }}</b>
-													     {% endif %}
-													     <br>{{ object.json_addl['properties']['lab_code'] }}</ul></td>
+            <td>Given Name</td>
+            <td>{{ object.json_addl['properties']['name'] }}</td>
         </tr>
+
+
         <tr>
             <td>Polymorphic Discriminator</td>
             <td>{{ object.polymorphic_discriminator }}</td>
@@ -123,6 +127,10 @@ <h1>Object Details : {{ object.euid }}</h1>
                 {% endif %}
             </td>
         </tr>
+        <tr>
+            <td>UUID</td>
+            <td><a class="reference-link" href="uuid_details?uuid={{ object.uuid }}">{{ object.uuid }}</a></td>
+        </tr>
     </table>
 
     <hr>

diff --git a/templates/search_results.html b/templates/search_results.html
@@ -253,7 +253,7 @@
     <b>{{ n_results }} File Search Results</b>
     <form id="fileSetForm" action="/create_file_set" method="post"  >
         <div style="display: flex; flex:none;">
-            <div class="form-section" style="background-color: rgba(255, 204, 204, 0.1); flex:none;">
+            <div class="form-section" style="background-color: rgba(204, 255, 204, 0.1); flex:none;">
                 <h4>Download Selected Files</h4>
 
                 <div class="form-group">
@@ -340,6 +340,14 @@ <h4>Download Selected Files</h4>
                 <input type="hidden" id="file_euids" name="file_euids">
 
             </div>
+
+            <div class="form-section" style="background-color: rgba(204, 255, 204, 0.1);">
+                <small>
+                d/l<br>table<br>as<br>TSV<br>
+                </small>
+                <button type="submit" class="download-tsv" onclick="downloadTableAsTSV()">⬇️</button>
+            </div>
+
         </div>
     </form>
     <table border="1">
@@ -381,7 +389,6 @@ <h4>Download Selected Files</h4>
 
     <a href="/dewey">Go Back</a>
 
-    <button type="submit" class="floating-button download-tsv" onclick="downloadTableAsTSV()">⬇️</button>
 
 
     <script>