{% 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/jquery.cookie.js' %}"></script>
+ <script src="{% static 'qcg/cookie/jquery.cookie.min.js' %}"></script>
<script>
$(function() {
{% endblock %}
{% block container %}
- <form id="simple-form" action="." role="search" class="pull-right">
- {% 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:'' }}"
- maxlength="500" class="form-control" placeholder="Wyszukaj frazę">
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit" title="Szukaj">
- <span class="glyphicon glyphicon-search"></span>
- </button>
- </span>
+ <form action="." class="pull-right">
+ {% get_params_as_hidden 'host' 'purged' 'submission' 'finish' %}
+ <div class="btn-toolbar" role="toolbar">
+ <div class="btn-group" role="group">
+ <div class="input-group">
+ <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">
+ <span class="glyphicon glyphicon-search"></span>
+ </button>
+ </span>
+ </div>
+ </div>
+ <div class="btn-group" data-toggle="buttons">
+ <label class="btn btn-default{% if checked_status.0 %} active{% endif %}" title="Aktywne">
+ <input name="status" value="0" type="checkbox" {% if checked_status.0 %}checked{% endif %} onchange="this.form.submit()">
+ <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
+ </label>
+ <label class="btn btn-default{% if checked_status.1 %} active{% endif %}" title="Zakończone">
+ <input name="status" value="1" type="checkbox" {% if checked_status.1 %}checked{% endif %} onchange="this.form.submit()">
+ <span class="glyphicon glyphicon-saved" aria-hidden="true"></span>
+ </label>
+ <label class="btn btn-default{% if checked_status.2 %} active{% endif %}" title="Niepowodzenia">
+ <input name="status" value="2" type="checkbox" {% if checked_status.2 %}checked{% endif %} onchange="this.form.submit()">
+ <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
+ </label>
+ </div>
+ <div class="btn-group" role="group">
+ <a href="#advanced" data-toggle="modal" class="btn btn-default" title="Filtry zaawansowane">
+ <span class="glyphicon glyphicon-option-horizontal"></span>
+ </a>
+ </div>
+ <div class="btn-group" role="group">
+ <a href="#columns" data-toggle="modal" class="btn btn-default" title="Kolumny">
+ <span class="glyphicon glyphicon-list"></span>
+ </a>
</div>
</div>
- <div class="btn-group" data-toggle="buttons">
- <label class="btn btn-default{% if checked_status.0 %} active{% endif %}" title="Aktywne">
- <input name="status" value="0" type="checkbox" {% if checked_status.0 %}checked{% endif %} onchange="this.form.submit()">
- <span class="glyphicon glyphicon-hourglass" aria-hidden="true"></span>
- </label>
- <label class="btn btn-default{% if checked_status.1 %} active{% endif %}" title="Zakończone">
- <input name="status" value="1" type="checkbox" {% if checked_status.1 %}checked{% endif %} onchange="this.form.submit()">
- <span class="glyphicon glyphicon-saved" aria-hidden="true"></span>
- </label>
- <label class="btn btn-default{% if checked_status.2 %} active{% endif %}" title="Niepowodzenia">
- <input name="status" value="2" type="checkbox" {% if checked_status.2 %}checked{% endif %} onchange="this.form.submit()">
- <span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
- </label>
- </div>
- <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">
<a href="." class="pull-right"><span class="text-muted small">Wyczyść wszystkie filtry</span></a>
<strong>Wybrane filtry:</strong>
{% for label, param, val in selected_filters %}
- <span class="label label-primary">{{ label }} <a href="{% query_string param-=val %}" style="color: white"><span class="glyphicon glyphicon-remove"></span></a></span>
+ <span class="label label-primary">{{ label }} <a href=".{% query_string param-=val %}" style="color: white"><span class="glyphicon glyphicon-remove"></span></a></span>
{% endfor %}
</div>
</div>
<table class="table table-hover tree">
<thead>
<tr>
- <th style="width: 80px"></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 %}
<span class="glyphicon glyphicon-file" aria-hidden="true"></span>
{% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
</a>
+ {% if not task.purged %}
+ <small class="text-muted" title="Istnieje katalog roboczy">
+ <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+ </small>
+ {% endif %}
</td>
{% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
- {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince }} temu</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 %}
<span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
{% if columns.JOB_ID in displayed %}{{ job.grouper }}{% endif %}
</a>
+ {% if not job.grouper.purged %}
+ <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+ {% endif %}
</td>
{% if columns.DESCRIPTION in displayed %}<td>{{ job.grouper.note }}</td>{% endif %}
- {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|timesince }} temu</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 %}
<span class="glyphicon glyphicon-file" aria-hidden="true"></span>
{% if columns.JOB_ID in displayed %}{{ task }}{% endif %}
</a>
+ {% if not task.purged %}
+ <span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+ {% endif %}
</td>
{% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
- {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince }} temu</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 %}
</nav>
<!-- Modal -->
- <div class="modal fade" id="advanced" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+ <div class="modal fade" id="advanced" tabindex="-1" role="dialog" aria-labelledby="filters-modal-label" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="modal-label">Filtry zaawansowane</h4>
+ <h4 class="modal-title" id="filters-modal-label">Filtry zaawansowane</h4>
</div>
<div class="modal-body">
<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 %}">
</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 %}">
</div>
</div>
</div>
+
+ <div class="form-group">
+ <label class="col-sm-3 col-md-4 control-label">Istniejący katalog roboczy?</label>
+ <div class="col-sm-9 col-md-6">
+ <div class="btn-group" data-toggle="buttons">
+ {% for choice in filters.purged %}
+ <label class="btn btn-default{% if choice.is_checked %} active{% endif %}">
+ <input type="radio" name="{{ choice.name }}" value="{{ choice.choice_value }}"
+ {% if choice.is_checked %}checked{% endif %}> {{ choice.choice_label }}
+ </label>
+ {% endfor %}
+ </div>
+ </div>
+ </div>
+
{% bootstrap_field filters.submission layout='horizontal' bound_css_class=' ' %}
{% bootstrap_field filters.finish layout='horizontal' bound_css_class=' ' %}
</form>
</div>
{# Column selection modal #}
- <div class="modal fade" id="columns" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+ <div class="modal fade" id="columns" tabindex="-1" role="dialog" aria-labelledby="columns-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">×</span></button>
- <h4 class="modal-title" id="modal-label">Wybór kolumn</h4>
+ <h4 class="modal-title" id="columns-modal-label">Wybór kolumn</h4>
</div>
<div class="modal-body">
<form id="columns-form" action=".">
projects / qcg-portal.git / blobdiff