irie 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

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,38 +210,26 @@
     <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>
         </div>
       </div>
-
-      {% if mountains %}
-      <div class="col-10 card bg-white-100 border-0 shadow mt-4">
-        <div class="card-body">
-          <h4>Spectrum</h4>
-          <div class="crop">
-            <img src="data:image/jpeg;base64,{{ mountains }}" alt="Fragility Curve">
-          </div>
-        </div>
-      </div>
-      {% endif %}
-      
     </details>
     <hr>
     {% endif %}
@@ -252,7 +240,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/apps/templates/inventory/asset-table.html

@@ -93,6 +93,44 @@ table a[href^="https://"]::after
                   placeholder="Search assets"
                 >
               </div>
+
+              <!-- Latest Year -->
+              <div class="input-group mb-3">
+                <span class="input-group-text">
+                    <svg class="icon icon-xs" x-description="Heroicon name: solid/search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd"></path>
+                    </svg>
+                </span>
+                <button type="button" class="btn input-group-text btn-outline dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-down-fill" viewBox="0 0 16 16">
+                    <path d="M7.247 11.14l-4.796-5.481C2.014 5.334 2.482 4.5 3.25 4.5h9.5c.768 0 1.236.835.799 1.159l-4.796 5.481a1 1 0 0 1-1.506 0z"/>
+                  </svg>                  
+                  <span class="visually-hidden">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu">
+                  <li><a class="dropdown-item" href="#">Include fields:</a></li>
+                  <li><hr class="dropdown-divider"></li>
+                  <li><div class="form-check form-switch">
+                    <input class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault">
+                    <label class="form-check-label" for="flexSwitchCheckDefault">Retrofit</label>
+                  </div></li>
+                  <li><div class="form-check form-switch">
+                    <input class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckChecked" checked>
+                    <label class="form-check-label" for="flexSwitchCheckChecked">Built</label>
+                  </div></li>
+                </ul>
+                <input 
+                  id="max_year" 
+                  name="max_year"
+                  type="number"
+                  max="2024"
+                  step="1"
+                  class="form-control" 
+                  value="{{ filter.form.max_year.value|default_if_none:'2024' }}" 
+                  placeholder="Latest Year Built"
+                >
+              </div>
+
           
               <!-- CESMD Not Null Checkbox -->
               <div class="col-12">
@@ -108,21 +146,6 @@ table a[href^="https://"]::after
                       </label>
                   </div>
               </div>
-          
-              {# Is Complete Checkbox #}
-              <div class="col-12">
-                  <div class="form-check">
-                      <input 
-                          type="checkbox" 
-                          name="is_complete" 
-                          id="is_complete" 
-                          class="form-check-input" 
-                          {% if filter.form.is_complete.value %}checked{% endif %}>
-                      <label for="is_complete" class="form-check-label">
-                          {{ filter.form.is_complete.label }}
-                      </label>
-                  </div>
-              </div>
 
               {# Buttons #}
               <div class="col-12 d-flex justify-content-between">

irie/apps/templates/prediction/asset-predictors.html

@@ -46,9 +46,7 @@ Claudio Perez, Summer 2023
         {% for predictor in asset.predictors.values %}
           <div class="accordion-item">
               <button class="btn {%if predictor.active %}btn-outline-success{%else%}btn-outline-dark{%endif%}" type="button">Active</button>
-              {% if False %}
-              <button class="btn btn-outline-danger" type="button">Delete</button>
-              {% endif %}
+
               <button class="btn" type="button"
                       data-bs-toggle="collapse" 
                       data-bs-target="#flush-collapse{{forloop.counter}}"
@@ -56,9 +54,11 @@ Claudio Perez, Summer 2023
                 Details</button>
               &nbsp;
               <h6 class="accordion-header" style="display:inline" id="flush-heading{{forloop.counter}}">
+                <a href="./{{predictor.id}}" >
                   {{predictor.name}}
+                </a>
               </h6>
-              (<code>{{predictor.platform}}</code>)
+              (<code>{{ predictor.platform }}</code>)
               {% if False %}
               <button class="accordion-button btn collapsed" type="button" 
                       data-bs-toggle="collapse" 
@@ -88,6 +88,8 @@ Claudio Perez, Summer 2023
 <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
 <script>
 
+  const csrftoken = document.querySelector('[name=csrfmiddlewaretoken]').value;
+
   for (const element of document.querySelectorAll("form")) {
     let editor_elem = element.querySelector(`#${element.id}-editor`);
     let config = {
@@ -103,7 +105,38 @@ Claudio Perez, Summer 2023
 
     editor.on('change', function () {
       element.querySelector('#editor-input').value = JSON.stringify(editor.getValue())
-    })
+    });
+
+
+    element.addEventListener('submit', async function (event) {
+      event.preventDefault(); // Prevent the default form submission
+
+      // Get the form data
+      // const formData = new FormData(event.target);
+      // const data = Object.fromEntries(formData.entries());
+
+      // Send the data to the API
+      try {
+        const response = await fetch(`./create?runner=${editor_elem.dataset.protocol}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-CSRFToken': csrftoken,
+          },
+          body: JSON.stringify(editor.getValue()),
+        });
+
+        // Handle the response
+        if (response.ok) {
+          document.getElementById('status').textContent = 'Form submitted successfully!';
+        } else {
+          document.getElementById('status').textContent = 'Error submitting the form.';
+        }
+      } catch (error) {
+        document.getElementById('status').textContent = 'An error occurred while submitting the form.';
+      }
+    });
+
   }
 </script>
 {% endblock %}

irie/apps/templates/prediction/hazus/history.html

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

irie/apps/templates/prediction/new-runner.html

@@ -43,7 +43,7 @@
             {# form.as_p #}
 
             <div class="form-group"></div>
-            <form id="{{runner.name}}" action="./" method="post" >
+            <form id="{{runner.name}}" action="./create/" method="post" >
               {% csrf_token %}
               <input id="editor-input" type="hidden" name="json">
               <div id="{{runner.name}}-editor" 

irie/apps/templates/prediction/predictor-profile.html

@@ -132,9 +132,20 @@
         <div class="col-12 mb-4">
         </div>
     </div>
+
     </details>
     <hr>
 
+    <div class="col-10 card bg-white-100 border-0 shadow mb-4">
+      <div class="card-body">
+        <div class="crop">
+          <img src="data:image/jpeg;base64,{{ predictor.render }}" alt="Spectral content">
+        </div>
+      </div>
+      <div class="card-footer">
+        Powered by <a href="https://chrystalchern.github.io/mdof"><em>mdof</em></a>
+      </div>
+    </div>
 </div>
 {% endblock content %}
 

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/init/__main__.py

@@ -16,15 +16,18 @@ def init(settings):
         "migrate"
     ])
 
-    call_command("makemigrations")
+#   call_command("makemigrations")
 
-    call_command("migrate")
+#   call_command("migrate")
 
-    call_command("init_assets")
+#   call_command("init_assets")
 
-    call_command("init_corridors")
+    call_command("init_cesmd")
+
+#   call_command("init_corridors")
+
+#   call_command("init_predictors")
 
-    call_command("init_predictors")