TRI-293: edit form

templates/blocks/profile/b_create_form_poster.html

@@ -24,26 +24,7 @@
 
 {% endif %}
 
-<div hidden>
-  csrfmiddlewaretoken: eoN2nLYYo46PpDIhi82dmTFASHH4ONiBdEQOz1jQNyUpsHJ4RrvcmFwfnM45TNtl
-  type_transport: road
-  from_city: 59613 4267
-  from_address_point_txt: Москаленки / Россия
-  to_city: 2824
-  to_address_point_txt: Берлар / Бельгия
-  departure_DT: 17.12.2024 23:04
-  arrival_DT: 29.12.2024 20:04
-  from_place: other
-  to_place: other
-  cargo_type: parcel
-  weight: 500
-  phone: 2604195
-  extra_phone: test
-  receive_msg_by_email: on
-  owner_type: customer
-  hiddenTime: 16 декабря 2024 г. 23:04
-</div>
-<div class="poster poster--{% if owner_type == 'customer' %}customer{% else %}mover{% endif %}">
+<div id="poster" class="poster poster--{% if owner_type == 'customer' %}customer{% else %}mover{% endif %}">
   <h1 class="poster__title">{{ p_title }}</h1>
 
   <form class="poster__form"
@@ -57,14 +38,14 @@
         name="from_city"
         id="from_city"
         hidden
-        {% if form.initial.from_city %}value="{{ form.initial.from_city }}"{% endif %}
+        {% if form.initial.from_city %}value="{{ form.initial.from_city.id }}"{% endif %}
     />
     <input
         type="number"
         name="to_city"
         id="to_city"
         hidden
-        {% if form.initial.to_city %}value="{{ form.initial.to_city }}"{% endif %}
+        {% if form.initial.to_city %}value="{{ form.initial.to_city.id }}"{% endif %}
     />
     <input
         id="owner_type"
@@ -76,57 +57,70 @@
         value="{{ form.data.owner_type }}"
         {% endif %}
     >
