Refactoring and many fixes on file module

3 files changed, 43 insertions, 165 deletions

diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
deleted file mode 100644
index 169b2757e..000000000
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_generalcontractor.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "ishtar/wizard/wizard_person_orga.html" %}
-{% load replace_underscore %}
-
-{% block corporation %}
-  <tr class='required'>
-    <th>{{ wizard.form.corporation_general_contractor.label_tag }}</th>
-    <td> {{ wizard.form.corporation_general_contractor.errors }}{{wizard.form.corporation_general_contractor|safe}}</td>
-  </tr>
-{% endblock %}
-
-{% block natural %}
-  <tr class='required'>
-    <th>{{ wizard.form.general_contractor.label_tag }}</th>
-    <td> {{ wizard.form.general_contractor.errors }}{{wizard.form.general_contractor|safe}}</td>
-  </tr>
-{% endblock %}
-{% block extra_head_po %}
-<script type='text/javascript'>
-$(function() {
-var corp_id = '#id_{{wizard.form.prefix}}-corporation_general_contractor';
-var pers_id = "#id_select_{{wizard.form.prefix}}-general_contractor" ;
-var pers_select_id = "#id_select_{{wizard.form.prefix}}-general_contractor" ;
-$(corp_id).change(
-  function(){
-    $(pers_select_id).autocomplete(
-        "option", "source",
-        source_{{wizard.form.prefix|replace_underscore}}_general_contractor
-            + $(corp_id).val() + '/');
-    $(pers_select_id).val("");
-    $(pers_id).val("");
-    if ($(corp_id).val()){
-        $(pers_select_id).prop("disabled", false);
-    } else {
-        $(pers_select_id).prop("disabled", true);
-    }
-});
-});
-</script>
-{% endblock %}
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
index 72dc1d35d..34db944aa 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
@@ -1,76 +1,48 @@
 {% extends "ishtar/wizard/default_wizard.html" %}
 {% load i18n range table_form %}
-{% block wizard_form %}
-<form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
-<div class='form'>
-{{ wizard.form.media }}
-{{ wizard.management_form }}
-<table>
+{% block form_detail %}
+  <div class="form-row">
+    {% with wizard.form.in_charge as field %}
+    {% include "blocks/bs_field_snippet.html" %}
+    {% endwith %}
+    {% with wizard.form.related_file as field %}
+    {% include "blocks/bs_field_snippet.html" %}
+    {% endwith %}
+    {% with wizard.form.comment as field %}
+    {% include "blocks/bs_field_snippet.html" %}
+    {% endwith %}
 
-<tr class='required'>
-  <th><label for="id_instruction-{{CURRENT_ACTION}}-in_charge">Dossier suivi par</label></th>
-</tr>
-<tr class='required'>
-  <td>{{wizard.form.in_charge.errors}}{{wizard.form.in_charge|safe}}</td>
-</tr>
-
-<tr>
-  <th><label for="id_instruction-{{CURRENT_ACTION}}-related_file">Dossier lié à</label></th>
-</tr>
-<tr>
-  <td>{{wizard.form.related_file|safe}}</td>
-</tr>
-
-<tr>
-  <th><label for="id_instruction-{{CURRENT_ACTION}}-comment">Commentaire</label></th>
-</tr>
-<tr>
-  <td>{{wizard.form.comment|safe}}</td>
-</tr>
-
-<tr class='required'>
-  <th><label>État du dossier</label></th>
-</tr>
-<tr>
-  <td><input type='radio' name='state' value='open' id='state-open'/> <label for='state-open'>Dossier actif</label></td>
-</tr>
-<tr>
-  <td>{{wizard.form.end_date.errors}}<input type='radio' name='state' value='closed' id='state-closed'/> <label for='state-closed'>Dossier clos / date de clôture</label> : {{wizard.form.end_date|safe}}</td>
-</tr>
-
-<tr class='required'>
-  <th><label for="id_instruction-{{CURRENT_ACTION}}-instruction_deadline">Date limite d'instruction</label></th>
-</tr>
-{% if saisine_type %}<tr>
-  <th><em>{{ saisine_type }}{% if saisine_type_delay %} : délai de {{saisine_type_delay}} jours{% endif %}</em></th>
-</tr>{% endif %}
-<tr class='required'>
-  <td>{{wizard.form.instruction_deadline.errors}}{{wizard.form.instruction_deadline|safe}}</td>
-</tr>
-
-<tr class='required'>
-  <th><label for="id_instruction-{{CURRENT_ACTION}}-year">{{wizard.form.numeric_reference.label}}</label></th>
-</tr>
-<tr>
-  <td>{{wizard.form.numeric_reference.errors}}SRA <span class='small'>{{wizard.form.year|safe}}</span> - <span class='small'>{{wizard.form.numeric_reference|safe}}</span></td>
-</tr>
-</table>
-
-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
-{{ previous_fields|safe }}
-  {% block "footer" %}
-  <div id="footer">
-    {% block "validation_bar" %}
-    {% include 'ishtar/wizard/validation_bar.html' %}
-    {% endblock %}
-    {% include 'ishtar/blocks/footer.html' %}
+    <div class="form-group col-lg-6">
+      <span class="required">
+        <label class="required">{% trans "State of the file:" %}</label>
+      </span>
+        <div class="form-group col-lg-12 mb-0">
+          <span><input type='radio' name='state' value='open' id='state-open'/>
+          <label for='state-open'>Dossier actif</label></span>
+        </div>
+        <div class="form-group col-lg-12">
+          <span>{{wizard.form.end_date.errors}}<input type='radio' name='state' value='closed' id='state-closed'/>
+            <label for='state-closed'>Dossier clos / date de clôture</label> : {{wizard.form.end_date|safe}}</span>
+        </div>
+    </div>
+    {% with wizard.form.instruction_deadline as field %}{% with saisine_type_message as extra_field_label %}
+    {% include "blocks/bs_field_snippet.html" %}
+    {% endwith %}{% endwith %}
+    <div class="form-group col-lg-6">
+      <span class="required">
+        <label>{{wizard.form.numeric_reference.label}}{% trans ":" %}</label>
+      </span>
+      <div class="form-inline">
+        {{wizard.form.numeric_reference.errors}}
+        {% if FILE_PREFIX %}<span class="pr-2">{{FILE_PREFIX}}</span>{% endif %}
+        <span class="pr-2">{{wizard.form.year|safe}}</span> -
+        <span class="pl-2">{{wizard.form.numeric_reference|safe}}</span>
+      </div>
+    </div>
   </div>
