From 3f0fffda46c925de11df2237ed5a55359634efa1 Mon Sep 17 00:00:00 2001
From: SBD <strigevitch.boris@gmail.com>
Date: Fri, 10 Jan 2025 22:27:58 +0300
Subject: [PATCH] 0.0.09 form poster

---
 static/v2/js/forms.js                          | 10 +++++++++-
 templates/v2/forms/f_make_poster_order.html    |  8 ++++----
 templates/v2/widgets/w_textarea_w_counter.html |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/static/v2/js/forms.js b/static/v2/js/forms.js
index b8b4070..9aea62d 100644
--- a/static/v2/js/forms.js
+++ b/static/v2/js/forms.js
@@ -10,7 +10,7 @@ function chooseCheckbox(el) {
 function getFormData(form) {
     if (!form) return;
     let formData = new FormData();
-    let default_element_types = ['input', 'textarea', 'date'];
+    let default_element_types = ['input', 'textarea'];
 
     let form_elements = getFormElements(form);
     if (!form_elements) return;
@@ -23,6 +23,7 @@ function getFormData(form) {
         if (!name) name = el.name
         if (!name) name = el.dataset.name;
         let value = el.querySelector('input')? el.querySelector('input').value : ''
+        if (!value && el.querySelector('textarea')) value = el.querySelector('textarea').value;
 
         if (field_type) {
             if (default_element_types.indexOf(field_type) > -1) {
@@ -72,6 +73,13 @@ function addCustomDataToFormData(el, formData) {
 
             formData.append(name, l_value);
             break;
+
+        case 'date':
+            let $date = el.querySelector('input');
+            let d_value = $date.value.split('.').reverse().join('-');
+
+            formData.append(name, d_value);
+            break;
     }
     return formData;
 }
\ No newline at end of file
diff --git a/templates/v2/forms/f_make_poster_order.html b/templates/v2/forms/f_make_poster_order.html
index d1dbf1d..1d1aa9f 100644
--- a/templates/v2/forms/f_make_poster_order.html
+++ b/templates/v2/forms/f_make_poster_order.html
@@ -34,7 +34,7 @@
         <div class="field_container" data-type="radio" data-name="type_transport">
             {% trans "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" as attention_type_transport %}
             <label for="id_cargo_type"><div class="required_field_icon">*</div> {% trans "Каким способом Вы хотите отправить?" %}</label>
-            {% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' list=form.fields.type_transport.choices %}
+            {% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' list=form.fields.type_transport.choices initial=form.initial.type_transport %}
             {% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %}
             {% if form.errors.type_transport %}<div class="error_container">{{ form.errors.type_transport.0 }}</div>{% endif %}
         </div>
@@ -43,7 +43,7 @@
         <div class="field_container" data-type="input" style="width: 100%" data-name="phone">
             {% trans "Если вы оставите это поле пустым - перевозчики смогут только написать вам в личные сообщения на нашем сайте TripWB.com" as attention_phone %}
             <label for="id_cargo_type">{% trans "Контактный номер телефона, по которому с Вами могут связаться перевозчики" %}</label>
-            <input class="half" style="height: unset;" type="text" name="phone" id="id_phone" placeholder="{% trans 'Укажите телефон' %}">
+            <input class="half" style="height: unset;" type="text" name="phone" id="id_phone" placeholder="{% trans 'Укажите телефон' %}"{% if form.initial.phone %} value="{{ form.initial.phone }}" {% endif %}>
             {% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %}
             {% if form.errors.phone %}<div class="error_container">{{ form.errors.phone.0 }}</div>{% endif %}
         </div>
@@ -52,13 +52,13 @@
         <div class="field_container" data-type="textarea" style="width: 100%;--textarea-height: 130px;" data-name="comment">
             {% trans 'Если желаете, то здесь можно указать важную информацию, например: вес, габариты посылки, количество попутчиков и т.д.)' as comment_placeholder %}
             <label for="id_comment">{% trans "Примечание (необязательно)" %}</label>
-            {% include 'v2/widgets/w_textarea_w_counter.html' with name='comment' placeholder=comment_placeholder max_val='300' %}
+            {% include 'v2/widgets/w_textarea_w_counter.html' with name='comment' placeholder=comment_placeholder max_val='300' initial=form.initial.comment %}
             {% if form.errors.comment %}<div class="error_container">{{ form.errors.comment.0 }}</div>{% endif %}
         </div>
     </div>
     <div class="form_line">
         <div class="field_container line" data-type="checkbox" data-name="receive_msg_by_email">
-            <div class="checkbox" onclick="chooseCheckbox(this)"></div>
+            <div class="checkbox{% if form.initial.receive_msg_by_email %} checked{% endif %}" onclick="chooseCheckbox(this)"></div>
             <div class="checkbox_label" onclick="chooseCheckbox(this)">{% trans "Хочу получать уведомления на E-mail о появлении перевозчика по моим критериям" %}</div>
             {% include 'v2/widgets/w_additional_info.html' %}
             {% if form.errors.receive_msg_by_email %}<div class="error_container">{{ form.errors.receive_msg_by_email.0 }}</div>{% endif %}
diff --git a/templates/v2/widgets/w_textarea_w_counter.html b/templates/v2/widgets/w_textarea_w_counter.html
index 51f2eb7..e83064a 100644
--- a/templates/v2/widgets/w_textarea_w_counter.html
+++ b/templates/v2/widgets/w_textarea_w_counter.html
@@ -2,6 +2,6 @@
 {% load i18n %}
 <div class="w_textarea_w_counter" data-max_val="{{ max_val }}">
     <div class="trans_block" data-trans="{% trans 'из' %}"></div>
-    <textarea name="{{ name }}" id="id_{{ name }}" oninput="textareaInputE(this)"></textarea>
-    <div class="symbols_counter">0 {% trans "из" %} {{ max_val }}</div>
+    <textarea name="{{ name }}" id="id_{{ name }}" oninput="textareaInputE(this)">{% if initial %}{{ initial }}{% endif %}</textarea>
+    <div class="symbols_counter">{% if initial %}{{ initial|length }}{% else %}0{% endif %} {% trans "из" %} {{ max_val }}</div>
 </div>
\ No newline at end of file