irie 0.0.36__tar.gz → 0.0.37__tar.gz

{irie-0.0.36 → irie-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: irie
-Version: 0.0.36
+Version: 0.0.37
 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.36 → irie-0.0.37}/pyproject.toml

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

{irie-0.0.36 → irie-0.0.37}/src/irie/apps/inventory/forms.py

@@ -5,7 +5,7 @@
 #===----------------------------------------------------------------------===#
 from django import forms
 from django.forms import formset_factory
-from irie.apps.inventory.models import Asset, SensorGroup, Sensor
+from irie.apps.inventory.models import Asset, SensorGroup, Sensor, Datum
 
 class AssetForm(forms.ModelForm):
     class Meta:
@@ -16,12 +16,18 @@ class SensorGroupForm(forms.ModelForm):
     class Meta:
         model = SensorGroup
         fields = ['name', 'datum']
+    
+    def __init__(self, *args, asset=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if asset:
+            self.fields['datum'].queryset = Datum.objects.filter(asset=asset)
 
 class SensorForm(forms.ModelForm):
     class Meta:
         model = Sensor
-        fields = ['x', 'y', 'z', 'dx', 'dy', 'dz']
+        fields = ['name', 'x', 'y', 'z', 'dx', 'dy', 'dz']
         labels = {
+            'name': 'Name',
             'x': 'x',
             'y': 'y',
             'z': 'z',

irie-0.0.37/src/irie/apps/inventory/migrations/0005_alter_sensor_group.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.2 on 2025-02-25 04:49
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0004_datum_sensorgroup_sensor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sensor',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='sensors', to='irie_apps_inventory.sensorgroup'),
+        ),
+    ]

irie-0.0.37/src/irie/apps/inventory/migrations/0006_datum_asset_datum_locate_x_datum_locate_y_and_more.py

@@ -0,0 +1,56 @@
+# Generated by Django 5.1.2 on 2025-02-25 05:07
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0005_alter_sensor_group'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='datum',
+            name='asset',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.RESTRICT, to='irie_apps_inventory.asset'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='locate_x',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='locate_y',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='locate_z',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='orient_x',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='orient_y',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='datum',
+            name='orient_z',
+            field=models.CharField(default=0, max_length=240),
+            preserve_default=False,
+        ),
+    ]

irie-0.0.37/src/irie/apps/inventory/migrations/0007_sensor_name.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.2 on 2025-02-26 03:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0006_datum_asset_datum_locate_x_datum_locate_y_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sensor',
+            name='name',
+            field=models.CharField(default=1, max_length=100),
+            preserve_default=False,
+        ),
+    ]

irie-0.0.37/src/irie/apps/inventory/migrations/0008_alter_sensor_dx_alter_sensor_dy_alter_sensor_dz_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.1.2 on 2025-02-26 07:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_inventory', '0007_sensor_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sensor',
+            name='dx',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='sensor',
+            name='dy',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='sensor',
+            name='dz',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='sensor',
+            name='x',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='sensor',
+            name='y',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='sensor',
+            name='z',
+            field=models.DecimalField(decimal_places=2, max_digits=10),
+        ),
+    ]

{irie-0.0.36 → irie-0.0.37}/src/irie/apps/inventory/models.py

@@ -104,12 +104,18 @@ class Vulnerability: # (models.Model):
 
 class Datum(models.Model):
     name  = models.CharField(max_length=100)
+    orient_x = models.CharField(max_length=240) # eg, longitudinal axis of the deck from west to east
+    locate_x = models.CharField(max_length=240) # eg, east abutment-to-deck interface
+    orient_y = models.CharField(max_length=240) # eg, transverse axis of the deck from north to south
+    locate_y = models.CharField(max_length=240) # eg, center of deck
+    orient_z = models.CharField(max_length=240) # eg, vertical upwards
+    locate_z = models.CharField(max_length=240) # eg, deck surface
+    asset    = models.ForeignKey(Asset, on_delete=models.RESTRICT)
+
     def __str__(self):
         return f"{self.name}"
 
 class SensorGroup(models.Model):
-    """
-    """
     name    = models.CharField(max_length=100)
 #   sensors; access with .sensor_set.all()
     asset   = models.ForeignKey(Asset, on_delete=models.RESTRICT)
