Edit: display only dated field when event category is selected

2 files changed, 61 insertions, 17 deletions

diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html
index 9969ed5..8382f06 100644
--- a/chimere/templates/chimere/edit.html
+++ b/chimere/templates/chimere/edit.html
@@ -21,7 +21,7 @@
     {% if error_message %}<fieldset class='edit errorlist'>
         <legend>{% trans "Error" %}</legend>
         <p>{{ error_message }}</p>
-    {% endif %}</fieldset>
+    </fieldset>{% endif %}
     {% if is_modification and is_superuser %}<div class='warning'><p>{% trans "You are logged as an administrator. Your modifications will be taking into account immediately." %}</p></div>{% endif %}
     <fieldset class='edit'>
     <legend>{% if is_modification %}{% trans "Modify a point of interest" %}{% else %}{% trans "Add a point of interest" %}{% endif %}</legend>
@@ -56,13 +56,13 @@
             <p class="help">{{ form.description.help_text }}</p>
         </div>
         {% if dated %}
-        <div class="fieldWrapper">
+        <div class="fieldWrapper dated_field">
             <label for="id_start_date">{% trans "Start date" %}</label>
             {{ form.start_date.errors }}
             {{ form.start_date }}
             <p class="help">{{ form.start_date.help_text }}</p>
         </div>
-        <div class="fieldWrapper">
+        <div class="fieldWrapper dated_field">
             <label for="id_end_date">{% trans "End date" %}</label>
             {{ form.end_date.errors }}
             {{ form.end_date }}
@@ -97,7 +97,7 @@
             cat_filters['{{subcat.id}}'].push('#id_{{property.getNamedId}}');
             {% endfor %}
             {% endfor %}
-            $('#id_categories').change(function(){
+            function checkFilteredProperties(){
                 for (idx in cat_to_hide){
                     $(cat_to_hide[idx]).parent().hide();
                 }
@@ -108,7 +108,8 @@
                         $(cat_filters[val][ids]).parent().show();
                     }
                 }
-            });
+            }
+            $('#id_categories').change(checkFilteredProperties);
             $('#id_categories').change();
         </script>
         {% endif %}
@@ -140,22 +141,42 @@
         <p><img alt='Ajax loader' src='{{STATIC_URL}}chimere/img/ajax-loader.gif'/></p>
     </div>
     <script text='text/javascript'>
-            $( "#upload_in_progress" ).dialog({
-                 modal: true,
-                 resizable:false,
-                 height:110,
-                 autoOpen:false,
-                 dialogClass:'alert-box'
-                }
-            );
+        $( "#upload_in_progress" ).dialog({
+             modal: true,
+             resizable:false,
+             height:110,
+             autoOpen:false,
+             dialogClass:'alert-box'
+            }
+        );
         $(".ui-dialog-titlebar").hide();
         function displayProgress(){
             $("#upload_in_progress").dialog('open');
             return true;
         }
+        {% if dated %}
+        var dated_cats = new Array();
+        {% for cat in sub_categories %}{% for subcat in cat.1 %}{% if subcat.dated %}dated_cats.push('{{subcat.pk}}');{% endif %}{% endfor %}{% endfor %}
+        function checkDatedFields(){
+            {% if filtered_properties %}checkFilteredProperties();{% endif %}
+            var values = $('#id_categories').val();
+            displayed = false;
+            if (values){
+                for (idx=0;idx < values.length;idx++){
+                    if (dated_cats.indexOf(values[idx]) != -1 ) displayed = true;
+                }
+            }
+            if (displayed){
+                $('.dated_field').show();
+            } else {
+                $('.dated_field').hide();
+            }
+        }
+        $('#id_categories').change(checkDatedFields);
+        $('#id_categories').change();
+        {% endif %}
     </script>
     <p class='submit'><input type='submit' onclick='saveExtent();displayProgress();' value="{% if can_write%}{% trans 'Add/modify'%}{%else%}{% trans 'Propose'%}{%endif%}"/></p>
     </form>
     </fieldset>
-    </div>
 {% endblock %}
diff --git a/chimere/templates/chimere/edit_route.html b/chimere/templates/chimere/edit_route.html
index 15464c5..4dbb0d4 100644
--- a/chimere/templates/chimere/edit_route.html
+++ b/chimere/templates/chimere/edit_route.html
@@ -51,13 +51,13 @@
             {{ form.description }}
         </div>
         {% if dated %}
-        <div class="fieldWrapper">
+        <div class="fieldWrapper dated_field">
             <label for="id_start_date">{% trans "Start date" %}</label>
             {{ form.start_date.errors }}
             {{ form.start_date }}
             <p class="help">{{ form.start_date.help_text }}</p>
         </div>
-        <div class="fieldWrapper">
+        <div class="fieldWrapper dated_field">
             <label for="id_end_date">{% trans "End date" %}</label>
             {{ form.end_date.errors }}
             {{ form.end_date }}
@@ -77,7 +77,30 @@
         {% inline_formset "Multimedia files" formset_multi %}
         {% inline_formset "Picture files" formset_picture %}
 
-        <p><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p>
+    <script text='text/javascript'>
+        {% if dated %}
+        var dated_cats = new Array();
+        {% for cat in sub_categories %}{% for subcat in cat.1 %}{% if subcat.dated %}dated_cats.push('{{subcat.pk}}');{% endif %}{% endfor %}{% endfor %}
+        function checkDatedFields(){
+            var values = $('#id_categories').val();
+            displayed = false;
+            if (values){
+                for (idx=0;idx < values.length;idx++){
+                    if (dated_cats.indexOf(values[idx]) != -1 ) displayed = true;
+                }
+            }
+            if (displayed){
+                $('.dated_field').show();
+            } else {
+                $('.dated_field').hide();
+            }
+        }
+        $('#id_categories').change(checkDatedFields);
+        $('#id_categories').change();
+        {% endif %}
+    </script>
+
+    <p class='submit'><input type='submit' onclick='saveExtent();' value="{% trans 'Propose'%}"/></p>
     </div>
     </form>
     </fieldset>