View | Details | Raw Unified | Return to bug 31960
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt (-48 / +53 lines)
Lines 73-110 Link Here
73
73
74
    [% PROCESS "background_jobs/${job.type}.inc" %]
74
    [% PROCESS "background_jobs/${job.type}.inc" %]
75
75
76
    <fieldset class="rows" style="display:none;">
76
    <div id="job_details" style="display:none">
77
        <ol>
77
        <fieldset class="rows">
78
            <li><span class="label">Job ID: </span>[% job.id | html %]</li>
78
            <ol>
79
            <li>
79
                <li><span class="label">Job ID: </span>[% job.id | html %]</li>
80
                <label for="job_status">Status: </label>
80
                <li>
81
                <span id="job_status_description"></span>
81
                    <label for="job_status">Status: </label>
82
            </li>
82
                    <span id="job_status_description"></span>
83
            <li><label for="job_progress">Progress: </label>[% job.progress || 0 | html %] / [% job.size | html %]</li>
83
                </li>
84
            <li>
84
                <li><label for="job_progress">Progress: </label>[% job.progress || 0 | html %] / [% job.size | html %]</li>
85
                <label for="job_type">Type: </label>
85
                <li>
86
                <span id="job_type_description"></span>
86
                    <label for="job_type">Type: </label>
87
            </li>
87
                    <span id="job_type_description"></span>
88
            <li>
88
                </li>
89
                <label for="job_enqueued_on">Queued: </label>
89
                <li>
90
                [% job.enqueued_on | $KohaDates with_hours = 1 %]
90
                    <label for="job_enqueued_on">Queued: </label>
91
            </li>
91
                    [% job.enqueued_on | $KohaDates with_hours = 1 %]
92
            <li>
92
                </li>
93
                <label for="job_started_on">Started: </label>
93
                <li>
94
                [% job.started_on | $KohaDates with_hours = 1 %]
94
                    <label for="job_started_on">Started: </label>
95
            </li>
95
                    [% job.started_on | $KohaDates with_hours = 1 %]
96
            <li>
96
                </li>
97
                <label for="job_ended_on">Ended: </label>
97
                <li>
98
                [% job.ended_on | $KohaDates with_hours = 1 %]
98
                    <label for="job_ended_on">Ended: </label>
99
            </li>
99
                    [% job.ended_on | $KohaDates with_hours = 1 %]
100
            <li><label for="job_data">Report: </label>
100
                </li>
101
                [% IF job.status != 'new' %][% PROCESS 'report' %][% END %]
101
            </ol>
102
            </li>
102
        </fieldset>
103
            <li><label for="job_data">Detailed messages: </label>
103
        <div class="page-section">
104
                [% IF job.status != 'new' %][% PROCESS 'detail' %][% END %]
104
            <h2>Report</h2>
105
            </li>
105
            [% IF job.status != 'new' %][% PROCESS 'report' %][% END %]
106
        </ol>
106
        </div>
107
    </fieldset>
107
        <div class="page-section">
108
            <h3>Detailed messages: </h3>
109
            [% IF job.status != 'new' %][% PROCESS 'detail' %][% END %]
110
        </div>
111
    </div> <!-- /#job_details -->
108
112
109
    [% IF CAN_user_parameters_manage_background_jobs %]
113
    [% IF CAN_user_parameters_manage_background_jobs %]
110
        <fieldset class="action">
114
        <fieldset class="action">
Lines 127-146 Link Here
127
        <label for="include_last_hour">Only include jobs started in the last hour</label>
131
        <label for="include_last_hour">Only include jobs started in the last hour</label>
128
    </div>
132
    </div>
129
133
130
    <table id="table_jobs">
134
    <div class="page-section">
131
        <thead>
135
        <table id="table_jobs">
132
            <tr>
136
            <thead>
133
                <th>Job ID</th>
137
                <tr>
134
                <th data-filter="job_statuses">Status</th>
138
                    <th>Job ID</th>
135
                <th>Progress</th>
139
                    <th data-filter="job_statuses">Status</th>
136
                <th data-filter="job_types">Type</th>
140
                    <th>Progress</th>
137
                <th>Queued</th>
141
                    <th data-filter="job_types">Type</th>
138
                <th>Started</th>
142
                    <th>Queued</th>
139
                <th>Ended</th>
143
                    <th>Started</th>
140
                <th class="noExport">Actions</th>
144
                    <th>Ended</th>
141
            </tr>
145
                    <th class="noExport">Actions</th>
142
        </thead>
146
                </tr>
143
    </table>
147
            </thead>
148
        </table>
149
    </div>
144
[% END %]
150
[% END %]
145
151
146
            </main>
152
            </main>
Lines 237-243 Link Here
237
            [% IF op == 'view' %]
243
            [% IF op == 'view' %]
238
                $("#job_status_description").html( get_job_status("[% job.status | html %]") );
244
                $("#job_status_description").html( get_job_status("[% job.status | html %]") );
239
                $("#job_type_description").html( get_job_type("[% job.type | html %]") );
245
                $("#job_type_description").html( get_job_type("[% job.type | html %]") );
240
                $("fieldset.rows").show();
246
                $("#job_details").show();
241
            [% END %]
247
            [% END %]
242
248
243
            let additional_filters = {
249
            let additional_filters = {
244
- 

Return to bug 31960