-    {#type-transport#}
-    <div class="poster__row poster__row--transport">
-      <div class="poster__col col-12">
+    {#type-transport mover#}
+    {% if owner_type == 'mover' %}
+      <div class="poster__row poster__row--transport">
+        <div class="poster__col col-12">
 
-        <label for="type_transport" class="poster__label col-12" required>
-          {{ l_transport }}
-        </label>
-        {% for item in form.fields.type_transport.choices %}
-          <div class="cargo cargo--inline">
-            <input
-                class="cargo__inp"
-                type="radio"
-                name="type_transport"
-                id="type_transport_{{ forloop.counter }}"
-                value="{{ item.0 }}"
-                {% if form.initial.type_transport == item.0 %}
-                checked="checked"
-                {% endif %}
-            >
-            <label class="cargo__label"
-                   for="type_transport_{{ forloop.counter }}">
-              <span>{{ item.1 }}</span>
-            </label>
+          <label for="type_transport" class="poster__label col-12" required>
+            {{ l_transport }}
+          </label>
+          {% for item in form.fields.type_transport.choices %}
+            <div class="cargo cargo--inline">
+              <input
+                  class="cargo__inp"
+                  type="radio"
+                  name="type_transport"
+                  id="type_transport_{{ forloop.counter }}"
+                  value="{{ item.0 }}"
+                  {% if form.initial.type_transport == item.0 %}
+                  checked
+                  {% endif %}
+              >
+              <label class="cargo__label"
+                     for="type_transport_{{ forloop.counter }}">
+                <span>{{ item.1 }}</span>
+              </label>
+            </div>
+          {% endfor %}
+          {% if not errors_off and form.errors and form.errors.type_transport %}
+            <span>{{ form.errors.type_transport }}</span>
+          {% endif %}
+          <div class="poster__info">
+            {% translate "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" %}
           </div>
-        {% endfor %}
-        {% if not errors_off and form.errors and form.errors.type_transport %}
-          <span>{{ form.errors.type_transport }}</span>
-        {% endif %}
-        <div class="poster__info">
-          {% translate "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" %}
         </div>
       </div>
-    </div>
+    {% endif %}
     {#from-to#}
     <div class="poster__row poster__row--from-to">
       <div class="poster__col">
-        <label for="from" class="poster__label " required>
+        <label for="from" class="poster__label" required>
           {{ l_from }}
         </label>
-        <div class="poster__inp-box">
-
-          <input type="text" autocomplete="off" name="from_address_point_txt" id="from" class="poster__locate locate"
-                 placeholder="{% translate "Укажите город" %}" required
-                 {% if form.initial.from_city %}value="{{ form.initial.from_city.name }} {{ form.initial.from_city.country.short_code }} / {{ form.initial.from_city.country.name }}"{% endif %}
+        <div class="poster__inp-box
+                    {% if form.initial.to_city %} is-set{% endif %}
+        ">
 
+          <input
+              type="text"
+              autocomplete="off"
+              name="from_address_point_txt"
+              id="from"
+              class="poster__locate locate"
+              placeholder="{% translate "Укажите город" %}"
+              required
+              {% if form.initial.from_city %}
+              value="{{ form.initial.from_city.name }} / {{ form.initial.from_city.country.name }}"
+              {% endif %}
           >
-
+          {% if form.initial.from_city %}
             <div class="poster__inp-country">
-              <img src="{{ MEDIA_URL }}{{ form.initial.from_city.country.flag }}" alt="{{ form.initial.from_city.country.name }}">
+              <img src="{{ MEDIA_URL }}{{ form.initial.from_city.country.flag }}"
+                   alt="{{ form.initial.from_city.country.name }}">
               <span>{{ form.initial.from_city.country.short_code }}</span>
             </div>
+          {% endif %}
         </div>
         <div class="poster__towns-list"></div>
         {% if not errors_off and form.errors and form.errors.from_address_point %}
@@ -137,7 +131,9 @@
         <label for="to" class="poster__label " required>
           {{ l_to }}
         </label>
-        <div class="poster__inp-box">
+        <div class="poster__inp-box
+                    {% if form.initial.to_city %} is-set{% endif %}
+        ">
           <input
               type="text"
               autocomplete="off"
@@ -146,8 +142,17 @@
               class="poster__locate locate"
               placeholder="{% translate "Укажите город" %}"
               required
-              {% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt }}"{% endif %}
+              {% if form.initial.to_city %}
+              value="{{ form.initial.to_city.name }} / {{ form.initial.to_city.country.name }}"
+              {% endif %}
           >
+          {% if form.initial.to_city %}
+            <div class="poster__inp-country">
+              <img src="{{ MEDIA_URL }}{{ form.initial.to_city.country.flag }}"
+                   alt="{{ form.initial.to_city.country.name }}">
+              <span>{{ form.initial.to_city.country.short_code }}</span>
+            </div>
+          {% endif %}
         </div>
         <div class="poster__towns-list"></div>
         {% if not errors_off and form.errors and form.errors.from_address_point %}
@@ -169,10 +174,8 @@
                 name="departure_DT"
                 readonly
                 required
-                {% if route.departure_DT %}
-                value="{{ route.from_city.get_current_datetime.strip }}"
-                {% elif form.initial.departure_DT %}
-                value="{{ form.initial.departure_DT }}"
+                {% if form.initial.departure_DT %}
+                value="{{ form.initial.departure_DT|date:"d.m.Y" }}"
                 {% endif %}
             />
             {% if not errors_off and form.errors and form.errors.departure_DT %}
@@ -190,10 +193,8 @@
                 id="arrival_DT"
                 name="arrival_DT"
                 readonly
-                {% if route.arrival_DT %}
-                value="{{ route.from_city.get_current_datetime }}"
-                {% elif form.initial.arrival_DT %}
-                value="{{ form.initial.arrival_DT }}"
+                {% if form.initial.arrival_DT %}
+                value="{{ form.initial.arrival_DT|date:"d.m.Y" }}"
                 {% endif %}
             />
             {% if not errors_off and form.errors and form.errors.arrival_DT %}
@@ -218,11 +219,10 @@
                   class="cargo__inp"
                   type="radio"
                   name="cargo_type"
-
                   id="cargo_type_{{ forloop.counter }}"
                   required
                   value="{{ item.0 }}"
-                  {% if forloop.first %}
+                  {% if form.initial.cargo_type == item.0 or forloop.first %}
                   checked
                   {% endif %}
               />
@@ -252,11 +252,9 @@
               id="arrival_DT"
               name="arrival_DT"
               placeholder="{% translate "Выберите дату" %}"
-{#              required#}
-              {% if route.arrival_DT %}
-              value="{{ route.from_city.get_current_datetime }}"
-              {% elif form.initial.arrival_DT %}
-              value="{{ form.initial.arrival_DT }}"
+              required
+              {% if form.initial.arrival_DT %}
+              value="{{ form.initial.arrival_DT|date:"d.m.Y" }}"
               {% endif %}
           />
           {% if not errors_off and form.errors and form.errors.arrival_DT %}
@@ -269,14 +267,44 @@
               id="departure_DT"
               name="departure_DT"
               hidden
-              {% if route.departure_DT %}
-              value="{{ route.from_city.get_current_datetime.strip }}"
-              {% elif form.initial.departure_DT %}
-              value="{{ form.initial.departure_DT }}"
+              {% if form.initial.departure_DT %}
+              value="{{ form.initial.departure_DT|date:"d.m.Y" }}"
               {% endif %}
           />
         </div>
       </div>
+      <div class="poster__row poster__row--transport">
+        <div class="poster__col col-12">
+
+          <label for="type_transport" class="poster__label col-12" required>
+            {{ l_transport }}
+          </label>
+          {% for item in form.fields.type_transport.choices %}
+            <div class="cargo cargo--inline">
+              <input
+                  class="cargo__inp"
+                  type="radio"
+                  name="type_transport"
+                  id="type_transport_{{ forloop.counter }}"
+                  value="{{ item.0 }}"
+                  {% if form.initial.type_transport == item.0 %}
+                  checked
+                  {% endif %}
+              >
+              <label class="cargo__label"
+                     for="type_transport_{{ forloop.counter }}">
+                <span>{{ item.1 }}</span>
+              </label>
+            </div>
+          {% endfor %}
+          {% if not errors_off and form.errors and form.errors.type_transport %}
+            <span>{{ form.errors.type_transport }}</span>
+          {% endif %}
+          <div class="poster__info">
+            {% translate "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" %}
+          </div>
+        </div>
+      </div>
     {% endif %}
     {#phone#}
     <div class="poster__row poster__row--phone">
@@ -291,7 +319,7 @@
                type="text"
                pattern="[0-9\-+]{5,}"
                maxlength="30"
-               {% if form.initial.phone %}value="{{ form.initial.phone}}"{% endif %}
+               {% if form.initial.phone %}value="{{ form.initial.phone }}"{% endif %}
                placeholder="{% translate "Укажите телефон" %}"
                title="{% translate "Только цифры или - или +" %}"
         >
@@ -313,10 +341,9 @@
         <textarea
             name="comment"
             id="comment"
-            value="{{ form.initial.comment }}"
             maxlength="{{ maxLetterLength }}"
             placeholder="{% translate "Если желаете, то здесь можно указать важную информацию, например: вес, габариты посылки, количество попутчиков и т.д.)" %}"
-        ></textarea>
+        >{{ form.initial.comment }}</textarea>
         <div class="poster__area-descr">
           <span class="js-letter-count">0</span>
           {% translate "из" %}

templates/tb_base2.html

@@ -90,14 +90,9 @@
   <script src='{% static "js/find_route.js" %}'></script>
   <script src="{% static "js/filters_functions_find_route.js" %}"></script>
   <script src="{% static "js/dynamic_loading_routes.js" %}"></script>
-{#  <script src="{% static "js/user_profile.js" %}"></script>#}
-{#  <script src="{% static "js/user_profile_2.js" %}"></script>#}
   <script src="{% static "js/ion.rangeSlider.min.js" %}"></script>
   <link rel="stylesheet" href="{% static "css/ion.rangeSlider.min.css" %}">
 
-
-  <script src="{% static "js/range_calendar.js" %}"></script>
-
   <link rel="icon" href="{% static 'favicon/favicon.svg' %}" sizes="any" type="image/svg+xml">
   <link rel="apple-touch-icon" sizes="57x57" href={% static 'favicon/apple-icon-57x57.png' %}>
   <link rel="apple-touch-icon" sizes="60x60" href={% static "favicon/apple-icon-60x60.png" %}>

templates/widgets/w_ac_input_address_point.html

@@ -2,7 +2,7 @@
 {#    {% if airport_fullname %}<div>{{ airport_fullname|safe }}</div>{% endif %}#}
 {#    <div class="autocomplete-location"><img src="{{ MEDIA_URL }}{{ country__flag }}" alt="{{ country__name }}" />{{ country__short_code }} {{ name }} / {{ country__name }}</div>#}
 
- <div class="poster__towns-item" data-attrs='[{{ id }}, "{{ name }}/{{ country__name }}", "{{ ctrl_name }}", "{{ timezone }}", "{{ MEDIA_URL }}{{ country__flag }}"]'>
+ <div class="poster__towns-item" data-attrs='[{{ id }}, "{{ name }}/{{ country__name }}", "{{ country__short_code }}", "{{ timezone }}", "{{ MEDIA_URL }}{{ country__flag }}"]'>
     <img src="{{ MEDIA_URL }}{{ country__flag }}" alt="{{ country__name }}" />
     <span>{{ country__short_code }}</span>
     {{ name }}/{{ country__name }}