irie 0.0.25__tar.gz → 0.0.27__tar.gz

{irie-0.0.25 → irie-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.25
+Version: 0.0.27
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.25 → irie-0.0.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.25"
+version = "0.0.27"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]

irie-0.0.27/src/irie/apps/inventory/templatetags/get.py

@@ -0,0 +1,6 @@
+from django import template
+register = template.Library()
+    
+@register.filter
+def get(mapping, key):
+    return mapping.get(key, '')

irie-0.0.27/src/irie/apps/inventory/templatetags/nbi.py

@@ -0,0 +1,6 @@
+from django import template
+register = template.Library()
+    
+@register.filter
+def nbi(string):
+    return string.split(" - ")[-1].lower()

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/includes/footer.html

@@ -10,7 +10,7 @@
       <ul class="list-inline list-group-flush list-group-borderless text-end mb-0">
         <li class="list-inline-item px-0 px-sm-2">
           Powered by 
-            <a target="_blank" href="https://stairlab.berkeley.edu/software/irie">
+            <a target="_blank" href="https://stairlab.berkeley.edu/software/irie/">
               IRiE</a>
         </li>
       </ul>

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/includes/settings-box.html

@@ -7,7 +7,7 @@
               aria-controls="theme-settings"></button>
           <div class="d-flex justify-content-between align-items-center mb-3">
             <p class="m-0 mb-1 me-4 fs-7">Open source</p>
-            <a class="github-button" href="https://github.com/claudioperez/opensees"
+            <a class="github-button" href="https://github.com/claudioperez/OpenSeesRT"
                 data-color-scheme="no-preference: dark; light: light; dark: light;" data-icon="octicon-star"
                 data-size="large" data-show-count="true"
                 aria-label="Star opensees on GitHub">Star</a>

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/inventory/asset-evals.html

@@ -1,6 +1,10 @@
 {% extends "layouts/base.html" %}
 
-{% block title %} {{ asset.calid }} {% endblock %} 
+{% block title %} {{ asset.calid }} Evaluations {% endblock %} 
+
+{% block meta %}
+<meta name="description" content="Hazard events for the {{ asset.name }} digital twin.">
+{% endblock %}
 
 {% block stylesheets %}
 {% endblock stylesheets %}
@@ -17,7 +21,11 @@
                 </a>
               </li>
               <li class="breadcrumb-item" aria-current="page"><a href="{% url 'asset_table' %}">Inventory</a></li>
-              <li class="breadcrumb-item active"><code>{{ asset.calid }}</code></li>
+              <li class="breadcrumb-item active">
+                <a href="../" >
+                  <code>{{ asset.calid }}</code>
+                </a>
+              </li>
               <li class="breadcrumb-item active">Evaluations</li>
             </ol>
           </nav>

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/inventory/asset-event-summary.html

@@ -1,6 +1,9 @@
 {% extends "layouts/base.html" %}
 
-{% block title %} {{ asset.calid }} {% endblock %} 
+{% block title %} {{ asset.calid }} Health | {{event.id}} {% endblock %} 
+{% block meta %}
+<meta name="description" content="Health evaluation of the {{asset.name}} in response to event {{ event.id }}.">
+{% endblock %}
 
 {% block stylesheets %}
 <style>

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/inventory/asset-profile.html

@@ -1,15 +1,16 @@
 {% extends "layouts/base.html" %}
-
+{% load get %}
+{% load nbi %}
 {% block title %} {{ asset.calid }} {% endblock %} 
-
+{% block meta %}
+<meta name="description" content="{% if asset.id|divisibleby:2 %}Live-updating digital twin for health assessment of the {{ asset.name }} ({{ asset.calid }}).{% else %}Digital twin profile for real-time health monitoring of the {{ asset.name }} ({{ asset.calid }}) bridge{% endif %}">
+{% endblock %}
 {% block stylesheets %}
 {% if asset.rendering %}
 <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0"> -->
-<!-- <script src="https://unpkg.com/three@0.152.0/build/three.min.js"></script> -->
 <script type="module" src="https://ajax.googleapis.com/ajax/libs/model-viewer/4.0.0/model-viewer.min.js"></script>
-<!-- <script type="module" src="https://unpkg.com/@google/model-viewer/dist/model-viewer.min.js"></script> -->
 {% endif %}
-
+<script src="https://cdn.plot.ly/plotly-2.27.0.min.js" charset="utf-8"></script>
 <style>
 .crop {
   width: 100%; /* 200px;*/
@@ -106,8 +107,6 @@
   stroke: #61DAFB;
 }
 </style>
