irie 0.0.59__py3-none-any.whl → 0.0.60__py3-none-any.whl

irie/apps/templates/prediction/create-model.html

@@ -38,24 +38,45 @@
     </div>
   </div>
 
-  <div class="row">
-    {% include "inventory/create-datum.html" %}
-    <div class="col">
-      <form method="POST" enctype="multipart/form-data">
-        {% csrf_token %}
-        {{ form.as_p}}
-        <button id="render" type="button"  class="btn btn-outline-primary" >Render</button>
-        <button type="submit" class="btn btn-primary" name="action" value="commit">Submit</button>
-      </form>
+  <div class="row align-right">
+    <div class="col-md-4">
+      <div class="card bg-white-100 border-1 rounded-0 shadow">
+        <div class="card-header">
+          <h3 class="mb-0">Sensors</h3>
+        </div>
+        <div class="card-body">
+          <ul class="list-group">
+            <li class="list-group-item active" aria-current="true">Datum</li>
+            <li class="list-group-item">Structure</li>
+            <li class="list-group-item">Sensors</li>
+            <li class="list-group-item">Submit</li>
+          </ul>
+        </div> 
+      </div>
+    </div>
+
+    <div class="col-md-8">
+      <div class="card bg-white-100 border-1 rounded-0 shadow">
+        <div class="card-body">
+          <div class="col">
+            <form method="POST" enctype="multipart/form-data">
+              {% csrf_token %}
+              {{ form.as_p}}
+              <button id="render" type="button"  class="btn btn-outline-primary" >Render</button>
+              <button type="submit" class="btn btn-primary" name="action" value="commit">Submit</button>
+            </form>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 
+
+
   {% if navigator %}
   {% include "prediction/veux/navigator.html" with members=navigator.members sections=navigator.sections %}
   {% endif %}
 
-  {% if error %}
-  {% endif %}
   <div class="row">
     <iframe
       id="map"
@@ -68,24 +89,6 @@
 {% endblock content %}
 
 {% block javascripts %}
-{% if navigator %}
-<script>
-  
-{% include "prediction/veux/navigator.js" %}
-
-const VIEWER = new VeuxNavigator(`/inventory/{{asset.calid}}/predictors/{{predictor.id}}/render/?section=`,
-                              document.querySelector('#tab-link-container'),
-                              document.getElementById('tab-content-container'));
-
-function handleMemberSelection(elem) {
-    VIEWER.select(elem);
-}
-
-document.addEventListener('DOMContentLoaded', function () {
-    VIEWER.initTabs('tab1', '.tab-link');
-});
-</script>
-{% endif %}
 
 <script>
   const button = document.getElementById('render');

irie/apps/templates/prediction/upload/confirm.html

@@ -0,0 +1,93 @@
+{% extends "layouts/base.html" %}
+
+{% block title %} {{ asset.calid }} | Upload {% endblock %} 
+
+{% block stylesheets %}
+{% endblock stylesheets %}
+
+{% block content %}
+<div class="print">
+  <div class="col-10 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">
+            <li class="breadcrumb-item">
+              <a href="{% url 'dashboard' %}">
+                <svg class="icon icon-xxs" 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="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path></svg>
+              </a>
+            </li>
+            <li class="breadcrumb-item text-dark" aria-current="page"><a href="{% url 'asset_table' %}">Inventory</a></li>
+            <li class="breadcrumb-item"><a href="{% url 'asset_profile' calid=asset.calid %}"><code>{{ asset.calid }}</code></a></li>
+            <li class="breadcrumb-item"><a href="/inventory/{{ asset.calid }}/predictors/">Predictors</a></li>
+            <li class="breadcrumb-item active">Upload</li>
+          </ol>
+        </nav>
+        <h1 class="h4"><samp>{{ asset.id }}</samp> / {{ asset.calid }} Predictor Upload</h1>
+    </div>
+    <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 mx-1">
+            Predictors
+      </a>
+      <a role="button" 
+         href="{% url 'asset_sensors' calid=asset.calid %}"
+         class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
+            Sensors
+      </a>
+    </div>
+  </div>
+  
+
+    <div class="row">
+        <iframe
+        id="map"
+        width="100%"
+        height="400"
+        >
+        </iframe>
+    </div>
+</div>
+{% endblock content %}
+
+{% block javascripts %}
+{% if navigator %}
+<script>
+  
+{% include "prediction/veux/navigator.js" %}
+
+const VIEWER = new VeuxNavigator(`/inventory/{{asset.calid}}/predictors/{{predictor.id}}/`,
+                              document.querySelector('#tab-link-container'),
+                              document.getElementById('tab-content-container'));
+
+function handleMemberSelection(elem) {
+    VIEWER.select(elem);
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+    VIEWER.initTabs('tab1', '.tab-link');
+});
+</script>
+{% endif %}
+
+<script>
+  const button = document.getElementById('render');
+  const form = document.querySelector('form');
+  const map = document.getElementById('map');
+  button.addEventListener('click', function(event) {
+    event.preventDefault();
+    fetch('/inventory/{{ asset.calid }}/predictors/create/map/', {
+      method: 'POST',
+      body: new FormData(form)
+    }).then(response => response.text())
+      .then(data => {
+        const blob = new Blob([data], { type: 'text/html' });
+        const url = window.URL.createObjectURL(blob);
+        map.src = url;
+      })
+      .catch(error => {
+        console.error('Error fetching map:', error);
+      });
+  });
+</script>
+{% endblock javascripts %}