@@ -123,15 +129,16 @@ class Sensor(models.Model):
     # class Status:
     #     active: bool
 
-    x    = models.FloatField()
-    y    = models.FloatField()
-    z    = models.FloatField()
+    name = models.CharField(max_length=100)
+    x    = models.DecimalField(decimal_places=2, max_digits=10)
+    y    = models.DecimalField(decimal_places=2, max_digits=10)
+    z    = models.DecimalField(decimal_places=2, max_digits=10)
 
-    dx   = models.FloatField()
-    dy   = models.FloatField()
-    dz   = models.FloatField()
+    dx   = models.DecimalField(decimal_places=2, max_digits=10)
+    dy   = models.DecimalField(decimal_places=2, max_digits=10)
+    dz   = models.DecimalField(decimal_places=2, max_digits=10)
 
     group  = models.ForeignKey(SensorGroup, related_name="sensors", on_delete=models.RESTRICT)
 
     def __str__(self):
-        return f"Sensor {self.id} ({self.group.name})"
+        return f"{self.name} ({self.group.name})"

{irie-0.0.36 → irie-0.0.37}/src/irie/apps/inventory/views.py

@@ -22,7 +22,7 @@ from django.forms import formset_factory
 
 from irie.apps.events.models import EventRecord
 from irie.apps.site.view_utils import raise404
-from irie.apps.inventory.models import Asset, SensorGroup, Sensor
+from irie.apps.inventory.models import Asset, SensorGroup, Sensor, Datum
 from irie.apps.inventory.forms import SensorGroupForm, SensorForm, SensorFormSet
 from .filters import AssetFilter
 # Predictors
@@ -318,7 +318,10 @@ def _make_tables(asset):
        } for group in asset.nbi_data.values()
     ]
     tables.extend(nbi_data)
-    tables = [tables[2], *tables[:2], *tables[3:]]
+    try:
+        tables = [tables[2], *tables[:2], *tables[3:]]
+    except:
+        pass
     condition = {}
     for table in tables:
         keys = set()
@@ -355,10 +358,13 @@ def asset_sensors(request, calid):
 @login_required(login_url="/login/")
 def sensor_upload(request, calid):
     asset = get_object_or_404(Asset, calid=calid)  # Fetch the asset using calid
+    datums = Datum.objects.filter(asset=asset).values(
+        'id', 'orient_x', 'locate_x', 'orient_y', 'locate_y', 'orient_z', 'locate_z'
+    )
     SensorFormSet = formset_factory(SensorForm, extra=1, can_delete=False)  
 
     if request.method == "POST":
-        group_form = SensorGroupForm(request.POST)
+        group_form = SensorGroupForm(request.POST, asset=asset)
         formset = SensorFormSet(request.POST)
 
         if group_form.is_valid() and formset.is_valid():
@@ -375,13 +381,14 @@ def sensor_upload(request, calid):
             return redirect('asset_sensors', calid=calid)  # Redirect after successful submission
 
     else:
-        group_form = SensorGroupForm()
+        group_form = SensorGroupForm(asset=asset)
         formset = SensorFormSet()
 
     return render(request, "inventory/sensor-upload.html", {
         "group_form": group_form, 
         "formset": formset,
-        "asset": asset  # Pass asset to template if needed
+        "asset": asset,
+        "datums": list(datums)
     })
 
 

{irie-0.0.36 → irie-0.0.37}/src/irie/apps/templates/inventory/asset-event-summary.html

@@ -6,6 +6,10 @@
 {% endblock %}
 
 {% block stylesheets %}
