irie 0.0.20__py3-none-any.whl → 0.0.21__py3-none-any.whl

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/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/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/apps/templates/site/robots.txt

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

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.dist-info → irie-0.0.21.dist-info}/METADATA

@@ -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.dist-info → irie-0.0.21.dist-info}/RECORD

@@ -57,7 +57,7 @@ irie/apps/inventory/sitemaps.py,sha256=yc3UMVuGWA8vC9zHseY1jfkeRw5_jTYjy-UUcGtGw
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/traffic.py,sha256=B3PHqn2Pm4AEdUZ_tuA16fuFruo2rm5waMBwLQyF-9g,4490337
 irie/apps/inventory/urls.py,sha256=mpmHjvDSHhC5xrEosbTH_h2bGWNJfslGcrt2mnUO40E,1019
-irie/apps/inventory/views.py,sha256=nfFG1AsCSuZPtMcCxKYxrbrQqK27iOExz1RhSSAQCRc,14596
+irie/apps/inventory/views.py,sha256=xOFxT4Te6zYEFCJNKCsJF4YDk5do-HcfWpBPMvuBBsI,14549
 irie/apps/inventory/archive/arcGIS.py,sha256=vcfsy1be4edOXD1Z3rkUnq9QmCTol7dypdF816Q3B_w,34893
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
 irie/apps/inventory/migrations/0002_alter_asset_bridge_sensors_and_more.py,sha256=rPzWHkjg-ZCorVA_gv6MVb5F6LTLHcwlPwhBR1PxVr0,842
@@ -363,7 +363,7 @@ irie/apps/templates/events/events.html,sha256=0PIELQsPVj1iv4moWKEOMfp4zbcSfkj5BC
 irie/apps/templates/events/login.html,sha256=00rGrQsHXwQXbh2qF7WzEgIA4LjcbvcefALmD9EQCRg,550
 irie/apps/templates/events/react_and_bootstrap.html,sha256=mwxjUMD5OMEI1JMNcWYxz7Ju5rq5R2spf6y_G7mYAUs,802
 irie/apps/templates/home/asset.html,sha256=nqzMy59L2yDalJbbK4j-MCFcBtXTUSMTkqkGwmlSriU,22323
-irie/apps/templates/includes/asset-event-table.html,sha256=mcPCKeCJ8_e-xPWACHBy4edGMYXSSUYNhtMtdeptyTw,3327
+irie/apps/templates/includes/asset-event-table.html,sha256=ovAsKYVHKXRkS7znaDd9QzuaFG6M_2CY7yanYnC8k2w,4243
 irie/apps/templates/includes/footer.html,sha256=uCZVHypr9ZXgU3SsQvOn3U_SuzCGubm6E1cIISvKlX0,617
 irie/apps/templates/includes/modal-report.html,sha256=iqD6g9R4R7G426wLVL46H5fufWYAA3K8Acav9b0DQoU,3592
 irie/apps/templates/includes/navigation.html,sha256=6iGTqLbmbUqJb37VOWoSQvw_2LeiMIINI2v4Fm_GGZM,13658
@@ -372,7 +372,7 @@ irie/apps/templates/includes/scripts.html,sha256=1Up6xJJSTpdLTJp0tDAa3JubevvSlic
 irie/apps/templates/includes/settings-box.html,sha256=wexsLS4SMRyKci-r4L_LQ6QM27h4U291091NcGiTT3o,2486
 irie/apps/templates/includes/sidebar.html,sha256=uJnzXtcV7UvXscvEHe5z0wpLsFZk8B9mj1_Ye08NRbY,10972
 irie/apps/templates/inventory/asset-event-summary.html,sha256=BmLAFtfNDi98aZIu5WbkPMda-QZgoWhssN6l3e2QLgE,50672
-irie/apps/templates/inventory/asset-profile.html,sha256=0j8JdAu8fKGOnGjkBb0pKopRkaqQIKzI1dek6oxCx38,11208
+irie/apps/templates/inventory/asset-profile.html,sha256=lVH983PV9EIgugsfqb8Y94JrPMmD84OFX9twUNdjXno,11287
 irie/apps/templates/inventory/asset-table.html,sha256=hiPrumCigE_m1H6vSr8l-AoRosV8WnFuRg89cuzavvY,12129
 irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
 irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -408,6 +408,7 @@ irie/apps/templates/site/page-lock.html,sha256=ZVn1xyhku1jROxozMyPwMCqS7EsRwG7Z6
 irie/apps/templates/site/page-reset-password.html,sha256=zr2hSaWshUfWanI07vgwfxLR28APCTwhkWHd5-cr-v8,4239
 irie/apps/templates/site/page-sign-in.html,sha256=Ss0xdxhcE0fDzBbxG4NEYFm3XVkfV9knmZWWInU6gq8,9059
 irie/apps/templates/site/page-sign-up.html,sha256=Tft2RQqxzPLyeAWAYoTQnYePs4ym_0bjPuW2p3DbGQ0,9600
+irie/apps/templates/site/robots.txt,sha256=FAwdlPB3oATEIu1W2sp-j6PmcB2YU3-ouCRvN4tRmn8,119
 irie/apps/templates/site/settings.html,sha256=R86LHk7zv3PcZlZoH4iVmvpPc7iGLR8kwAPvsUNF2lU,13423
 irie/apps/templates/site/tables-bootstrap-tables.html,sha256=NDeyVoNLkgFpvqOWMRBQ9uLORirhz-O-LSXFfT2mv88,26683
 irie/apps/templates/site/transactions.html,sha256=-heynHR8PTt_C4P3IWmYG_VE1aGH68ICLLnbfbOuwRs,24116
@@ -415,7 +416,7 @@ irie/apps/templates/site/unused-dashboard-cards.html,sha256=DDNWrnIf4o0wj06WYH8Y
 irie/core/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
 irie/core/asgi.py,sha256=3lVQKFRA4bznM2mWu5Cv24a5H9pfb6YU07q-I_TN0DM,395
 irie/core/settings.py,sha256=9jqn02olEya6O2p3pABLFhmHRwl_U05sOAtluo6y1Rg,6342
-irie/core/urls.py,sha256=H_oIilxAeV6C5W3TY_-oYwkbHiOnHdrRGweBDnOe04k,1279
+irie/core/urls.py,sha256=gxPSV6OhMGYm2O2uRJjFSTOjcIKSXuMeEyAmQcUctLU,1460
 irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/init/__main__.py,sha256=EMfVc-Q-IPi1uBU3vOkoP4_-JMWpK1dFnqu3prfXsDM,589
@@ -437,8 +438,8 @@ irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9
 irie/init/management/commands/init_predictors.py,sha256=jdD7rd8l2qxuUuR5GOYuHXp-ZQkAK477TefksBMdlOw,2362
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.20.dist-info/METADATA,sha256=5hxwSV5Sr0rE1jc33o6wBorklugHZZmr399OcdrS2DA,3244
-irie-0.0.20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-irie-0.0.20.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.20.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.20.dist-info/RECORD,,
+irie-0.0.21.dist-info/METADATA,sha256=zcQb6vRAYraG6jkwTZtPjklZbNUbTXwFsLwXQNH3eBI,3247
+irie-0.0.21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+irie-0.0.21.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.21.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.21.dist-info/RECORD,,