simpledomcontrol 0.4.17__tar.gz → 0.4.19__tar.gz

{simpledomcontrol-0.4.17 → simpledomcontrol-0.4.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.4.17
+Version: 0.4.19
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0

{simpledomcontrol-0.4.17 → simpledomcontrol-0.4.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.4.17"
+version = "0.4.19"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.4.17 → simpledomcontrol-0.4.19}/sdc_core/consumers.py

@@ -259,6 +259,8 @@ class SDCModelConsumer(WebsocketConsumer):
                 self._init_connection(json_data)
             elif event_type == 'model_edit_form':
                 self._load_edit_form(json_data)
+            elif event_type == 'model_named_form':
+                self._load_named_form(json_data)
             elif event_type == 'model_create_form':
                 self._load_create_form(json_data)
             elif event_type == 'model_list_view':
@@ -348,6 +350,15 @@ class SDCModelConsumer(WebsocketConsumer):
         instance.scope = self.scope
         return self._load_form(json_data, self.model.edit_form, instance)
 
+    def _load_named_form(self, json_data):
+        instance = self._load_model().get(pk=json_data['args']['pk'])
+        instance.scope = self.scope
+        form_name = json_data['args']['form_name']
+        if not hasattr(self.model, 'forms'):
+            raise NotImplemented()
+
+        return self._load_form(json_data, self.model.forms.get(form_name), instance)
+
     def _load_form(self, json_data, form_attr, instance=None):
         if callable(form_attr):
             form_attr = form_attr({})

{simpledomcontrol-0.4.17 → simpledomcontrol-0.4.19}/sdc_core/template_files/package.json

@@ -75,6 +75,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.4.17"
+    "sdc_client": "^0.4.19"
   }
 }

