irie 0.0.58__tar.gz → 0.0.59__tar.gz

{irie-0.0.58 → irie-0.0.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.58
+Version: 0.0.59
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -32,7 +32,7 @@ Requires-Dist: quakeio
 Requires-Dist: mdof
 Requires-Dist: veux>=0.0.35
 Requires-Dist: xara
-Requires-Dist: xcsi
+Requires-Dist: xcsi>=0.0.2
 Requires-Dist: xsection>=0.0.19
 Requires-Dist: openbim
 Requires-Dist: folium

{irie-0.0.58 → irie-0.0.59}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.58"
+version = "0.0.59"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
@@ -22,7 +22,7 @@ dependencies = [
   "mdof",
   "veux>=0.0.35",
   "xara",
-  "xcsi",
+  "xcsi>=0.0.2",
   "xsection>=0.0.19",
   "openbim", # TODO: remove, superceded by xcsi
 

irie-0.0.59/src/irie/apps/inventory/migrations/0009_datum_angle_x_datum_angle_y.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2025-07-31 05:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0008_alter_sensor_dx_alter_sensor_dy_alter_sensor_dz_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='datum',
+            name='angle_x',
+            field=models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='angle_y',
+            field=models.DecimalField(blank=True, decimal_places=2, default=0.0, max_digits=10, null=True),
+        ),
+    ]

{irie-0.0.58 → irie-0.0.59}/src/irie/apps/inventory/views.py

@@ -400,13 +400,13 @@ def asset_sensors(request, calid):
 
     # General Context
     context = {
-        "asset": asset,
-        "segment": "assets",
-        "groups": SensorGroup.objects.filter(asset=asset)
+        "segment": "assets"
     }
 
     # Database
     asset = get_object_or_404(Asset, calid=calid)
+    context["asset"] = asset 
+    context["groups"] = SensorGroup.objects.filter(asset=asset)
 
     return HttpResponse(html_template.render(context, request))
 

irie-0.0.59/src/irie/apps/prediction/migrations/0007_remove_sensorassignment_orient_x_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.2 on 2025-07-31 05:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0006_remove_sensorassignment_show_x_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='orient_x',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='orient_y',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='orient_z',
+        ),
+    ]

irie-0.0.59/src/irie/apps/templates/inventory/create-datum.html

@@ -0,0 +1,44 @@
+<form method="post">
+    {% csrf_token %}
+
+    <fieldset class="mb-4">
+      <legend>Datum</legend>
+      {{ group_form.as_p }}
+      <div id="datum-info" class="mb-4 p-2 border rounded bg-light" style="display: none;">
+        <strong>Datum Location (x;y;z):</strong> <span id="datum-location">_, _, _</span> <br>
+        <strong>Datum Orientation (dx;dy;dz):</strong> <span id="datum-orientation">_, _, _</span>
+      </div>
+    </fieldset>
+
+    <fieldset>
+        <legend>New Datum</legend>
+        <div id="formset-container" class="container">
+            <div class="row">
+                <div class="col-md-12 d-flex align-items-center mb-3">
+                    <div class="input-group">
+                        <span class="input-group-text col-md-5 text-gray">Angle x</span>
+                        <input id="input-datum-angle-x" 
+                                type="number" 
+                                step="any" 
+                                name="angle x" 
+                                value="{{ form.dx.value|default_if_none:'' }}"
+                                class="form-control col-md-8 text-gray" required></input>
+                    </div>
+                    <div class="input-group">
+                        <span class="input-group-text col-md-5 text-gray">Angle y</span>
+                        <input id="input-datum-angle-y" 
+                                type="number" 
+                                step="any" 
+                                name="angle y"
+                                value="{{ form.dy.value|default_if_none:'' }}" 
+                                class="form-control col-md-8 text-gray" required></input>
+                    </div>
+                </div>
+            </div>
+            <button class="remove-form btn btn-danger btn-sm ml-2">Remove</button>
+        </div>
+        <button id="add-datum" class="btn btn-sm button btn-outline-primary mb-3">Add Datum</button>
+    </fieldset>
+    <button type="button" id="plot-btn" class="btn btn-info btn-sm mb-3">Plot</button>
+    <button type="submit" class="btn btn-sm button btn-success mb-3">Save</button>
+</form>

{irie-0.0.58 → irie-0.0.59}/src/irie/apps/templates/inventory/sensor-upload.html

@@ -240,28 +240,28 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 </script>
 <script>
