aboutsummaryrefslogtreecommitdiffstats
path: root/server/templates
diff options
context:
space:
mode:
authorAndrea Lepori <alepori@student.ethz.ch>2022-05-30 19:52:11 +0200
committerAndrea Lepori <alepori@student.ethz.ch>2022-05-30 19:52:11 +0200
commitf0907397641fbfc9d4db2fdf6808c19957113d4e (patch)
tree781fd7d6118fb100c7f2473ed582e162802f9e8d /server/templates
parentdoclist group filter work as expected (diff)
downloadscout-subs-f0907397641fbfc9d4db2fdf6808c19957113d4e.tar.gz
scout-subs-f0907397641fbfc9d4db2fdf6808c19957113d4e.zip
doclist filters show all always
Diffstat (limited to 'server/templates')
-rw-r--r--server/templates/server/doc_list.html66
-rw-r--r--server/templates/server/doc_list_readonly.html66
2 files changed, 58 insertions, 74 deletions
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html
index 5b898ec..064aeb8 100644
--- a/server/templates/server/doc_list.html
+++ b/server/templates/server/doc_list.html
@@ -63,7 +63,7 @@
<form id="selection" action="{% url 'doclist' %}" method="post">
{% csrf_token %}
-<div id="modal1" class="modal">
+<div id="modal1" class="modal modal-fixed-footer">
<div class="modal-content">
<h5>Filtri</h5>
<div class="row">
@@ -93,43 +93,35 @@
</div>
</div>
<br>
+ <br>
+ <div class = "row">
+ <div class="input-field col l6 s12">
+ <label for="newer">Pi&ugrave; recenti di</label>
+ <input value="{{newer}}" name="newer" id="newer" type="text" class="datepicker">
+ </div>
+ <div class="input-field col l6 s12">
+ <label for="older">Pi&ugrave; vecchi di</label>
+ <input value="{{older}}" name="older" id="older" type="text" class="datepicker">
+ </div>
+ </div>
+ <div class = "row">
+ <div class="col s12">
+ <div id="chips_type" class="chips chips-placeholder chips-autocomplete"></div>
+ </div>
+ <div class="col s12">
+ <div id="chips_owner" class="chips chips-placeholder chips-autocomplete "></div>
+ </div>
+ <div class="col s12">
+ <div id="chips_groups" class="chips chips-placeholder chips-autocomplete "></div>
+ </div>
+ </div>
<div class="row">
- <ul class="collapsible"><li>
- <div class="collapsible-header">Avanzati</div>
- <div class="collapsible-body"><span>
- <div class="row">
- <div class="input-field col s12">
- <label>
- <input name="filter_signdoc" type="checkbox" class="filled-in" {{signdoc_check}}/>
- <span style="color:black"><i class="material-icons left">check_circle</i>Visualizza solo approvati con firma allegata</span>
- </label>
- </div>
- </div>
- <br>
- <br>
- <div class = "row">
- <div class="input-field col l6 s12">
- <label for="newer">Pi&ugrave; recenti di</label>
- <input value="{{newer}}" name="newer" id="newer" type="text" class="datepicker">
- </div>
- <div class="input-field col l6 s12">
- <label for="older">Pi&ugrave; vecchi di</label>
- <input value="{{older}}" name="older" id="older" type="text" class="datepicker">
- </div>
- </div>
- <div class = "row">
- <div class="col s12">
- <div id="chips_type" class="chips chips-placeholder chips-autocomplete"></div>
- </div>
- <div class="col s12">
- <div id="chips_owner" class="chips chips-placeholder chips-autocomplete "></div>
- </div>
- <div class="col s12">
- <div id="chips_groups" class="chips chips-placeholder chips-autocomplete "></div>
- </div>
- </div>
- </span></div>
- </li></ul>
+ <div class="input-field col s12">
+ <label>
+ <input name="filter_signdoc" type="checkbox" class="filled-in" {{signdoc_check}}/>
+ <span style="color:black"><i class="material-icons left">check_circle</i>Visualizza solo approvati con firma allegata</span>
+ </label>
+ </div>
</div>
</div>
<div class="modal-footer">
diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html
index 6458ecd..bd2c3bf 100644
--- a/server/templates/server/doc_list_readonly.html
+++ b/server/templates/server/doc_list_readonly.html
@@ -44,7 +44,7 @@
<form id="selection" action="{% url 'doclistro' %}" method="post">
{% csrf_token %}
-<div id="modal1" class="modal">
+<div id="modal1" class="modal modal-fixed-footer">
<div class="modal-content">
<h5>Filtri</h5>
<div class="row">
@@ -74,43 +74,35 @@
</div>
</div>
<br>
+ <br>
+ <div class = "row">
+ <div class="input-field col l6 s12">
+ <label for="newer">Pi&ugrave; recenti di</label>
+ <input value="{{newer}}" name="newer" id="newer" type="text" class="datepicker">
+ </div>
+ <div class="input-field col l6 s12">
+ <label for="older">Pi&ugrave; vecchi di</label>
+ <input value="{{older}}" name="older" id="older" type="text" class="datepicker">
+ </div>
+ </div>
+ <div class = "row">
+ <div class="col s12">
+ <div id="chips_type" class="chips chips-placeholder chips-autocomplete"></div>
+ </div>
+ <div class="col s12">
+ <div id="chips_owner" class="chips chips-placeholder chips-autocomplete "></div>
+ </div>
+ <div class="col s12">
+ <div id="chips_groups" class="chips chips-placeholder chips-autocomplete "></div>
+ </div>
+ </div>
<div class="row">
- <ul class="collapsible"><li>
- <div class="collapsible-header">Avanzati</div>
- <div class="collapsible-body"><span>
- <div class="row">
- <div class="input-field col s12">
- <label>
- <input name="filter_signdoc" type="checkbox" class="filled-in" {{signdoc_check}}/>
- <span style="color:black"><i class="material-icons left">check_circle</i>Visualizza solo approvati con firma allegata</span>
- </label>
- </div>
- </div>
- <br>
- <br>
- <div class = "row">
- <div class="input-field col l6 s12">
- <label for="newer">Pi&ugrave; recenti di</label>
- <input value="{{newer}}" name="newer" id="newer" type="text" class="datepicker">
- </div>
- <div class="input-field col l6 s12">
- <label for="older">Pi&ugrave; vecchi di</label>
- <input value="{{older}}" name="older" id="older" type="text" class="datepicker">
- </div>
- </div>
- <div class = "row">
- <div class="col s12">
- <div id="chips_type" class="chips chips-placeholder chips-autocomplete"></div>
- </div>
- <div class="col s12">
- <div id="chips_owner" class="chips chips-placeholder chips-autocomplete "></div>
- </div>
- <div class="col s12">
- <div id="chips_groups" class="chips chips-placeholder chips-autocomplete "></div>
- </div>
- </div>
- </span></div>
- </li></ul>
+ <div class="input-field col s12">
+ <label>
+ <input name="filter_signdoc" type="checkbox" class="filled-in" {{signdoc_check}}/>
+ <span style="color:black"><i class="material-icons left">check_circle</i>Visualizza solo approvati con firma allegata</span>
+ </label>
+ </div>
</div>
</div>
<div class="modal-footer">