{simpledomcontrol-0.4.17 → simpledomcontrol-0.4.19}/sdc_tools/Assets/src/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -9,6 +9,25 @@ export class SdcNavigatorController extends AbstractSDC {
     constructor() {
         super();
         this.contentUrl = "/sdc_view/sdc_tools/sdc_navigator"; //<sdc-navigator></sdc-navigator>
+        this._setup();
+        /**
+         * Events is an array of dom events.
+         * The pattern is {'event': {'dom_selector': handler}}
+         * Uncommend the following line to add events;
+         */
+        this.events.unshift({
+            'click': {
+                '.navigation-links': function (btn, ev) {
+                    ev.preventDefault();
+                    // noinspection JSPotentiallyInvalidUsageOfClassThis
+                    this.onNavLink(btn, ev);
+                }
+            }
+        });
+    }
+
+    _setup() {
+
         this._isLoggedIn = false;
         this._history_path = [];
         this._breadcrumb = [];
@@ -25,21 +44,6 @@ export class SdcNavigatorController extends AbstractSDC {
 
         this._non_controller_path_prefix = '/';
         this._menu_id = 0;
-
-        /**
-         * Events is an array of dom events.
-         * The pattern is {'event': {'dom_selector': handler}}
-         * Uncommend the following line to add events;
-         */
-        this.events.unshift({
-            'click': {
-                '.navigation-links': function (btn, ev) {
-                    ev.preventDefault();
-                    // noinspection JSPotentiallyInvalidUsageOfClassThis
-                    this.onNavLink(btn, ev);
-                }
-            }
-        });
     }
 
     //-------------------------------------------------//
@@ -225,7 +229,6 @@ export class SdcNavigatorController extends AbstractSDC {
 
 
     navLoaded(controller) {
-        console.log(this._current_process, controller.controller_name(), this._previous_args);
         let idx = this._history_path.length - 1;
         let last_view_array = this._preparedLastViewContainer(idx);
         last_view_array.active_container.removeClass('active loading').addClass('empty');
@@ -548,12 +551,14 @@ export class SdcNavigatorController extends AbstractSDC {
     login() {
         this._isLoggedIn = true;
         app.cleanCache();
+        this._setup();
         this.onNavigateToController(window.location.pathname);
     }
 
     logout() {
         this._isLoggedIn = false;
         app.cleanCache();
+        this._setup();
         this.onNavigateToController(window.location.pathname);
     }
 

simpledomcontrol-0.4.19/sdc_tools/templates/elements/form.html

@@ -0,0 +1,51 @@
+{% load i18n %}
+{% load sdc_filter %}
+{{ form.media }}
+
+<div class="hidden-form-fields">
+    {% for hidden in form.hidden_fields %}
+    {{ hidden }}
+    {% endfor %}
+</div>
+
+{% if form.non_field_errors %}
+<div class="alert alert-danger non-field-errors">
+    {{ form.non_field_errors }}
+</div>
+{% endif %}
+
+<style>
+    .form-group {
+        margin: 5px 0;
+    }
+</style>
+
+{% for field in form.visible_fields %}
+<div class="row form-group{% if field.errors %} has-error{% endif %} {{ field.auto_id }}"
+     data-auto-id="{{ field.auto_id }}">
+    <div class="col-md-4 label-container">
+
+
+        <label for="{{ field.auto_id }}" class="control-label">{{ field.label|safe }}</label>
+
+    </div>
+    <div class="col-md-8 form-input-container">
+
+        {{ field | addformclass}}
+
+
+        {% if field.errors %}
+        <div class="alert alert-danger error-msg">
+            {{ field.errors }}
+        </div>
+        {% endif %}
+    </div>
+    {% if field.help_text %}
+    <div class="col-md-4 label-container">
+    </div>
+    <div class="col-md-8 label-container">
+        <p class="help help_for_{{ field.auto_id }}">{{ field.help_text|safe }}</p>
+    </div>
+    {% endif %}
+</div>
+{% endfor %}

simpledomcontrol-0.4.19/sdc_tools/templates/elements/inline_form.html

@@ -0,0 +1,40 @@
+{% load i18n %}
+{% load sdc_filter %}
+{{ form.media }}
+
+<div class="hidden-form-fields">
+    {% for hidden in form.hidden_fields %}
+    {{ hidden }}
+    {% endfor %}
+</div>
+
+{% if form.non_field_errors %}
+<div class="alert alert-danger non-field-errors">
+    {{ form.non_field_errors }}
+</div>
+{% endif %}
+
+<div class="container-fluid">
+    <div class="row g-3 align-items-center">
+        {% for field in form.visible_fields %}
+        <div class="col-auto">
+            <label for="{{ field.auto_id }}" class="control-label">{{ field.label|safe }}</label>
+        </div>
+        <div class="col-auto">
+            {{ field | addformclass }}
+        </div>
+        {% if field.help_text %}
+        <div class="col-auto">
+            <span class="help help_for_{{ field.auto_id }}">{{ field.help_text|safe }}</span>
+        </div>
+        {% endif %}
+        {% if field.errors %}
+        <div class="col-auto">
+            {{ field.errors }}
+        </div>
+        {% endif %}
+        {% endfor %}
+    </div>
+</div>
+</div>
+</div>

simpledomcontrol-0.4.17/sdc_tools/templates/elements/form.html

@@ -1,99 +0,0 @@
-{% load i18n %}
-{% load sdc_filter %}
-{{ form.media }}
-
-<div class="hidden-form-fields">
-    {% for hidden in form.hidden_fields %}
-    {{ hidden }}
-    {% endfor %}
-</div>
-
-{% if form.non_field_errors %}
-<div class="alert alert-danger non-field-errors">
-    {{ form.non_field_errors }}
-</div>
-{% endif %}
-
-<style>
-    .non-field-errors {
-        margin: 10px 5px;
-    }
-
-    .non-field-errors ul {
-        margin: 0;
-    }
-    .error-msg {
-        padding: 3px;
-    }
-
-    .error-msg .errorlist {
-        margin: 0;
-    }
-
-    input[type="checkbox"] {
-        height: 30px;
-    }
-
-    .label-container {
-        text-align: right;
-    }
-
-    .form-group .help {
-        text-align: left;
-        padding: 3px 5px;
-    }
-
-    .label-container ul {
-        text-align: left;
-    }
-
-    .control-label:after {
-        content: ':';
-    }
-
-    .picker__select--year {
-        min-width: 59px;
-    }
-
-    .picker__select--month, .picker__select--year {
-        min-height: 42px !important;
-        padding: 0;
-    }
-
-    @media only screen and (max-width: 600px) {
-        .label-container {
-            text-align: center;
-        }
-    }
-</style>
-
-{% for field in form.visible_fields %}
-<div style="border-bottom: 1px solid #cccccc"
-     class="row form-group{% if field.errors %} has-error{% endif %} {{ field.auto_id }}"
-     data-auto-id="{{ field.auto_id }}">
-    <div class="col-md-4 label-container">
-
-
-        <label for="{{ field.auto_id }}" class="control-label">{{ field.label|safe }}</label>
-
-    </div>
-    <div class="col-md-8 form-input-container">
-
-        {{ field | addformclass}}
-
-
-        {% if field.errors %}
-        <div class="alert alert-danger error-msg">
-            {{ field.errors }}
-        </div>
-        {% endif %}
-    </div>
-    {% if field.help_text %}
-    <div class="col-md-2 label-container">
-    </div>
-    <div class="col-md-9 label-container">
-        <p class="help help_for_{{ field.auto_id }}">{{ field.help_text|safe }}</p>
-    </div>
-    {% endif %}
-</div>
-{% endfor %}

simpledomcontrol-0.4.17/sdc_tools/templates/elements/inline_form.html

@@ -1,73 +0,0 @@
-{% load i18n %}
-{% load sdc_filter %}
-{{ form.media }}
-
-<div class="hidden-form-fields">
-    {% for hidden in form.hidden_fields %}
-        {{ hidden }}
-    {% endfor %}
-</div>
-
-{% if form.non_field_errors %}
-    <div class="alert alert-danger non-field-errors">
-        {{ form.non_field_errors }}
-    </div>
-{% endif %}
-
-<style>
-
-    input[type="checkbox"] {
-        height: 30px;
-    }
-
-    .label-container {
-        text-align: right;
-    }
-
-    .label-container .help {
-        text-align: left;
-        padding-left: 5px;
-    }
-
-    .label-container ul {
-        text-align: left;
-    }
-
-    .control-label:after {
-        content: ':';
-    }
-
-    @media only screen and (max-width: 600px) {
-        .label-container {
-            text-align: center;
-        }
-    }
-</style>
-<div class="container">
-    <div class="row align-items-end">
-        {% for field in form.visible_fields %}
-            <div class="col-md form-group{% if field.errors %} has-error{% endif %} {{ field.auto_id }}"
-                 data-auto-id="{{ field.auto_id }}">
-                <div class="label-container">
-                    <label for="{{ field.auto_id }}" class="control-label">{{ field.label|safe }}</label>
-
-                    {% if field.help_text %}
-                        <p class="help help_for_{{ field.auto_id }}">{{ field.help_text|safe }}</p>
-                    {% endif %}
-
-                </div>
-                <div class="form-input-container">
-
-                    {{ field | addformclass }}
-
-
-                    {% if field.errors %}
-                        <div class="alert alert-danger">
-                            {{ field.errors }}
-                        </div>
-                    {% endif %}
-                </div>
-            </div>
-        {% endfor %}
-    </div>
-</div>