X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=34e9ce5ae13cf01fc4a8e73960fd4f04310c6a85;hb=ddd692a2e77eadd9c7956d8094f36c5381b9b140;hp=f2b9efe3228df35d5315d99aca65f29d39d084aa;hpb=cb292970db9b3ea3054212858abb5eebe73f0fd9;p=qcg-portal.git

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index f2b9efe..34e9ce5 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -4,22 +4,13 @@
 {% block extra_css %}
     <link href="{% static 'qcg/treegrid/css/jquery.treegrid.css' %}" rel="stylesheet">
     <link href="{% static 'qcg/daterangepicker/daterangepicker-bs3.css' %}" rel="stylesheet" />
-
-    <style>
-        .treegrid-expander {
-            opacity: 0.5;
-        }
-
-        .treegrid-expander:hover {
-            opacity: 1;
-        }
-    </style>
 {% endblock %}
 
 {% block extra_js %}
     <script src="{% static 'qcg/treegrid/js/jquery.treegrid.js' %}"></script>
-    <script src="{% static 'qcg/daterangepicker/moment.min.js' %}"></script>
+    <script src="{% static 'qcg/moment/moment.min.js' %}"></script>
     <script src="{% static 'qcg/daterangepicker/daterangepicker.js' %}"></script>
+    <script src="{% static 'qcg/cookie/jquery.cookie.min.js' %}"></script>
 
     <script>
         $(function() {
@@ -54,6 +45,22 @@
                     firstDay: 1
                 }
             });
+
+            $('#select-all-columns').click(function() {
+                $('#id_columns').find('.checkbox input').prop('checked', true);
+            });
+
+            $('#default-columns').click(function() {
+                $('#select-all-columns').click();
+                $('#id_columns_0').prop('checked', false);
+            });
+
+            $('#columns-form').submit(function(e) {
+                e.preventDefault();
+                $.cookie.raw = true;
+                $.cookie('columns', $(this).serialize(), {path: location.pathname});
+                location.reload();
+            });
         });
     </script>
 {% endblock %}
@@ -63,7 +70,7 @@
         {% get_params_as_hidden 'host' 'submission' 'finish' %}
         <div style="display: inline-block; vertical-align: middle;">
             <div class="input-group">
-                <input type="text" name="keywords" value="{{ filters.keywords.value|default:'' }}"
+                <input type="search" name="keywords" value="{{ filters.keywords.value|default:'' }}"
                        maxlength="500" class="form-control" placeholder="Wyszukaj frazę">
                 <span class="input-group-btn">
                     <button class="btn btn-default" type="submit" title="Szukaj">
@@ -89,6 +96,9 @@
         <a href="#advanced" data-toggle="modal" class="btn btn-default" title="Filtry zaawansowane" style="margin-left: 4px">
             <span class="glyphicon glyphicon-option-horizontal"></span>
         </a>
+        <a href="#columns" data-toggle="modal" class="btn btn-default" title="Kolumny" style="margin-left: 4px">
+            <span class="glyphicon glyphicon-list"></span>
+        </a>
     </form>
 
     <h1 class="page-header">
@@ -141,13 +151,13 @@
     <table class="table table-hover tree">
         <thead>
             <tr>