-
-<script src="https://cdn.plot.ly/plotly-2.27.0.min.js" charset="utf-8"></script>
 {% endblock stylesheets %}
 
 {% block content %}
@@ -125,7 +124,7 @@
               <li class="breadcrumb-item active"><code>{{ asset.calid }}</code></li>
             </ol>
           </nav>
-          <h2 class="h4">{{ asset.id }} - {{ asset.name }}</h2>
+          <h1 class="h4"><samp>{{ asset.id }}</samp> / {{ asset.name }}</h1>
       </div>
       <div class="btn-toolbar mb-2 mb-md-0">
         <a role="button" 
@@ -138,21 +137,53 @@
         </a>
       </div>
     </div>
-    <!-- <h1 class="fs-2 lh-2 me-3"></h1> -->
-    <!-- <span id="structureProfile" class="fs-2 lh-2 me-3">Structure Profile</span> -->
-    <!--
-    <div class="py-4 align-right">
-      <a role="button" class="button btn btn-outline-primary"
-         href="/inventory/{{ asset.calid }}/predictors/" class="me-1">Configure Predictors</a>
+    <div class="col-10">
+      <p>
+      {% if asset.id|divisibleby:3 %}
+        The {{asset.name}} is a structure in 
+        {{ asset.nbi_data.NBI_BRIDGE|get:"Highway Agency District"|nbi }} 
+        of the California inventory.
+        The structure was constructed in {{asset.nbi_data.NBI_BRIDGE|get:"Year Built"}}. 
+      {% elif asset.id|divisibleby:4 %}
+        The {{asset.name}} was contructed in {{asset.nbi_data.NBI_BRIDGE|get:"Year Built"}} 
+        and belongs to {{ asset.nbi_data.NBI_BRIDGE|get:"Highway Agency District"|nbi }}. 
+      {% else %}
+        <em>{{asset.name}}</em> is a structure in 
+        {{ asset.nbi_data.NBI_BRIDGE|get:"Highway Agency District"|nbi }} 
+        of California that was built in {{asset.nbi_data.NBI_BRIDGE|get:"Year Built"}}. 
+      {% endif %}
+      {% if asset.id|divisibleby:2 %}
+        The superstructure is in 
+        <em>{{ asset.nbi_data.NBI_BRIDGE|get:"Superstructure Condition Rating"|nbi }}</em>.
+      {% else %}
+        The condition of the superstructure is classified as being in 
+        <em>{{ asset.nbi_data.NBI_BRIDGE|get:"Superstructure Condition Rating"|nbi }}</em>.
+      {% endif %}
+      The structure has been configured with {{asset.predictors|length}} predictors. 
+      </p>
+      <p>
+      {% if asset.cgs_data %}
+        {% if asset.id|divisibleby:3 %}The superstructure consists of {% else %}The superstructure's construction is {% endif %}
+        {{ asset.cgs_data.2|get:"Superstructure Type"|lower }}
+        {{asset.cgs_data.2|get:"Remarks"}}
+        More information about the structure instrumentation is availiable from
+        <a rel="nofollow noreferrer" href="https://www.strongmotioncenter.org/cgi-bin/CESMD/stationhtml.pl?stationID={{asset.cesmd}}&network=CGS">CESMD</a>. 
+      {% else %}
+        {% if asset.id|divisibleby:3 %}
+        The structure has not been instrumented.
+        {% else %}
+        No {% if asset.id|divisibleby:2 %}direct{% endif %} sensor data is available for this structure.
+        {% endif %}
+      {% endif %}
+      </p>
     </div>
