irie 0.0.15__tar.gz → 0.0.16__tar.gz

{irie-0.0.15 → irie-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.15
+Version: 0.0.16
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie

{irie-0.0.15 → irie-0.0.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.15"
+version = "0.0.16"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
 ]

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/inventory/models.py

@@ -54,7 +54,7 @@ class Asset(models.Model):
     @property
     def event_count(self):
         from irie.apps.events.models import EventRecord
-        return len(EventRecord.objects.filter(cesmd=self.cesmd)) 
+        return len(EventRecord.objects.filter(asset=self)) 
 
     @property
     def rendering(self):

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/includes/asset-event-table.html

@@ -1,13 +1,13 @@
-<div class="card shadow table-wrapper table-responsive">
+<div class="card border-0 shadow table-wrapper table-responsive">
   <div class="card-header">
     <div class="row align-items-center">
       <div class="col">
-        <h2 class="fs-5 fw-bold mb-0">System ID</h2>
+        <h2 class="fs-5 fw-bold">Events</h2>
       </div>
       <div class="col text-end">
         <div class="align-right">
           <div class="dropdown">
-            <button class="btn btn-gray-800 d-inline-flex align-items-center me-2 dropdown-toggle" 
+            <button class="btn btn-outline-dark d d-inline-flex align-items-center me-2 dropdown-toggle" 
                     data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               <svg class="icon icon-xs me-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
               {% for method in evaluations.0.evaluation %}

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/includes/scripts.html

@@ -3,23 +3,18 @@
 <script src="{{ ASSETS_ROOT }}/vendor/@popperjs/core/dist/umd/popper.min.js"></script>
 <script src="{{ ASSETS_ROOT }}/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
 
-<!--
+{% comment %}
 <script src="{{ ASSETS_ROOT }}/vendor/onscreen/dist/on-screen.umd.min.js"></script>
 <script src="{{ ASSETS_ROOT }}/vendor/nouislider/distribute/nouislider.min.js"></script>
 <script src="{{ ASSETS_ROOT }}/vendor/vanillajs-datepicker/dist/js/datepicker.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.27.0/moment.min.js"></script>
--->
+<script src="{{ ASSETS_ROOT }}/vendor/vanillajs-datepicker/dist/js/datepicker.min.js"></script>
+{% endcomment %}
 
 <script src="{{ ASSETS_ROOT }}/vendor/smooth-scroll/dist/smooth-scroll.polyfills.min.js"></script>
 
 <script src="{{ ASSETS_ROOT }}/vendor/sweetalert2/dist/sweetalert2.all.min.js"></script>
 
-
-<!--
-<script src="{{ ASSETS_ROOT }}/vendor/vanillajs-datepicker/dist/js/datepicker.min.js"></script>
--->
-
-<!-- Notyf -->
 <script src="{{ ASSETS_ROOT }}/vendor/notyf/notyf.min.js"></script>
 
 <!-- Simplebar -->

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/includes/sidebar.html

@@ -141,7 +141,7 @@
                   <span class="sidebar-icon">
                     <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd"></path></svg>
                   </span>
-                  <span class="sidebar-text">Support</span>
+                  <span class="sidebar-text">IRiE</span>
                 </a>
               </li>
               <li class="nav-item {% if 'settings' in segment %} active {% endif %}">

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/inventory/asset-event-summary.html

@@ -35,25 +35,25 @@
   <div class="btn-toolbar mb-2 mb-md-0">
     <a role="button" 
        href="/inventory/{{ asset.calid }}"
-       class="btn btn-sm btn-gray-800 d-inline-flex align-items-center">
+       class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
       Asset Profile
     </a>
   </div>
 </div>
 
     <div class="py-4 align-right">
+      {% comment %}
       <a role="button" class="button btn btn-outline-primary"
          href="/inventory/{{ asset.calid }}" class="me-1">Structure Profile</a>
 
       {% include 'includes/modal-report.html' with event_summaries=event_summaries %}
-      {% comment %}
       {% endcomment %}
     </div>
 
     {# BRIDGE RENDER #}
     <div class="row">
       <div class="col-12 mb-4">
-        <div class="card h-100 bg-white-100 border-0 shadow">
+        <div class="card h-100 bg-white-100 border-0 shadow rounded-sm">
           <div class="card-body p-2">
             <div class="tab-content" id="pills-tabContent">
               <div class="tab-pane fade show active" 
@@ -99,7 +99,7 @@
     <div class="row">
       <div class="col-12 col-sm-6 col-xl-4 mb-4">
         {# if false #}
-        <div class="card h-100 border-0 shadow">
+        <div class="card h-100 border-0 shadow rounded-sm">
           <div class="card-body">
             <div class="col-xs-12">
               <div class="progress mb-3">
@@ -182,7 +182,7 @@
         {# endif #}
       <!-- </div> -->
       <div class="col-12 col-sm-6 col-xl-4 mb-4">
-        <div class="card h-100 border-0 shadow">
+        <div class="card h-100 border-0 shadow rounded-sm">
           <div class="card-body">
             <div class="col-xs-12">
               <div class="progress mb-3">
@@ -616,18 +616,18 @@
                       </div> -->
                       {% endif %}
                     </div>
-                    {% comment %}
                     <div class="d-block ms-auto">
                         <div class="d-flex align-items-center text-end mb-2">
                             <span class="dot rounded-circle bg-gray-800 me-2"></span>
-                            <span class="fw-normal small">Frequency [Hz]</span>
+                            <span class="fw-normal small">mdof</span>
                         </div>
+                        {% comment %}
                         <div class="d-flex align-items-center text-end">
                             <span class="dot rounded-circle bg-secondary me-2"></span>
                             <span class="fw-normal small">Damping [%]</span>
                         </div>
+                        {% endcomment %}
                     </div>
-                    {% endcomment %}
                   </div>
                   <div class="card-body p-2">
                     <div class="col-xs-12">

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/inventory/asset-profile.html

@@ -121,7 +121,7 @@
 
 {% block content %}
 <div class="print">
-    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
+    <div class="col-8 mb-4 d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
       <div class="d-block mb-4 mb-md-0">
           <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
             <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
@@ -131,7 +131,7 @@
                 </a>
               </li>
               <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">BRACE<sup>2</sup></a></li>
-              <li class="breadcrumb-item" aria-current="page">Inventory</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>
             </ol>
           </nav>
@@ -140,7 +140,7 @@
       <div class="btn-toolbar mb-2 mb-md-0">
         <a role="button" 
            href="/inventory/{{ asset.calid }}/predictors/"
-           class="btn btn-sm btn-gray-800 d-inline-flex align-items-center">
+           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
           <svg class="icon icon-xs me-2" fill="none" 
               stroke="currentColor" viewBox="0 0 24 24" 
               xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
@@ -192,7 +192,7 @@
       {% endif %}
     {% if asset.cesmd %}
     <div id="sensors" class="row">
-      <div class="col-10 mb-4">
+      <div class="col-8 mb-4">
         <div class="card h-100 bg-white-100 border-0 shadow">
           <div class="card-header d-sm-flex flex-row align-items-center flex-0">
           </div>
@@ -210,21 +210,21 @@
     <details id="event-table" open><summary><h3>Health History</h3></summary>
 
       <div class="row">
-          <div class="col-10 mb-4">
-            <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive">
+          <div class="col-8 mb-4">
+            <!-- <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive"> -->
       {% include 'includes/asset-event-table.html' with evaluations=evaluations %}
-            </div>
+            <!-- </div> -->
           </div>
       </div>
 
       {# Hazus #}
       <div class="row">
-        <div class="col-10 mb-4">
+        <div class="col-8 mb-4">
           <div class="card bg-white-100 border-0 shadow ">
             <div class="card-header">
               <h4>Hazus Fragility</h4>
             </div>
-            <div class="card-body">
+            <div class="card-body  d-flex align-items-center justify-content-center">
               {% include "prediction/hazus/history.html" with hazus=hazus %}
             </div>
           </div>
@@ -232,13 +232,16 @@
       </div>
 
       {% if mountains %}
-      <div class="col-10 card bg-white-100 border-0 shadow mt-4">
+      <div class="col-8 card bg-white-100 border-0 shadow mb-4">
         <div class="card-body">
           <h4>Spectrum</h4>
           <div class="crop">
-            <img src="data:image/jpeg;base64,{{ mountains }}" alt="Fragility Curve">
+            <img src="data:image/jpeg;base64,{{ mountains }}" alt="Spectral content">
           </div>
         </div>
+        <div class="card-footer">
+          Powered by <a href="https://chrystalchern.github.io/mdof"><em>mdof</em></a>
+        </div>
       </div>
       {% endif %}
       
@@ -252,7 +255,7 @@
     <details open><summary><h3>Structure Details</h3></summary>
 
     <div class="row">
-      <div class="col-10 mb-4">
+      <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">

irie-0.0.16/src/irie/apps/templates/prediction/hazus/history.html

@@ -0,0 +1 @@
+<div id="hazusPlot" class="chart" style="width: 100%;" data-hazus-x="{{ hazus.sa_range }}" data-hazus-curves="{{ hazus.curves }}"></div>

{irie-0.0.15 → irie-0.0.16}/src/irie/apps/templates/site/index.html

@@ -201,37 +201,22 @@ td.left-text{vertical-align:middle}
           <div class="row justify-content-between align-items-center">
             <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
               <h2 class="h1">Health Diagnosis</h2>
-              <p class="mb-4">...</p>
-              <a
-                href="" 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">
-                  <path
-                    d="M9 4.804A7.968 7.968 0 005.5 4c-1.255 0-2.443.29-3.5.804v10A7.969 7.969 0 015.5 14c1.669 0 3.218.51 4.5 1.385A7.962 7.962 0 0114.5 14c1.255 0 2.443.29 3.5.804v-10A7.968 7.968 0 0014.5 4c-1.255 0-2.443.29-3.5.804V12a1 1 0 11-2 0V4.804z">
-                  </path>
-                </svg> Getting started</a>
             </div>
             <div class="col-lg-6 order-lg-1"><img src="{{ ASSETS_ROOT }}/img/metric.png"
                  alt="Front pages overview"></div>
           </div>
           <div class="col-lg-5 mb-5 mb-lg-0">
-            <h2 class="h1 d-flex align-items-center">Sensor Integration</h2>
-            <p class="mb-4">.</p><a href="" target="_blank"
-              class="btn btn-secondary d-inline-flex align-items-center me-3"><svg class="icon icon-xs me-2"
-                fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                <path
-                  d="M5 3a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2V5a2 2 0 00-2-2H5zM5 11a2 2 0 00-2 2v2a2 2 0 002 2h2a2 2 0 002-2v-2a2 2 0 00-2-2H5zM11 5a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V5zM11 13a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z">
-                </path>
-              </svg> Demo
-            </a>
+            <h2 class="h1 d-flex align-items-center">Real-time notification</h2>
+            <p class="mb-4">PEER is partnering with the <em>California Strong Motion Intrumentation Program</em>
+            to push sensor data to stakeholders in real-time.</p>
           </div>
           <div class="col-lg-6"><img src="{{ ASSETS_ROOT}}/img/earthquake-hazard.png" alt="Sensor Preview"></div>
         </div>
-        <div class="row justify-content-between align-items-center mb-5 mb-lg-7">
+        <div class="row justify-content-between align-items-center mb-4 mb-lg-7">
           <div class="row justify-content-between align-items-center">
             <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
               <h2 class="h1">Digital Twins</h2>
-              <p class="mb-4">BRACE<sup>2</sup> integrates state of the art modeling software</p>
+              <p class="mb-4">Integrated state of the art modeling software</p>
               <a
                 href="" target="_blank"
                 class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg class="icon icon-xs me-2"
@@ -241,7 +226,7 @@ td.left-text{vertical-align:middle}
                   </path>
                 </svg> Getting started</a>
             </div>
-            <div class="col-lg-6 order-lg-1"><img src="{{ ASSETS_ROOT }}/img/metric.png"
+            <div class="col-lg-4 order-lg-1 card shadow"><img src="{{ ASSETS_ROOT }}/img/metric.png"
                  alt="Digital twins"></div>
           </div>
           {% comment %}

{irie-0.0.15 → irie-0.0.16}/src/irie/rest/__main__.py

@@ -1,4 +1,4 @@
-# Claudio Perez
+# Claudio M. Perez
 import os
 import requests
 import sys
@@ -134,6 +134,5 @@ if __name__ == "__main__":
         for bridge in data:
             for event in bridge["events"]:
                 post_evaluations(event)
-    else:
-        pass
+            time.sleep(3)
 

{irie-0.0.15 → irie-0.0.16}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.15
+Version: 0.0.16
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie

irie-0.0.15/src/irie/apps/templates/prediction/hazus/history.html

@@ -1 +0,0 @@
-<div id="hazusPlot" data-hazus-x="{{ hazus.sa_range }}" data-hazus-curves="{{ hazus.curves }}"></div>