-                <th style="width: 80px"></th>
-                <th>Opis</th>
-                <th>Wysłane</th>
-                <th>Start</th>
-                <th>Koniec</th>
-                <th>Status</th>
-                <th>Host</th>
+                <th{% if columns.JOB_ID not in displayed %} style="width: 80px"{% endif %}></th>
+                {% if columns.DESCRIPTION in displayed %}<th>Opis</th>{% endif %}
+                {% if columns.SUBMISSION in displayed %}<th>Wysłane</th>{% endif %}
+                {% if columns.START in displayed %}<th>Start</th>{% endif %}
+                {% if columns.END in displayed %}<th>Koniec</th>{% endif %}
+                {% if columns.STATUS in displayed %}<th>Status</th>{% endif %}
+                {% if columns.HOST in displayed %}<th>Host</th>{% endif %}
                 <th></th>
 {#                <th>Uwagi</th>#}
             </tr>
@@ -162,15 +172,15 @@
                             <td>
                                 <a href="{{ task.get_absolute_url }}">
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-{#                                    {{ task }}#}
+                                    {% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
                                 </a>
                             </td>
-                            <td>{{ task.note }}</td>
-                            <td>{{ task.submission_time|timesince }} temu</td>
-                            <td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>
-                            <td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>
-                            <td>{{ task.get_status_display }}</td>
-                            <td>{{ task.short_host_names|join:', ' }}</td>
+                            {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}
+                            {% if columns.HOST in displayed %}<td>{{ task.short_host_names|join:', ' }}</td>{% endif %}
                             <td><a href="{{ task.get_absolute_url }}">szczegóły&nbsp;&rsaquo;</a></td>
                         </tr>
                     {% endwith %}
@@ -179,15 +189,15 @@
                         <td>
                             <a href="{{ job.grouper.get_absolute_url }}">
                                 <span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
-{#                                {{ job.grouper }}#}
+                                {% if columns.JOB_ID in displayed %}{{ job.grouper }}{% endif %}
                             </a>
                         </td>
-                        <td>{{ job.grouper.note }}</td>
-                        <td>{{ job.grouper.submission_time|timesince  }} temu</td>
-                        <td>-</td>
-                        <td>{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>
-                        <td>{{ job.grouper.get_status_display }}</td>
-                        <td>-</td>
+                        {% if columns.DESCRIPTION in displayed %}<td>{{ job.grouper.note }}</td>{% endif %}
+                        {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                        {% if columns.START in displayed %}<td>-</td>{% endif %}
+                        {% if columns.END in displayed %}<td>{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                        {% if columns.STATUS in displayed %}<td>{{ job.grouper.get_status_display }}</td>{% endif %}
+                        {% if columns.HOST in displayed %}<td>-</td>{% endif %}
                         <td><a href="{{ job.grouper.get_absolute_url }}">szczegóły&nbsp;&rsaquo;</a></td>
                     </tr>
 
@@ -196,15 +206,15 @@
                             <td>
                                 <a href="{{ task.get_absolute_url }}">
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-{#                                    {{ task }}#}
+                                    {% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
                                 </a>
                             </td>
-                            <td>{{ task.note }}</td>
-                            <td>{{ task.submission_time|timesince  }} temu</td>
-                            <td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>
-                            <td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>
-                            <td>{{ task.get_status_display }}</td>
-                            <td>{{ task.short_host_names|join:', ' }}</td>
+                            {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
+                            {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}
+                            {% if columns.HOST in displayed %}<td>{{ task.short_host_names|join:', ' }}</td>{% endif %}
                             <td><a href="{{ task.get_absolute_url }}">szczegóły&nbsp;&rsaquo;</a></td>
                         </tr>
                     {% endfor %}
@@ -269,8 +279,8 @@
                     <form id="advanced-form" action="." class="form-horizontal">
                         {% bootstrap_field filters.keywords layout='horizontal' bound_css_class=' ' %}
                         <div class="form-group">
-                            <label class="col-md-4 control-label">Status</label>
-                            <div class="col-md-8">
+                            <label class="col-sm-3 col-md-4 control-label">Status</label>
+                            <div class="col-sm-9 col-md-6">
                                 <div class="btn-group" data-toggle="buttons">
                                     {% for choice in filters.status %}
                                         <label class="btn btn-default{% if choice.is_checked %} active{% endif %}">
@@ -283,8 +293,8 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-md-4 control-label">Host</label>
-                            <div class="col-md-8">
+                            <label class="col-sm-3 col-md-4 control-label">Host</label>
+                            <div class="col-sm-9 col-md-6">
                                 <div class="btn-group" data-toggle="buttons">
                                     {% for choice in filters.host %}
                                         <label class="btn btn-default{% if choice.is_checked %} active{% endif %}">
@@ -308,4 +318,27 @@
         </div>
     </div>
 
+    {# Column selection modal #}
+    <div class="modal fade" id="columns" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="modal-label">Wybór kolumn</h4>
+                </div>
+                <div class="modal-body">
+                    <form id="columns-form" action=".">
+                        {% bootstrap_field columns.columns %}
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Anuluj</button>
+                    <a id="select-all-columns" class="btn btn-success">Wybierz wszystkie</a>
+                    <a id="default-columns" class="btn btn-warning">Domyślne</a>
+                    <button type="submit" class="btn btn-primary" form="columns-form">Zapisz</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
 {% endblock container %}