-    -->
     
     {# BRIDGE RENDERING #}
     <details id="asset-sensors" open><summary><h3>Geometry</h3></summary>
       {% if asset.rendering %}
       <div id="rendering" class="row">
         <div class="col-10 mb-4">
-          <div class="card h-100 bg-white-100 border-0 shadow">
+          <div class="card h-100 bg-white-100 border-1 rounded-0 shadow">
             <div class="card-header d-sm-flex flex-row align-items-center flex-0">
               {% comment %}
               <button 
@@ -183,7 +214,7 @@
     {% if asset.cesmd %}
     <div id="sensors" class="row">
       <div class="col-10 mb-4">
-        <div class="card h-100 bg-white-100 border-0 shadow">
+        <div class="card h-100 bg-white-100 border-1 rounded-0 shadow">
           <div class="card-header d-sm-flex flex-row align-items-center flex-0">
           </div>
           <div class="card-body align-items-center p-2">
@@ -213,7 +244,7 @@
       {# Hazus #}
       <div class="row">
         <div class="col-10 mb-4">
-          <div class="card bg-white-100 border-0 shadow ">
+          <div class="card bg-white-100 border-1 rounded-0 shadow ">
             <div class="card-header">
               <h4>Hazus Fragility</h4>
             </div>
@@ -238,33 +269,32 @@
     <div class="row">
       <div class="col-10 mb-4">
         {% for table in tables %}
-        <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive">
-          <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>
-                <tbody>
-                  {% 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 class="card-footer">
-              <span class="small">Source: <a rel="nofollow noreferrer" href="https://infobridge.fhwa.dot.gov/">InfoBridge</a></span>
-            </div>
+        <div class="card bg-white-100 border-1 rounded-0 shadow table-wrapper table-responsive">
+          <div class="card-body shadow table-wrapper table-responsive">
+            <table class="table table-hover" style="display: block;">
+              <caption>{{asset.calid}} Table {{forloop.counter}}</caption>
+              <tbody>
+                {% 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 class="card-footer">
+            <span class="small">Source: <a rel="nofollow noreferrer" href="https://infobridge.fhwa.dot.gov/">InfoBridge</a></span>
+          </div>
         </div>
-      </div>
-      <br>
-      {% endfor %}
-    </div>
+        <br>
+        {% endfor %}
+      </div> <!-- col -->
+    </div><!-- row -->
     </details>
 
 

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/layouts/base-fullscreen.html

@@ -8,8 +8,6 @@
   <meta name="title" content="BRACE2 - Sign up page">
   <meta name="author" content="PEER">
   <meta name="description" content="BRACE2 is a platform for structural health monitoring.">
-  <meta name="keywords" content="structural health monitorine, finite element method" />
-  <link rel="canonical" href="https://peer.berkeley.edu">
 
   <!-- Open Graph / Facebook -->
   <meta property="og:type" content="website">

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/layouts/base.html

@@ -18,21 +18,19 @@
   gtag('config', 'G-TFW5X9DYND');
 </script>
 {% endcomment %}
-<title>{% block title %}{% endblock %} | BRACE2</title>
+<title>{% block title %}{% endblock %}</title>
 
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<meta name="title" content="BRACE2 - Real-time structural health monitoring platform">
-<meta name="author" content="PEER">
-<meta name="description" content="BRACE2 is a platform for real-time structural health monitoring.">
-<meta name="keywords" content="dashboard,  shm, bridge, fem, fea, health-monitoring,  real-time,  datatable, peer, brace2, pacific earthquake engineering research center, mechanics" />
+<meta name="author" content="STAIRLab">
 <link rel="canonical" href="https://structures.live{{ request.path }}">
+{% block meta %}
+{% endblock meta %}
 
 <!-- Favicon -->
 <link rel="apple-touch-icon" sizes="120x120" href="{{ ASSETS_ROOT }}/img/favicon/apple-touch-icon.png">
-{% if False %}
 <link rel="icon" type="image/png" sizes="32x32" href="{{ ASSETS_ROOT }}/img/favicon/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="16x16" href="{{ ASSETS_ROOT }}/img/favicon/favicon-16x16.png">
-{% endif %}
+
 <link rel="icon" href="{{ ASSETS_ROOT }}/favicon.ico?v=2" />
 <link rel="manifest" href="{{ ASSETS_ROOT }}/img/favicon/site.webmanifest">
 <link rel="mask-icon" href="{{ ASSETS_ROOT }}/img/favicon/safari-pinned-tab.svg" color="#ffffff">

{irie-0.0.25 → irie-0.0.27}/src/irie/apps/templates/site/index.html

@@ -2,12 +2,11 @@
 <html lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title> BRACE<sup>2</sup></title>
+  <title>structures.live</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="title" content="BRACE2 Platform">
   <meta name="author" content="Claudio M. Perez">
   <meta name="description" content="BRACE2 platform for structural health monitoring.">
-  <meta name="keywords" content="digital twin, opensees, finite element analysis, system identification, berkeley, bridge, engineering, earthquake engineering" />
   
   {# Open Graph and Facebook #}
   <meta property="og:type" content="website">
@@ -229,7 +228,8 @@ td.left-text{vertical-align:middle}
           <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
             <h2 class="h1 d-flex align-items-center"> Corridors<span
                 class="badge-md mb-0 fs-6 badge ms-3 rounded-pill text-dark bg-secondary">New</span></h2>
-            <p class="mb-4">Corridor-level health analysis and recovery planning has been implemented through collaborations at UC Berkeley and the California department of transportation.</p>
+            <p class="mb-4">Corridor-level health analysis and recovery planning has been implemented through collaborations at UC Berkeley and 
+              the <a href="https://dot.ca.gov/">California department of transportation</a>.</p>
               <a href="https://dot.ca.gov/-/media/dot-media/programs/research-innovation-system-information/documents/research-notes/task3798-rns-05-24-a11y.pdf"
                 target="_blank" class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg
                 class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
@@ -249,17 +249,18 @@ td.left-text{vertical-align:middle}
     </section>
   <section class=tabs-section>
     <div class="container align-items-center">
-      <h1 class=tabs-title>Ecosystem</h1>
+      <h2 class=tabs-title>Ecosystem</h2>
       <div class=uikit-tab-wrapper>
             <p>The <em>IRiE</em> Ecosystem</p>
             <table>
               <tr>
                 <td style=text-align:center>
-                  <a href="https://github.com/claudioperez/opensees">
+                  <a href="https://stairlab.berkeley.edu/software/opensees/">
                   <img class="first-column-layout"
                        src="{{ ASSETS_ROOT }}/content_images/brace/opensees.jpg" alt="opensees"></a></td>
                 <td class=full-center-text><a href="https://pypi.org/project/opensees" >opensees</a></td>
-                <td class=left-text>Direct and idiomatic bindings to <a href="https://github.com/claudioperez/OpenSeesRT" ><tt>OpenSeesRT</tt></a> kernel for finite element analysis.</td>
+                <td class=left-text>Direct and idiomatic bindings to <a href="https://github.com/claudioperez/OpenSeesRT" >
+                  <samp>OpenSeesRT</samp></a> kernel for finite element analysis.</td>
               </tr>
               <tr>
                 <td style=text-align:center>
@@ -296,6 +297,34 @@ td.left-text{vertical-align:middle}
         </div>
       </div>
     </div>
+
+
+    <section class=tabs-section>
+      <div class="container align-items-center">
+        <hr>
+        <!-- <h2 class=tabs-title>Sponsors</h2> -->
+        <table>
+          <tbody><tr>
+            <td>
+              <a href="https://dot.ca.gov/" rel="nofollow" class="clutterFree_existingDuplicate clutterFree_noIcon cf_div_theme_dark">
+              <img src="https://pypi-camo.freetls.fastly.net/7b2504fa154d6de2f70d6cac80839f75574f7530/68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f636c617564696f706572657a2f73646f662f6d61737465722f646f63732f6173736574732f43616c7472616e732e7376672e706e67" alt="Caltrans Logo" width="100">
+              </a>
+            </td>
+            <td>
+              <a href="https://peer.berkeley.edu">
+              <img src="https://pypi-camo.freetls.fastly.net/7b0fbea1983dc8e51a6877fc010c458e8e3f3f77/68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f636c617564696f706572657a2f73646f662f6d61737465722f646f63732f6173736574732f706565722d626c61636b2d3330302e706e67" alt="PEER Logo" width="100">
+              </a>
+            </td>
+            <td>
+              <a href="https://stairlab.berkeley.edu">
+              <img src="https://pypi-camo.freetls.fastly.net/f638ffd43bd94592280eb4e3b05451526341670b/68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f636c617564696f706572657a2f73646f662f6d61737465722f646f63732f6173736574732f73746169726c61622e737667" alt="STAIRlab Logo" width="100">
+              </a>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </section>
   </main>
 
   <footer class="footer py-4 bg-primary text-white">

{irie-0.0.25 → irie-0.0.27}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.25
+Version: 0.0.27
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.25 → irie-0.0.27}/src/irie.egg-info/SOURCES.txt

@@ -70,6 +70,9 @@ src/irie/apps/inventory/archive/arcGIS.py
 src/irie/apps/inventory/migrations/0001_initial.py
 src/irie/apps/inventory/migrations/0002_alter_asset_bridge_sensors_and_more.py
 src/irie/apps/inventory/migrations/__init__.py
+src/irie/apps/inventory/templatetags/__init__.py
+src/irie/apps/inventory/templatetags/get.py
+src/irie/apps/inventory/templatetags/nbi.py
 src/irie/apps/management/__init__.py
 src/irie/apps/management/commands/__init__.py
 src/irie/apps/networks/__init__.py