-    document.addEventListener("DOMContentLoaded", function () {
-        const datumSelect = document.getElementById("id_datum");
-        const datumInfoDiv = document.getElementById("datum-info");
-        const locationSpan = document.getElementById("datum-location");
-        const orientationSpan = document.getElementById("datum-orientation");
-    
-        // Store datum data from Django
-        const datums = {{ datums|safe }};
-    
-        datumSelect.addEventListener("change", function () {
-            const selectedDatumId = this.value;
-            const selectedDatum = datums.find(d => d.id == selectedDatumId);
-    
-            if (selectedDatum) {
-                locationSpan.textContent = `${selectedDatum.locate_x}; ${selectedDatum.locate_y}; ${selectedDatum.locate_z}`;
-                orientationSpan.textContent = `${selectedDatum.orient_x}; ${selectedDatum.orient_y}; ${selectedDatum.orient_z}`;
-                datumInfoDiv.style.display = "block";  // Show info box
-            } else {
-                datumInfoDiv.style.display = "none";  // Hide if no datum selected
-            }
-        });
-    });
+  document.addEventListener("DOMContentLoaded", function () {
+      const datumSelect = document.getElementById("id_datum");
+      const datumInfoDiv = document.getElementById("datum-info");
+      const locationSpan = document.getElementById("datum-location");
+      const orientationSpan = document.getElementById("datum-orientation");
+  
+      // Store datum data from Django
+      const datums = {{ datums|safe }};
+  
+      datumSelect.addEventListener("change", function () {
+          const selectedDatumId = this.value;
+          const selectedDatum = datums.find(d => d.id == selectedDatumId);
+  
+          if (selectedDatum) {
+              locationSpan.textContent = `${selectedDatum.locate_x}; ${selectedDatum.locate_y}; ${selectedDatum.locate_z}`;
+              orientationSpan.textContent = `${selectedDatum.orient_x}; ${selectedDatum.orient_y}; ${selectedDatum.orient_z}`;
+              datumInfoDiv.style.display = "block";  // Show info box
+          } else {
+              datumInfoDiv.style.display = "none";  // Hide if no datum selected
+          }
+      });
+  });
 </script>
 
 <script type="module">

{irie-0.0.58 → irie-0.0.59}/src/irie/apps/templates/prediction/create-model.html

@@ -1,13 +1,4 @@
 {% extends "layouts/base.html" %}
-{% comment %}
-<!-- 
-===----------------------------------------------------------------------===#
-
-         STAIRLab -- STructural Artificial Intelligence Laboratory
-
-===----------------------------------------------------------------------===#
--->
-{% endcomment}
 
 {% block title %} {{ asset.calid }} | Upload {% endblock %} 
 
@@ -48,6 +39,7 @@
   </div>
 
   <div class="row">
+    {% include "inventory/create-datum.html" %}
     <div class="col">
       <form method="POST" enctype="multipart/form-data">
         {% csrf_token %}

{irie-0.0.58 → irie-0.0.59}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.58
+Version: 0.0.59
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -32,7 +32,7 @@ Requires-Dist: quakeio
 Requires-Dist: mdof
 Requires-Dist: veux>=0.0.35
 Requires-Dist: xara
-Requires-Dist: xcsi
+Requires-Dist: xcsi>=0.0.2
 Requires-Dist: xsection>=0.0.19
 Requires-Dist: openbim
 Requires-Dist: folium

{irie-0.0.58 → irie-0.0.59}/src/irie.egg-info/SOURCES.txt

@@ -85,6 +85,7 @@ src/irie/apps/inventory/migrations/0005_alter_sensor_group.py
 src/irie/apps/inventory/migrations/0006_datum_asset_datum_locate_x_datum_locate_y_and_more.py
 src/irie/apps/inventory/migrations/0007_sensor_name.py
 src/irie/apps/inventory/migrations/0008_alter_sensor_dx_alter_sensor_dy_alter_sensor_dz_and_more.py
+src/irie/apps/inventory/migrations/0009_datum_angle_x_datum_angle_y.py
 src/irie/apps/inventory/migrations/__init__.py
 src/irie/apps/inventory/services/render.py
 src/irie/apps/inventory/services/maps/__init__.py
@@ -118,6 +119,7 @@ src/irie/apps/prediction/migrations/0003_alter_predictormodel_protocol.py
 src/irie/apps/prediction/migrations/0004_sensorassignment.py
 src/irie/apps/prediction/migrations/0005_remove_sensorassignment_offset_x_and_more.py
 src/irie/apps/prediction/migrations/0006_remove_sensorassignment_show_x_and_more.py
+src/irie/apps/prediction/migrations/0007_remove_sensorassignment_orient_x_and_more.py
 src/irie/apps/prediction/migrations/__init__.py
 src/irie/apps/prediction/runners/__init__.py
 src/irie/apps/prediction/runners/hazus.py
@@ -416,6 +418,7 @@ src/irie/apps/templates/inventory/asset-sensors.html
 src/irie/apps/templates/inventory/asset-table.html
 src/irie/apps/templates/inventory/bridge-dashboard.html
 src/irie/apps/templates/inventory/bridge.html
+src/irie/apps/templates/inventory/create-datum.html
 src/irie/apps/templates/inventory/dashboard.html
 src/irie/apps/templates/inventory/map-inventory.html
 src/irie/apps/templates/inventory/map-inventory2.html

{irie-0.0.58 → irie-0.0.59}/src/irie.egg-info/requires.txt

@@ -4,7 +4,7 @@ quakeio
 mdof
 veux>=0.0.35
 xara
-xcsi
+xcsi>=0.0.2
 xsection>=0.0.19
 openbim
 folium