calculator

app/settings.py

@@ -245,7 +245,7 @@ INSTALLED_APPS = (
     'blog',
 
     'aldryn_bootstrap3',
-'debug_toolbar',
+# 'debug_toolbar',
     'djangocms_forms',
     'smartsnippets',
 )

djangocms_forms/cms_plugins.py

@@ -106,6 +106,7 @@ class FormPlugin(CMSPluginBase):
 
         form_slug = "form-%d" % instance.plugin_reference.id
         submission_instance = instance
+
         if request.session.get(form_slug, False):
             try:
                 submission_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False))
@@ -121,7 +122,7 @@ class FormPlugin(CMSPluginBase):
             'form': form,
             'results': submission_instance
         })
-        
+
         return context
 
 

djangocms_forms/forms.py

@@ -268,7 +268,6 @@ class FormBuilder(forms.Form):
                 # Удаляем сессию, если это последний шаг. Признак последнего шага
                 for data in form_data:
                     if data['name'] == 'end_session':
-                        request.session[form_slug] = None
                         request.session['last-completed-form-id'] = form_instance.id
                 return
             except (FormSubmission.DoesNotExist):

djangocms_forms/templates/djangocms_forms/form_template/default.html

@@ -1,6 +1,7 @@
 {% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
 <script type="application/javascript">
 var form = {
+	'id': {{ results.id }},
 {% for item in results.form_data %}
         {% if item.label %}
         '{{ item.label }}'
@@ -11,7 +12,7 @@ var form = {
         	'size': 
         	{% if item.value == True %}
         	1
-        	{% elif item.value == False %}
+        	{% elif item.value == False or item.value == None %}
         	0
         	{% else %}
         	{{ item.value|length }}

zsite/static/less/main.less

@@ -68,6 +68,9 @@
   font-weight: 500;
 }
 
+.field-wrapper label {
+  display: inline;
+}
 
 [type="checkbox"]:not(:checked),
 [type="checkbox"]:checked { 

zsite/static/less/service.less

@@ -320,6 +320,39 @@
     }
 }
 
+#trademark-info {
+    position: absolute;
+    padding-top: 121px;
+
+    #trademark-id {
+        font-size: 10px;
+        left: 115px;
+        position: relative;
+    }
+
+    #trademark-image {
+        width: 120px;
+        left: 66px;
+        position: relative;
+    }
+
+    #trademark-name {
+        text-align: center;
+        width: 250px;
+    }
+}
+
+.result-paper {
+
+    width: 250px;
+    background-color: #fff;
+    -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+
+}
+
+
 
 .patents-portfolio {
     margin-top: 55px;

zsite/templates/form_template/product_class.html

@@ -8,7 +8,18 @@ var form = {
         {% else %}
         '{{ item.name }}'
         {% endif %}
-        : '{{ item.value|friendly|default_if_none:'—' }}',
+        : { 
+            'size': 
+            {% if item.value == True %}
+            1
+            {% elif item.value == False or item.value == None %}
+            0
+            {% else %}
+            {{ item.value|length }}
+            {% endif %}
+            ,
+            'values': '{{ item.value }}'
+        },
 {% endfor %}
 };
 </script>
@@ -120,11 +131,18 @@ var form = {
                     scope = angular.element($('.bill')).scope();
 
                 if(count == 0) {
-                    count = 1;
+                    if(scope.classes > 0) {
+                        count = scope.classes;
+                    } else {
+                        count = 1;
+                    }
                 }
 
                 scope.$apply(function () {
                     scope.classes = count;
+                    if(scope.classes > 5) {
+                        scope.extra_classes = scope.classes - 5;
+                    }
                 });
               };
         });