+{% if asset.rendering %}
+<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0"> -->
+<script type="module" src="https://ajax.googleapis.com/ajax/libs/model-viewer/4.0.0/model-viewer.min.js"></script>
+{% endif %}
 <style>
 .ct-series-a .ct-point, .ct-series-a .ct-line, .ct-series-a .ct-bar, .ct-series-a .ct-slice-donut{
   stroke: #506690;
@@ -60,15 +64,21 @@
             <div class="tab-content" id="pills-tabContent">
               <div class="tab-pane fade show active" 
                    id="pills-rendering" role="tabpanel">
-                {% if asset.is_complete %}
-                  {% with cesmd=asset.cesmd %}
-                    {% with filename="bridges/InteractiveTwin-"|add:asset.cesmd|add:".html" %}
-                      {% include filename %} 
-                    {% endwith %}
-                  {% endwith %}
+                {% if asset.rendering %}
+                  <model-viewer 
+                    id="viewer"
+                    src="{{ asset.rendering }}" 
+                    alt="3D Model" 
+                    auto-rotate 
+                    camera-controls
+                    interaction-prompt="none"
+                    camera-orbit="0deg 75deg 2m" 
+                    field-of-view="30deg"
+                    style="width: 100%; height: 400px;">
+                  </model-viewer>
                 {% endif %}
               </div>
-              <div class="tab-pane fade show {% if not asset.is_complete %}active{% endif %}"
+              <div class="tab-pane fade show {% if not asset.rendering %}active{% endif %}"
                    id="pills-sensors" role="tabpanel">
                 <img src="{{ ASSETS_ROOT }}/inventory/ll{{ asset.cesmd|slice:"2:" }}.svg">
               </div>

{irie-0.0.36 → irie-0.0.37}/src/irie/apps/templates/inventory/asset-profile.html

@@ -129,7 +129,7 @@
       <div class="btn-toolbar mb-2 mb-md-0">
         <a role="button" 
            href="/inventory/{{ asset.calid }}/predictors/"
-           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
+           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
           <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>
@@ -137,7 +137,7 @@
         </a>
         <a role="button" 
            href="{% url 'asset_sensors' calid=asset.calid %}"
-           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center">
+           class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
           <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>
@@ -145,7 +145,7 @@
         </a>
       </div>
     </div>
-    {% if True %}
+    {% if asset.nbi_data.NBI_BRIDGE %}
     <div class="col-10">
       <p>
       {% if asset.id|divisibleby:3 %}

irie-0.0.37/src/irie/apps/templates/inventory/asset-sensors.html

@@ -0,0 +1,69 @@
+<!-- 
+===----------------------------------------------------------------------===#
+
+         STAIRLab -- STructural Artificial Intelligence Laboratory
+
+===----------------------------------------------------------------------===#
+
+Claudio Perez, Summer 2023 
+Chrystal Chern, Spring 2025
+
+-->
+
+{% extends "layouts/base.html" %}
+{% block title %} {{ asset.calid }} Sensors {% endblock %} 
+
+{% block content %}
+<h1><code>{{ asset.calid }}</code> Sensors</h1>
+  <div class="py-4 align-right">
+    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
+    href="{% url 'asset_profile' calid=asset.calid %}" class="me-1">Back to Structure</a>
+    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
+    href="{% url 'sensor_upload' calid=asset.calid %}" class="me-1">Add SensorGroup</a>
+  </div>
+
+  <div class="col-lg-10">
+    {% for group in groups %}
+    <div class="card shadow-lg mb-4">
+      <div class="card-header bg-dark text-white fw-bold d-flex justify-content-between align-items-center">
+        <span>{{ group.name }}</span>
+        <span class="badge bg-gray text-white px-2 py-1 fs-6">Datum: {{ group.datum.name }}</span>
+      </div>
+        <div class="card-body">
+          <table class="table table-striped table-hover table-bordered">
+            <thead class="table-dark">
+              <tr>
+                <th>Sensor</th>
+                <th>x</th>
+                <th>y</th>
+                <th>z</th>
+                <th>dx</th>
+                <th>dy</th>
+                <th>dz</th>
+              </tr>
+            </thead>
+            <tbody>
+              {% for sensor in group.sensors.all %}
+              <tr>
+                <td class="fw-bold">{{ sensor.name }}</td>
+                <td>{{ sensor.x }}</td>
+                <td>{{ sensor.y }}</td>
+                <td>{{ sensor.z }}</td>
+                <td>{{ sensor.dx }}</td>
+                <td>{{ sensor.dy }}</td>
+                <td>{{ sensor.dz }}</td>
+              </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+
+{% endblock %}
+
+{% block javascripts %}
+
+{% endblock %}
+