simo 2.0.42__py3-none-any.whl → 2.1.2__py3-none-any.whl

simo/core/templates/admin/formset_widget_old.html

@@ -0,0 +1,122 @@
+{% load i18n admin_urls static admin_modify %}
+<style>
+    .formset-table th, .formset-table th .label{
+        font-weight: normal;
+        color: var(--body-quiet-color);
+    }
+    .formset-table .label.required{
+        font-weight: bold;
+    }
+    form .aligned .formset-table ul{
+        margin-left:0;
+    }
+    .errors .formset-table input, .errors .formset-table select,
+    .errors .formset-table textarea{
+        border: 1px solid var(--border-color);
+    }
+    .errors .formset-table .select2-selection{
+        border-color: #aaa;
+    }
+    .formset-table td.errors input, .formset-table td.errors select,
+    .formset-table td.errors textarea{
+        border: 1px solid var(--error-fg);
+    }
+    .formset-table td.errors .select2-selection{
+        border-color: var(--error-fg);
+    }
+    .formset-table td.drag {
+        cursor: pointer;
+        background-image: url(/static/adminsortable2/icons/drag.png);
+        background-repeat: repeat;
+        width: 20px;
+    }
+    .formset-table .inline-deletelink{
+        float: left
+    }
+</style>
+
+
+<div class="inline-group sortable" id="{{ formset.prefix }}-group">
+  <div class="tabular inline-related">
+{{ formset.management_form }}
+<fieldset class="module">
+   {{ formset.non_form_errors }}
+   <table class="formset-table">
+     <thead><tr>
+         <th>{% trans "Sort" %}</th>
+     {% for field in empty_form %}
+       {% if not field.is_hidden and not field.name == 'DELETE' %}
+         <th{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}
+         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}
+         </th>
+       {% endif %}
+     {% endfor %}
+     {% if formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}
+     </tr></thead>
+
+     <tbody>
+     {% for form in formset %}
+        {% if form.non_field_errors %}
+          <tr><td colspan="{{ total_org_forms }}">{{ form.non_field_errors }}</td></tr>
+        {% endif %}
+
+        <tr class="form-row has_original" id="{{ formset.prefix }}-{{ forloop.counter0 }}">
+            <td class="drag">&nbsp;</td>
+            <td class="original hidden">
+              {% for field in form %}
+                {% if field.is_hidden %} {{ field }} {% endif %}
+              {% endfor %}
+            </td>
+
+            {% for field in form %}
+              {% if not field.is_hidden and not field.name == 'DELETE' %}
+              <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
+                  {{ field }}
+                  {{ field.errors.as_ul }}
+              </td>
+              {% endif %}
+            {% endfor %}
+
+            {% if formset.can_delete %}
+              <td class="delete">{% if total_org_forms >= forloop.counter0 %}{{ form.DELETE }}{% endif %}</td>
+            {% endif %}
+        </tr>
+
+     {% endfor %}
+
+     <tr class="form-row empty-form" id="{{ formset.prefix }}-empty">
+        <td class="drag">&nbsp;</td>
+        <td class="original hidden">
+          {% for field in empty_form %}
+            {% if field.is_hidden %} {{ field }} {% endif %}
+          {% endfor %}
+        </td>
+
+        {% for field in empty_form %}
+          {% if not field.is_hidden and not field.name == 'DELETE' %}
+          <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
+              {{ field }}
+              {{ field.errors.as_ul }}
+          </td>
+          {% endif %}
+        {% endfor %}
+
+        {% if formset.can_delete %}
+          <td class="delete"></td>
+        {% endif %}
+     </tr>
+
+     </tbody>
+   </table>
+</fieldset>
+  </div>
+</div>
+
+<script type="application/json" class="inline-tabular-config">
+{
+  "prefix": "{{ formset.prefix|escapejs }}",
+  "addText": "{% filter escapejs %}Add another{% endfilter %}",
+  "deleteText": "{% filter escapejs %}{% trans 'Remove' %}{% endfilter %}"
+}
+</script>
+<div class="default_order_field" default_order_field="ORDER" default_order_direction=""></div>

simo/core/templates/admin/user_tools.html

@@ -16,9 +16,6 @@
       <i class="fas fa-sort-down"></i>
     </div>
     <div class="dropdown-content" style="right: 110px">
-      <a href="{% url 'setup-wizard' %}">
-        <i class="fas fa-magic"></i>  Core Setup Wizard
-      </a>
       <a href="{% url 'update' %}" title="Update hub" class="update_link">
         <i class="fas fa-angle-double-up"></i> Update
       </a>

simo/core/templates/admin/wizard/wizard_add.html

@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls static admin_modify %}
+{% load i18n admin_urls static admin_modify markdownify %}
 
 {% block extrahead %}{{ block.super }}
 <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
@@ -49,18 +49,25 @@
   <h3 style="margin-bottom: 20px; text-align: center">Step {{ current_step }} of {{ total_steps }}</h3>
 
   <fieldset class="module aligned">
