Compare commits
5 Commits
1a28e071e9
...
fae8882c21
Author | SHA1 | Date |
---|---|---|
Cayo Puigdefabregas | fae8882c21 | |
cayop | ce80d1f3c2 | |
pedro | e3b0d70f04 | |
pedro | 5b84d81590 | |
pedro | b5b90c50f6 |
|
@ -23,7 +23,7 @@ DEVICE_TYPES = [
|
||||||
class DeviceForm(forms.Form):
|
class DeviceForm(forms.Form):
|
||||||
type = forms.ChoiceField(choices = DEVICE_TYPES, required=False)
|
type = forms.ChoiceField(choices = DEVICE_TYPES, required=False)
|
||||||
amount = forms.IntegerField(required=False, initial=1)
|
amount = forms.IntegerField(required=False, initial=1)
|
||||||
customer_id = forms.CharField(required=False)
|
custom_id = forms.CharField(required=False)
|
||||||
name = forms.CharField(required=False)
|
name = forms.CharField(required=False)
|
||||||
value = forms.CharField(required=False)
|
value = forms.CharField(required=False)
|
||||||
|
|
||||||
|
@ -49,8 +49,8 @@ class BaseDeviceFormSet(forms.BaseFormSet):
|
||||||
row["amount"] = d["amount"]
|
row["amount"] = d["amount"]
|
||||||
if d.get("name"):
|
if d.get("name"):
|
||||||
row[d["name"]] = d.get("value", '')
|
row[d["name"]] = d.get("value", '')
|
||||||
if d.get("customer_id"):
|
if d.get("custom_id"):
|
||||||
row['CUSTOMER_ID']= d["customer_id"]
|
row['CUSTOM_ID']= d["custom_id"]
|
||||||
|
|
||||||
doc = create_doc(row)
|
doc = create_doc(row)
|
||||||
if not commit:
|
if not commit:
|
||||||
|
|
|
@ -40,15 +40,6 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ form.management_form }}
|
{{ form.management_form }}
|
||||||
<div class="container" id="formset-container">
|
<div class="container" id="formset-container">
|
||||||
<div class="row mb-2">
|
|
||||||
<div class="col"></div>
|
|
||||||
<div class="col-2 text-center">
|
|
||||||
<a href="javascript:void()" onclick="addForm(this);" type="button" class="btn btn-green-admin">
|
|
||||||
<i class="bi bi-plus"></i>
|
|
||||||
{% trans 'Add' %}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-2">
|
<div class="row mb-2">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{% bootstrap_field form.0.type %}
|
{% bootstrap_field form.0.type %}
|
||||||
|
@ -61,7 +52,18 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-2">
|
<div class="row mb-2">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{% bootstrap_field form.0.customer_id %}
|
{% bootstrap_field form.0.custom_id %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-2">
|
||||||
|
<div class="col-10">
|
||||||
|
<span class="fw-bold">{% trans 'Component details' %}</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-2 text-center">
|
||||||
|
<a href="javascript:void()" onclick="addForm(this);" type="button" class="btn btn-green-admin text-nowrap">
|
||||||
|
<i class="bi bi-plus"></i>
|
||||||
|
{% trans 'Add component' %}
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% for f in form %}
|
{% for f in form %}
|
||||||
|
|
|
@ -21,7 +21,7 @@ class NewDeviceView(DashboardView, FormView):
|
||||||
template_name = "new_device.html"
|
template_name = "new_device.html"
|
||||||
title = _("New Device")
|
title = _("New Device")
|
||||||
breadcrumb = "Device / New Device"
|
breadcrumb = "Device / New Device"
|
||||||
success_url = reverse_lazy('device:add')
|
success_url = reverse_lazy('dashboard:unassigned_devices')
|
||||||
form_class = DeviceFormSet
|
form_class = DeviceFormSet
|
||||||
|
|
||||||
def form_valid(self, form):
|
def form_valid(self, form):
|
||||||
|
|
Loading…
Reference in New Issue