-  {% endblock %}
-</div>
-</form>
-<script type='text/javascript'>
-$(function(){
+{% endblock %}
 
+{% block "js_extra_ready" %}
     if ($('#id_instruction-{{CURRENT_ACTION}}-end_date').val()){
         $("#state-closed").prop('checked', true);
     } else {
@@ -96,18 +68,16 @@ $(function(){
         var state = $("input[name=state]:checked").val();
         if (state == 'closed'){
             if (!$('#id_instruction-{{CURRENT_ACTION}}-end_date').val()){
-                alert("Vous devez sélectionner une date de clôture.")
+                alert("{% trans 'You must select a closing date.' %}")
                 return false;
             }
             return true;
         } else if (state == 'open'){
             return true;
         } else {
-            alert("Vous devez choisir un état pour ce dossier.")
+            alert("{% trans 'You must select a state for this file.' %}")
             return false;
         }
         return true;
     });
-});
-</script>
-{% endblock %}
+    {% endblock %}
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
deleted file mode 100644
index 5eb7c014b..000000000
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends "ishtar/wizard/default_wizard.html" %}
-{% load i18n range table_form %}
-{% block wizard_form %}
-<form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
-<div class='form'>
-{% if wizard.form.media %}{{ wizard.form.media }}{% endif %}
-{{ wizard.management_form }}
-
-<table>
-  {% if wizard.form.non_field_errors %}<tr class='errors'>
-    <td colspan='3'>{{wizard.form.non_field_errors}}</td>
-  </tr>{%endif%}
-
-  <tr>
-    <th>{{ wizard.form.planning_service.label_tag }}</th>
-    <td> {{ wizard.form.planning_service.errors }}{{wizard.form.planning_service|safe}}</td>
-  </tr>
-  <tr>
-    <th>{{ wizard.form.responsible_town_planning_service.label_tag }}</th>
-    <td> {{ wizard.form.responsible_town_planning_service.errors }}{{wizard.form.responsible_town_planning_service|safe}}</td>
-  </tr>
-</table>
-
-
-<div>
-<table>
-  {% if permit_type %}
-  <tr>
-    <th colspan='3'>{{permit_type}}</th>
-  </tr>{% endif %}
-  <tr>
-    <th>{{ wizard.form.permit_reference.label_tag }}{% if permit_type_code %} [{{permit_type_code}}]{% endif %}</th>
-    <td> {{ wizard.form.permit_reference.errors }}{{wizard.form.permit_reference|safe}}</td>
-  </tr>
-</table>
-</div>
-
-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
-{{ previous_fields|safe }}
-  {% block "footer" %}
-  <div id="footer">
-    {% block "validation_bar" %}
-    {% include 'ishtar/wizard/validation_bar.html' %}
-    {% endblock %}
-    {% include 'ishtar/blocks/footer.html' %}
-  </div>
-  {% endblock %}
-</div>
-</form>
-{% endblock %}
-
-
-