-    {% if selected_gateway %}
-      <div class="form-row ">
-        <label class="required"><label for="id_gateway">Gateway:</label></label>
-        <div class="readonly" style="font-weight:bold;">{{ selected_gateway }}</div>
+    {% if selected_gateway or selected_type %}
+      <div class="form-row">
+        {% if selected_gateway %}
+          Gateway: <strong>{{ selected_gateway }}</strong>
+        {% endif %}
+        {% if selected_type %}
+          | Base type: <strong>{{ selected_type }}</strong>
+        {% endif %}
       </div>
     {% endif %}
-    {% if selected_type %}
-      <div class="form-row ">
-        <label class="required"><label for="id_base_type">Base type:</label></label>
-        <div class="readonly" style="font-weight:bold;">{{ selected_type }}</div>
+    
+    {% if info %}
+      <div class="form-row">
+        <div class="markdownified-info">
+          {{ info|markdownify }}
+        </div>
       </div>
     {% endif %}
+    
     {% if error %}
         <ul class="messagelist">
             <li class="error">{{ error }}</li>

simo/core/utils/admin.py

@@ -1,6 +1,11 @@
 from django import forms
 from django.shortcuts import render, redirect
 from django.contrib.admin.helpers import Fieldset
+from django.db import models, router
+from django.utils.text import capfirst
+from django.urls import NoReverseMatch, reverse
+from django.contrib.admin.utils import NestedObjects, quote
+from django.utils.html import format_html
 
 
 class AdminFormActionForm(forms.Form):
@@ -55,3 +60,9 @@ class FormAction:
             'fieldset': Fieldset(form, fields=form.fields.keys())
         }
         return render(request, 'admin/action_intermediate_form.html', context)
+
+
+class EasyObjectsDeleteMixin:
+
+    def get_deleted_objects(self, objs, request):
+        return [], [], [], []

simo/core/utils/cache.py

@@ -0,0 +1,15 @@
+from django.conf import settings
+from django.core.cache import caches
+
+
+def get_cached_data(
+    key, rebuild_function, cache_time=None, cache_name='default', rebuild=False
+):
+    data = caches[cache_name].get(key, 'NONE!')
+    if data == 'NONE!' or rebuild:
+        print(f"{cache_name} cache rebuild: {rebuild_function.__name__}()")
+        data = rebuild_function()
+        if not cache_time:
+            cache_time = settings.CACHES[cache_name]['TIMEOUT']
+        caches[cache_name].set(key, data, cache_time)
+    return data

simo/core/utils/formsets.py

@@ -1,3 +1,4 @@
+import json
 from django import forms
 from django.db import models
 from django.template.loader import render_to_string
@@ -26,21 +27,12 @@ class FormsetWidget(forms.Widget):
     use_cached = False
 
     class Media:
-        pass
-        # No longer works with adminsortable2-2
-        # css = {
-        #     'all': ['adminsortable2/css/sortable.css']
-        # }
+        css = {
+            'all': ['adminsortable2/css/sortable.css']
+        }
         js = (
             'admin/js/inlines.js',
-            # 'adminsortable2/js/plugins/admincompat.js',
-            # 'adminsortable2/js/libs/jquery.ui.core-1.11.4.js',
-            # 'adminsortable2/js/libs/jquery.ui.widget-1.11.4.js',
-            # 'adminsortable2/js/libs/jquery.ui.mouse-1.11.4.js',
-            # 'adminsortable2/js/libs/jquery.ui.touch-punch-0.2.3.js',
-            # 'adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
-            # 'adminsortable2/js/inline-tabular.js',
-            # 'adminsortable2/js/inline-sortable.js',
+            'adminsortable2/js/adminsortable2.js',
         )
 
     def render(self, name, value, attrs=None, renderer=None):
@@ -80,14 +72,15 @@ class FormsetWidget(forms.Widget):
             attrs = {'id': 'id_%s-__prefix__-%s' % (prefix, name)}
             if name == "ORDER":
                 field.initial = 9999
-                field.widget = forms.HiddenInput()
+                field.widget = forms.HiddenInput(attrs={"class": '_reorder_'})
             set_field_html_name_and_id(
                 field, '%s-__prefix__-%s' % (prefix, name), attrs
             )
 
-        if self.formset.can_order:
-            for form in self.formset:
-                form.fields['ORDER'].widget = forms.HiddenInput()
+        for form in self.formset:
+            form.fields['ORDER'].widget = forms.HiddenInput(
+                attrs={"class": '_reorder_'}
+            )
 
         cell_count = len(list(self.formset.form.declared_fields.keys())) + 1
         if self.formset.can_order:
@@ -99,7 +92,7 @@ class FormsetWidget(forms.Widget):
             render_to_string(
                 'admin/formset_widget.html', {
                     'formset': self.formset,
-                    'inline_formset_data': str(inline_formset_data).replace("'", '"'),
+                    'inline_formset_data': json.dumps(inline_formset_data),
                     'cell_count': cell_count,
                     'empty_form': empty_form,
                     'total_org_forms': total_org_forms

simo/core/views.py

@@ -3,100 +3,17 @@ import threading
 import subprocess
 from django.contrib.auth.decorators import login_required
 from django.urls import reverse
-from django.shortcuts import get_object_or_404, render, redirect
-from django.http import FileResponse, HttpResponse, Http404
-from django.contrib.gis.geos import Point
+from django.shortcuts import redirect
+from django.http import HttpResponse, Http404
 from django.contrib import messages
-from simo.users.models import User
-from simo.conf import dynamic_settings
 from .models import Instance
 from .tasks import update as update_task, supervisor_restart
-from .forms import (
-    HubConfigForm, CoordinatesForm, TermsAndConditionsForm
-)
 from .middleware import introduce_instance
 
 
 def get_timestamp(request):
     return HttpResponse(time.time())
 
-
-@login_required
-def setup_wizard(request):
-
-    step = request.session.get('setup_wizard_step', 1)
-
-    if request.method == 'POST' and 'back' in request.POST and step > 1:
-        request.session['setup_wizard_step'] = step - 1
-        return redirect(request.path)
-
-    if step == 1:
-        cover_img = dynamic_settings['core__cover_image']
-        if cover_img:
-            cover_img.field.storage = cover_img.storage
-        initial = {
-            'name': dynamic_settings['core__hub_name'],
-            'uid': dynamic_settings['core__hub_uid'],
-            'time_zone': dynamic_settings['core__time_zone'],
-            'units_of_measure': dynamic_settings['core__units_of_measure'],
-            'cover_image': cover_img
-        }
-        form = HubConfigForm(initial=initial, user=request.user)
-        if request.method == 'POST':
-            form = HubConfigForm(
-                request.POST, request.FILES, initial=initial, user=request.user
-            )
-            if form.is_valid():
-                dynamic_settings['core__hub_name'] = form.cleaned_data['name']
-                dynamic_settings['core__hub_uid'] = form.cleaned_data['uid']
-                dynamic_settings['core__time_zone'] = form.cleaned_data[
-                    'time_zone'
-                ]
-                dynamic_settings['core__units_of_measure'] = form.cleaned_data[
-                    'units_of_measure'
-                ]
-                if not dynamic_settings['core__location_coordinates'] \
-                and request.POST.get('location-guess'):
-                    dynamic_settings['core__location_coordinates'] = \
-                        request.POST['location-guess']
-                if form.cleaned_data['cover_image']:
-                    dynamic_settings['core__cover_image'] = \
-                        form.cleaned_data['cover_image']
-                    dynamic_settings['core__cover_image_synced'] = False
-                request.session['setup_wizard_step'] = 2
-                return redirect(request.path)
-    elif step == 2:
-        initial = {
-            'location': dynamic_settings['core__location_coordinates'],
-            'share_location': dynamic_settings['core__share_location']
-        }
-        form = CoordinatesForm(initial=initial)
-        if request.method == 'POST':
-            form = CoordinatesForm(request.POST, initial=initial)
-            if form.is_valid():
-                dynamic_settings['core__location_coordinates'] = \
-                    form.cleaned_data['location']
-                dynamic_settings['core__share_location'] = \
-                    form.cleaned_data['share_location']
-                request.session['setup_wizard_step'] = 3
-                return redirect(request.path)
-    else:
-        form = TermsAndConditionsForm()
-        if request.method == 'POST':
-            form = TermsAndConditionsForm(request.POST)
-            if form.is_valid() and form.cleaned_data['accept']:
-                request.session.pop('setup_wizard_step')
-                messages.success(
-                    request, "Congratulations! "
-                             "Your Hub is now configured and restarting in the background. "
-                             "Will be fully ready in 30 seconds."
-                )
-                threading.Thread(target=supervisor_restart).start()
-                return redirect(reverse('admin:index'))
-
-    return render(request, 'setup_wizard/form.html', {'form': form, 'step': step})
-
-
 @login_required
 def update(request):
     if not request.user.is_superuser:

simo/fleet/auto_urls.py

@@ -2,7 +2,8 @@ from django.urls import path, re_path
 from .views import (
     colonels_ping,
     PinsSelectAutocomplete,
-    InterfaceSelectAutocomplete
+    InterfaceSelectAutocomplete,
+    ControlInputSelectAutocomplete
 )
 
 urlpatterns = [
@@ -17,5 +18,10 @@ urlpatterns = [
         'autocomplete-colonel-interfaces',
         InterfaceSelectAutocomplete.as_view(),
         name='autocomplete-interfaces'
+    ),
+    path(
+        'autocomplete-control-input',
+        ControlInputSelectAutocomplete.as_view(),
+        name='autocomplete-control_inputs'
     )
 ]