irie 0.0.20__tar.gz → 0.0.21__tar.gz

{irie-0.0.20 → irie-0.0.21}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.20
-Summary: Infrastructure Resilience Engine
+Version: 0.0.21
+Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
 Project-URL: Documentation, https://stairlab.berkeley.edu/software/irie/

{irie-0.0.20 → irie-0.0.21}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "irie"
-version = "0.0.20"
+version = "0.0.21"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
-description="Infrastructure Resilience Engine"
+description="An infrastructure resilience engine"
 
 license = {file = ".github/LICENSE.txt"}
 readme = "README.md"

{irie-0.0.20 → irie-0.0.21}/src/irie/apps/inventory/views.py

@@ -125,7 +125,7 @@ def dashboard(request):
             asset.id: max(event[1].pga for event in context["recent_evaluations"] if event[1].cesmd == asset.cesmd)
             for asset in assets
         }
-        
+
         context["asset_map"] = AssetMap(assets, colors=colors, color_name="Peak Station Accel.").get_html()
         context["calid"] = {b.cesmd: b.calid for b in assets}
 
@@ -192,7 +192,7 @@ def asset_profile(request, calid):
 
     # Compute Hazus fragility probabilities and curve
     try:
-        hazus_results = hazus_fragility(asset.nbi_data, generate_plot=False, return_data=True)
+        hazus_results = hazus_fragility(asset.nbi_data)
 
         # Add fragility probabilities and plot to the context
         context["hazus"] = {

{irie-0.0.20 → irie-0.0.21}/src/irie/apps/templates/includes/asset-event-table.html

@@ -59,20 +59,32 @@
     </tbody>
   </table>
 
-  <div class="card-footer px-3 border-0 d-flex flex-column flex-lg-row align-items-center justify-content-between">
-    <nav aria-label="Page navigation example">
-        <ul class="pagination mb-0">
-            <li class="page-item">
-                <a class="page-link disabled" href="#">Previous</a>
-            </li>
-            <li class="page-item disabled">
-                <a class="page-link" href="#">1</a>
-            </li>
-            <li class="page-item disabled">
-                <a class="page-link" href="#">Next</a>
-            </li>
-        </ul>
-    </nav>
-    <div class="fw-normal small mt-4 mt-lg-0">Showing <b>{{ evaluations|length }}</b> out of <b>{{ evaluations|length }}</b> entries</div>
-  </div>
+      <div class="card-footer px-3 border-0 d-flex flex-column flex-lg-row align-items-center justify-content-between">
+        <nav aria-label="Page navigation example">
+            <ul class="pagination mb-0">
+              <li class="page-item {% if not evaluations.has_previous %}disabled{% endif %}">
+                {% if evaluations.has_previous %}
+                  <a class="page-link" href="?page={{ evaluations.previous_page_number }}&{{ page_query }}">Previous</a>
+                {% else %}
+                  <a class="page-link disabled" href="#">Previous</a>
+                {% endif %}
+              </li>
+              {% for page in evaluations.paginator.page_range %}
+                {% if page <= evaluations.number|add:3 and page >= evaluations.number|add:-3 %}
+                  <li class="page-item {% if page == evaluations.number %}active{% endif %}">
+                    <a class="page-link" href="?page={{ page }}&{{ page_query }}">{{ page }}</a>
+                  </li>
+                {% endif %}
+              {% endfor %}
+              <li class="page-item {% if not evaluations.has_next %}disabled{% endif %}">
+                {% if evaluations.has_next %}
+                  <a class="page-link" href="?page={{ evaluations.next_page_number }}&{{ page_query }}">Next</a>
+                {% else %}
+                  <a class="page-link disabled" href="#">Next</a>
+                {% endif %}
+              </li>
+            </ul>
+        </nav>
+        <div class="fw-normal small mt-4 mt-lg-0">Showing <b>{{ evaluations|length }}</b> out of <b>{{ evaluations.paginator.count }}</b> entries</div>
+      </div>
   </div>

{irie-0.0.20 → irie-0.0.21}/src/irie/apps/templates/inventory/asset-profile.html

@@ -242,24 +242,26 @@
       <div class="col-8 mb-4">
         {% for table in tables %}
         <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive">
-          <div class="card card-body shadow table-wrapper table-responsive">
-            <table class="table table-hover" style="display: block;">
-              <caption>{{asset.calid}} Table {{forloop.counter}}</caption>
-              {# <thead><tr><th>Key</th> <th>Value</th></tr></thead> #}
-              <tbody>
-                {# <tr><td><b>CESMD</b></td><td>{{ asset_data.cesmd }}</td></tr> #}
-                {% for key,val in table.items %}
-                {% if val %}
-                <tr>
-                  <th scope="row" style="text-align:left; width:40%;">{{ key }}</th>
-                  <!-- The inline style here ensures that 
-                        there are line breaks in rows with long text -->
-                  <td style="width: 60%; white-space: normal !important;word-wrap: break-word;">{{ val }}</td>
-                </tr>
-                {% endif %}
-                {% endfor %}
-              </tbody>
-            </table>
+          <div class="card">
+            <div class="card-body shadow table-wrapper table-responsive">
+              <table class="table table-hover" style="display: block;">
+                <caption>{{asset.calid}} Table {{forloop.counter}}</caption>
+                {# <thead><tr><th>Key</th> <th>Value</th></tr></thead> #}
+                <tbody>
+                  {# <tr><td><b>CESMD</b></td><td>{{ asset_data.cesmd }}</td></tr> #}
+                  {% for key,val in table.items %}
+                  {% if val %}
+                  <tr>
+                    <th scope="row" style="text-align:left; width:40%;">{{ key }}</th>
+                    <!-- The inline style here ensures that 
+                          there are line breaks in rows with long text -->
+                    <td style="width: 60%; white-space: normal !important;word-wrap: break-word;">{{ val }}</td>
+                  </tr>
+                  {% endif %}
+                  {% endfor %}
+                </tbody>
+              </table>
+            </div>
         </div>
       </div>
       <br>

irie-0.0.21/src/irie/apps/templates/site/robots.txt

@@ -0,0 +1,8 @@
+Sitemap: https://structures.live/sitemap.xml
+
+User-Agent: *
+Disallow: /inventory/*/*/
+
+User-agent: GPTBot
+Disallow: /
+

{irie-0.0.20 → irie-0.0.21}/src/irie/core/urls.py

@@ -11,6 +11,7 @@ from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
+from django.views.generic.base import TemplateView
 
 admin.site.site_header = "IRiE"
 admin.site.index_title = "IRiE"
@@ -18,6 +19,11 @@ admin.site.site_title  = "IRiE"
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path(
+        "robots.txt",
+        TemplateView.as_view(template_name="site/robots.txt", content_type="text/plain"),
+    ),
+
 
     # Authentication routes
     path("", include("irie.apps.authentication.urls")),

{irie-0.0.20 → irie-0.0.21}/src/irie.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.20
-Summary: Infrastructure Resilience Engine
+Version: 0.0.21
+Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
 Project-URL: Documentation, https://stairlab.berkeley.edu/software/irie/

{irie-0.0.20 → irie-0.0.21}/src/irie.egg-info/SOURCES.txt

@@ -416,6 +416,7 @@ src/irie/apps/templates/site/page-lock.html
 src/irie/apps/templates/site/page-reset-password.html
 src/irie/apps/templates/site/page-sign-in.html
 src/irie/apps/templates/site/page-sign-up.html
+src/irie/apps/templates/site/robots.txt
 src/irie/apps/templates/site/settings.html
 src/irie/apps/templates/site/tables-bootstrap-tables.html
 src/irie/apps/templates/site/transactions.html