irie/apps/templates/prediction/upload/step.html

@@ -0,0 +1,119 @@
+{% extends "layouts/base.html" %}
+{% load predictor %}
+{% load crispy_forms_tags %}
+
+{% block title %} {{ asset.calid }} | Upload {% endblock %}
+
+{% block stylesheets %}
+{# wizard.form.media #}
+{% endblock %}
+
+{% block content %}
+<div class="col-10 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">
+        <li class="breadcrumb-item">
+          <a href="{% url 'dashboard' %}">
+            <svg class="icon icon-xxs" 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="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path></svg>
+          </a>
+        </li>
+        <li class="breadcrumb-item text-dark" aria-current="page"><a href="{% url 'asset_table' %}">Inventory</a></li>
+        <li class="breadcrumb-item"><a href="{% url 'asset_profile' calid=asset.calid %}"><code>{{ asset.calid }}</code></a></li>
+        <li class="breadcrumb-item"><a href="/inventory/{{ asset.calid }}/predictors/">Predictors</a></li>
+        <li class="breadcrumb-item active">Upload</li>
+      </ol>
+    </nav>
+    <h1 class="h4">CSi Upload</h1>
+  </div>
+  <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 mx-1">
+        Predictors
+    </a>
+    <a role="button" 
+        href="{% url 'asset_sensors' calid=asset.calid %}"
+        class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
+        Sensors
+    </a>
+  </div>
+</div>
+
+
+<form method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    {{ wizard.management_form }}
+
+<div class="row align-right" style="height: 500px;">
+  <!-- Left: progress indicator -->
+  <div class="col-md-4  align-items-stretch">
+    <div class="card bg-white-100 border-1 rounded-0 shadow">
+      <!-- <div class="card-header">
+        <h3 class="mb-0">Upload</h3>
+      </div> -->
+      <div class="card-body">
+        <ul class="list-group list-group-flush list-group-numbered">
+          {% for n in wizard.steps.all %}
+          {% if wizard.steps.current == n %}
+            <button name="wizard_goto_step" value="{{ n }}" class="list-group-item list-group-item-action active">{{ n.title }}</button>
+          {% else %}
+            <button name="wizard_goto_step" value="{{ n }}" class="list-group-item list-group-item-action ">{{ n.title }}</button>
+          {% endif %}
+          {% endfor %}
+        </ul>
+      </div>
+    </div>
+  </div>
+
+  <!-- Right: form for this step -->
+  <div class="col-md-8  align-items-stretch">
+    <div class="card h-100 bg-white-100 border-1 rounded-0 shadow">
+      <div class="card-body d-flex flex-column">
+
+          <!-- <button id="render" type="button" class="btn btn-outline-primary">Render Map</button> -->
+          {% if wizard.steps.current == "confirm" %}
+          <iframe
+              id="map"
+              width="100%"
+              height="400"
+              data-srcdoc="{{ rndrdoc|safe }}"
+              >
+          </iframe>
+          {% endif %}
+
+        <!-- Form -->
+        {# form.as_p #}
+        {% crispy form %}
+      </div>
+      <div class="card-footer mb-0 p-1">
+        <div class="btn-group rounded-1" role="group" aria-label="Basic example">
+          {% if wizard.steps.prev %}
+          <button name="wizard_goto_step"
+                  value="{{ wizard.steps.prev }}"
+                  class="btn btn-outline-primary mb-0">
+              Back
+          </button>
+          {% endif %}
+          <button type="submit" class="btn btn-outline-primary mb-0">
+          {{ wizard.steps.next|yesno:"Next,Submit" }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+  </form>
+{% endblock %}
+
+
+{% block javascripts %}
+<script>
+  const button = document.getElementById('render');
+  const map = document.getElementById('map');
+  document.addEventListener('DOMContentLoaded', function () {
+    const blob = new Blob([map.dataset.srcdoc], { type: 'text/html' });
+    map.src = window.URL.createObjectURL(blob);
+  });
+</script>
+{% endblock javascripts %}

irie/apps/templates/prediction/veux/navigator.html

@@ -4,6 +4,8 @@
       <div class="col-md-4" >
         <div class="card bg-white-100 border-1 rounded-0 shadow">
           <div class="card-header d-sm-flex flex-row align-items-center flex-0">
+            <h5 class="mb-0 me-2">Components </h5>
+
             <select id="table-switcher" 
                     class="form-select form-select-sm me-2">
               <option value="members" >Members</option>
@@ -17,35 +19,14 @@
                     class="table align-items-center table-flush">
                 <thead class="thead-light">
                 <tr>
-                  <th class="border-bottom" scope="col">#</th>
+                  <th class="border-bottom" scope="col">Name</th>
                   <th class="border-bottom" scope="col">Type</th>
                 </tr>
                 </thead>
                 <tbody>
                   {% for member in members %}
                   <tr id="veux-member-{{member.id}}" 
-                      data-section="{{ member.section }}"
-                      style="cursor: pointer;" 
-                      onClick="handleMemberSelection(this)">
-                  <td><code>{{ member.name }}</code></td>
-                  <td>{{ member.type }}</td>
-                  </tr>
-                  {% endfor %}
-                </tbody>
-              </table>
-  
-              <table id="sections" hidden
-                    class="table align-items-center table-flush">
-                <thead class="thead-light">
-                <tr>
-                  <th class="border-bottom" scope="col">#</th>
-                  <th class="border-bottom" scope="col">Type</th>
-                </tr>
-                </thead>
-                <tbody>
-                  {% for member in sections %}
-                  <tr id="veux-member-{{member.id}}" 
-                      data-query="{{ member.name }}"
+                      data-render="section={{ member.section }}"
                       data-name="{{ member.name }}"
                       style="cursor: pointer;" 
                       onClick="handleMemberSelection(this)">
@@ -55,7 +36,31 @@
                   {% endfor %}
                 </tbody>
               </table>
-  
+              <div>
+                <table id="sections" hidden
+                      class="table align-items-center table-flush">
+                  <thead class="thead-light">
+                    <tr>
+                      <th class="border-bottom" scope="col">Name</th>
+                      <th class="border-bottom" scope="col">Type</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {% for member in sections %}
+                    <tr id="veux-member-{{member.id}}" 
+                        data-render="section={{ member.name }}"
+                        data-analysis="section={{ member.name }}"
+                        data-name="{{ member.name }}"
+                        style="cursor: pointer;" 
+                        onClick="handleMemberSelection(this)">
+                    <td><code>{{ member.name }}</code></td>
+                    <td>{{ member.type }}</td>
+                    </tr>
+                    {% endfor %}
+                  </tbody>
+                </table>
+              </div>
+
               <table id="sensors"
                      class="table align-items-center table-flush" hidden>
                 <thead class="thead-light">
@@ -87,30 +92,41 @@
             </div>
           </div>
         </div>
+
+        <div id="veux-properties" class="card bg-white-100 border-1 rounded-0 shadow mt-3">
+          <div class="card-header">
+            <h5 class="mb-0">Properties</h5>
+          </div>
+          <div class="card-body">
+            <div id="property-viewer" class="text-center">
+              <p>Select a member or sensor to view properties.</p>
+            </div>
+          </div>
+        </div>
       </div>
-  
-  <!-- Right Side: Predictor Rendering -->
+
+  <!-- Right Side: Rendering -->
       <div class="col-md-8">
         <div id="rendering" class="card bg-white-100 border-1 rounded-0 shadow">
           <div class="card-header">
             <ul id="tab-link-container" class="nav nav-tabs" id="myTab" role="tablist">
-                <li class="nav-item" role="presentation">
-                  <a class="nav-link tab-link active" 
-                     id="tab1-tab" 
-                     data-bs-toggle="tab" href="#"
-                     data-tab="tab1" 
-                     role="tab">Model</a>
-                </li>
+              <li class="nav-item" role="presentation">
+                <a class="nav-link tab-link active" 
+                    id="tab1-tab" 
+                    data-bs-toggle="tab" href="#"
+                    data-tab="tab1" 
+                    role="tab">Model</a>
+              </li>
             </ul>
           </div>
           <div class="card-body text-center" style="background-color: #f0f0f0;">
-              <div id="tab-content-container">
-                <div id="tab1-content" class="tab-content">
-                  <div id="main-viewer"
-                      style="width: 100%; height: 300px; background-color: #f0f0f0; margin: 0 auto;">
-                  </div>
+            <div id="tab-content-container">
+              <div id="tab1-content" class="tab-content">
+                <div id="main-viewer"
+                    style="width: 100%; height: 300px; background-color: #f0f0f0; margin: 0 auto;">
                 </div>
               </div>
+            </div>
           </div>
           <div class="card-footer text-center">
               Powered by <a href="https://veux.io/">veux</a>