← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/dataset-dataentry-page.twig

  • Committer: Dan Garner
  • Date: 2016-02-18 16:07:16 UTC
  • mfrom: (454.4.137)
  • Revision ID: git-v1:8867f12675bc9e0e67e7e622c80da7471b9f294a
Merge pull request #139 from dasgarner/feature/nested-display-groups

Feature/nested display groups

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/dataset-dataentry-page.twig
11
11
 
12
12
{% block actionMenu %}
13
13
    <ul class="nav nav-pills pull-right">
14
 
        <li class="btn btn-success btn-xs"><a class="XiboFormButton btns" title="{% trans "Add a row to the end of this DataSet" %}" href="{{ urlFor("dataSet.data.add.form", {"id": dataSet.dataSetId}) }}"><i class="fa fa-plus-circle" aria-hidden="true"></i> {% trans "Add Row" %}</a></li>
15
 
        <li class="btn btn-info btn-xs"><a class="btns" href="{{ urlFor("dataSet.column.view", {"id": dataSet.dataSetId}) }}"><i class="fa fa-columns" aria-hidden="true"></i> {% trans "View Columns" %}</a></li>
 
14
        <li><a class="XiboFormButton" title="{% trans "Add a row to the end of this DataSet" %}" href="{{ urlFor("dataSet.data.add.form", {"id": dataSet.dataSetId}) }}">{% trans "Add Row" %}</a></li>
 
15
        <li><a href="{{ urlFor("dataSet.column.view", {"id": dataSet.dataSetId}) }}">{% trans "View Columns" %}</a></li>
16
16
    </ul>
17
17
{% endblock %}
18
18
 
27
27
                <div class="XiboFilter">
28
28
                    <div class="FilterDiv" id="Filter">
29
29
                        <form class="form-inline">
30
 
                            {% for col in dataSet.getColumn() %}
31
 
                                {% if col.dataSetColumnTypeId == 1 and (col.dataTypeId == 1 or col.dataTypeId == 2) %}
32
 
                                    {{ inline.input(col.heading, col.heading) }}
33
 
                                {% endif %}
34
 
                            {% endfor %}
 
30
                            {{ inline.checkbox("XiboFilterPinned", "Keep Open", defaults.filterPinned) }}
35
31
                        </form>
36
32
                    </div>
37
33
                </div>
38
34
                <div class="XiboData">
39
 
                    <table id="datasets" class="table table-striped" data-image-url="{{ urlFor("library.download") }}?preview=1&width=150&height=150">
 
35
                    <table id="datasets" class="table table-striped">
40
36
                        <thead>
41
37
                        <tr>
42
38
                            <th>{% trans "ID" %}</th>
58
54
 
59
55
{% block javaScript %}
60
56
    <script type="text/javascript">
61
 
 
62
 
        var imageUrl = $("#datasets").data("imageUrl");
63
57
        var cols = [];
64
58
        cols.push({ "name": "id", "data": "id" });
65
59
        {% for col in dataSet.getColumn() %}
66
60
            {% if col.dataTypeId == 3 %}
67
61
                cols.push({ "data": "{{ col.heading }}", "render": dataTableDateFromIso });
68
 
            {% elseif col.dataTypeId == 5 %}
69
 
                cols.push({ "data": "{{ col.heading }}", "render": function(data, type, row) {
70
 
                        if (type != "display")
71
 
                            return data;
72
 
 
73
 
                        if (data == null)
74
 
                            return "";
75
 
 
76
 
                        return '<img src="' + imageUrl.replace(":id", data) + '"/>';
77
 
                    }
78
 
                });
79
62
            {% else %}
80
63
                cols.push({ "data": "{{ col.heading }}" });
81
64
            {% endif %}
94
77
        });
95
78
 
96
79
        var table = $("#datasets").DataTable({ "language": dataTablesLanguage,
97
 
            serverSide: true, stateSave: true, stateDuration: 0,
 
80
            serverSide: true, stateSave: true,
98
81
            filter: false,
99
82
            searchDelay: 3000,
100
83
            "order": [[ 0, "asc"]],
110
93
        table.on('draw', dataTableDraw);
111
94
        table.on('processing.dt', dataTableProcessing);
112
95
 
113
 
        var dataSetEditFormOpen = $.debounce(500, true, function() {
 
96
        $("#datasets tbody").on('click', 'tr', function() {
114
97
            var data = table.row($(this)).data();
115
 
 
116
98
            // Load the edit form.
117
99
            var editUrl = "{{ urlFor("dataSet.data.edit.form", {"id": dataSet.dataSetId}) }}".replace(":rowId", data.id);
118
100
            XiboFormRender(editUrl);
119
101
        });
120
 
        
121
 
        $("#datasets tbody").on('click', 'tr', dataSetEditFormOpen);
122
102
 
123
103
        function dataSetDataEntryOpen(dialog) {
124
104
            $(dialog).find("select").selectpicker();