diff options
| author | Andrea Lepori <alepori@student.ethz.ch> | 2022-12-29 11:29:07 +0100 |
|---|---|---|
| committer | Andrea Lepori <alepori@student.ethz.ch> | 2022-12-29 11:29:08 +0100 |
| commit | 41e5d5870df06dce58e08b644c22bbb8ada8dc84 (patch) | |
| tree | 2820d4a8ef3af441801cd838130c34756f5e9f42 /server/templates | |
| parent | new way to select groups that can be overridden (diff) | |
| parent | remove unarchive, enable archive unapproved docs (diff) | |
| download | scout-subs-41e5d5870df06dce58e08b644c22bbb8ada8dc84.tar.gz scout-subs-41e5d5870df06dce58e08b644c22bbb8ada8dc84.zip | |
Merge branch 'master' into dev
Diffstat (limited to '')
| -rw-r--r-- | server/templates/server/doc_list.html | 9 | ||||
| -rw-r--r-- | server/templates/server/doc_list_readonly.html | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html index 45ea6e0..06c8893 100644 --- a/server/templates/server/doc_list.html +++ b/server/templates/server/doc_list.html @@ -17,7 +17,7 @@ </a> </li> <li><a class="tooltipped modal-trigger" href="#modal2" data-position="top" data-tooltip="Archivia selezionati"><i class="material-icons">archive</i></a></li> - <li><a class="tooltipped" data-position="top" data-tooltip="Dearchivia selezionati" Onclick="send('unarchive')"><i class="material-icons">unarchive</i></a></li> + <!--<li><a class="tooltipped" data-position="top" data-tooltip="Dearchivia selezionati" Onclick="send('unarchive')"><i class="material-icons">unarchive</i></a></li>--> <li><a class="tooltipped modal-trigger" href="#modal3" data-position="top" data-tooltip="Scarica selezionati" Onclick="send('download')"><i class="material-icons">file_download</i></a></li> {% if settings.DEBUG %} <li><a class="tooltipped" data-position="top" data-tooltip="Approva selezionati" Onclick="send('approve')"><i class="material-icons left">check</i>DEBUG</a></li> @@ -38,6 +38,7 @@ <div class="modal-content"> <h4>Attenzione</h4> <p> + Una volta archiviato un documento non potrà più essere dearchiviato.<br> Se il documento contine dati medici quando archiviato tutti i dati medici verranno eliminati. </p> </div> @@ -619,7 +620,9 @@ $('#select-all').click(function(event) { if(this.checked) { // Iterate each checkbox $('.allselect').each(function() { - this.checked = true; + if (!this.hidden) { + this.checked = true; + } }); } else { $('.allselect').each(function() { @@ -667,9 +670,11 @@ function filterResults(group_name) { for (i = 0; i < items.length; i++) { var a = items[i].children[0]; + var checkBox = items[i].children[1].children[0].children[0]; var txtValue = a.value; if (txtValue == group_name) { items[i].style.display = action; + checkBox.hidden = (action == "none"); } } } diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html index ac1ae6d..c29fb74 100644 --- a/server/templates/server/doc_list_readonly.html +++ b/server/templates/server/doc_list_readonly.html @@ -600,7 +600,9 @@ $('#select-all').click(function(event) { if(this.checked) { // Iterate each checkbox $('.allselect').each(function() { - this.checked = true; + if (!this.hidden) { + this.checked = true; + } }); } else { $('.allselect').each(function() { @@ -648,9 +650,11 @@ function filterResults(group_name) { for (i = 0; i < items.length; i++) { var a = items[i].children[0]; + var checkBox = items[i].children[1].children[0].children[0]; var txtValue = a.value; if (txtValue == group_name) { items[i].style.display = action; + checkBox.hidden = (action == "none"); } } } |