Attachment #123672 for bug #28149

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




[% USE raw %]
[% USE Asset %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
[% BLOCK show_job_status %]
    [% SWITCH job.status %]
        [% CASE "cancelled" %]
            Cancelled
        [% CASE "finished" %]
            Finished
        [% CASE "started" %]
            Started
        [% CASE "running" %]
            Running
        [% CASE # Default case %]
            [% job.status | html %]
    [% END -%]
[% END %]
[% BLOCK show_job_type %]
    [% SWITCH job.type %]
        [% CASE "batch_biblio_record_modification" %]
            Batch bibliographic record modification
        [% CASE "batch_authority_record_modification" %]
            Batch authority record modification
        [% CASE # Default case %]
            [% job.type | html %]
    [% END %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>
    [% IF op == 'view' %]
        Details of job #[% job.id | html %] &rsaquo;
    [% END %]
    Background jobs &rsaquo;
    Administration &rsaquo; Koha
    [% END %] &rsaquo; Background jobs &rsaquo; [% END %]
Administration &rsaquo; Koha
</title>

[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="admin_background_jobs" class="admin">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]

<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
    <ol>

        <li>
            <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
        </li>
        [% IF op == 'view' %]
            <li>
                <a href="/cgi-bin/koha/admin/background_jobs.pl">Background jobs</a>
            </li>
            <li>
                <a href="#" aria-current="page">Details of job #[% job.id | html %]</a>
            </li>
        [% ELSE %]
            <li>
                <a href="#" aria-current="page">Background jobs</a>
            </li>
        [% END %]
    [% ELSE %]
        <li>
            <a href="#" aria-current="page">Administration</a>

[% END %]

[% IF op == 'view' %]
    <h1>Details of job #[% job.id | html %]</h1>

    <fieldset class="rows">
        <ol>
            <li><span class="label">Job ID: </span>[% job.id | html %]</li>
            <li>
                <label for="job_status">Status: </label>
                [% PROCESS show_job_status %]
            </li>
            <li><label for="job_progress">Progress: </label>[% job.progress || 0 | html %] / [% job.size | html %]</li>
            <li>
                <label for="job_type">Type: </label>
                [% PROCESS show_job_type %]
            </li>
            <li>
                <label for="job_enqueued_on">Queued: </label>
                [% job.enqueued_on | $KohaDates with_hours = 1 %]
            </li>
            <li>
                <label for="job_started_on">Started: </label>
                [% job.started_on | $KohaDates with_hours = 1 %]
            </li>
            <li>
                <label for="job_ended_on">Ended: </label>
                [% job.ended_on | $KohaDates with_hours = 1 %]
            </li>
            <li><label for="job_data">Report: </label>
                [% SWITCH job.type %]
                [% CASE 'batch_biblio_record_modification' %]

    </fieldset>

    [% IF CAN_user_parameters_manage_background_jobs %]
        <fieldset class="action">
            <a href="/cgi-bin/koha/admin/background_jobs.pl">Return to the job list</a>
        </fieldset>
    [% END %]
[% END %]


                [% FOREACH job IN jobs %]
                <tr>
                    <td>[% job.id | html %]</td>
                    <td>
                        [% PROCESS show_job_status %]
                    </td>
                    <td>[% job.progress || 0 | html %] / [% job.size | html %]</td>
                    <td>
                        [% SWITCH job.type %]

                        [% CASE %][% job.type | html %]
                        [% END %]
                    </td>
                    <td>[% job.enqueued_on | $KohaDates with_hours = 1 %]</td>
                    <td>[% job.started_on| $KohaDates with_hours = 1 %]</td>
                    <td>[% job.ended_on| $KohaDates with_hours = 1 %]</td>
                    <td class="actions">
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&amp;id=[% job.id | html %]"><i class="fa fa-eye"></i> View</a>
                        [% IF job.status == 'new' || job.status == 'started' %]
- 

Return to bug 28149

Lines 1-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt (-22 / +74 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
		3	[% USE KohaDates %]
3	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
		5	[% BLOCK show_job_status %]
		6	[% SWITCH job.status %]
		7	[% CASE "cancelled" %]
		8	Cancelled
		9	[% CASE "finished" %]
		10	Finished
		11	[% CASE "started" %]
		12	Started
		13	[% CASE "running" %]
		14	Running
		15	[% CASE # Default case %]
		16	[% job.status \| html %]
		17	[% END -%]
		18	[% END %]
		19	[% BLOCK show_job_type %]
		20	[% SWITCH job.type %]
		21	[% CASE "batch_biblio_record_modification" %]
		22	Batch bibliographic record modification
		23	[% CASE "batch_authority_record_modification" %]
		24	Batch authority record modification
		25	[% CASE # Default case %]
		26	[% job.type \| html %]
		27	[% END %]
		28	[% END %]
4	[% INCLUDE 'doc-head-open.inc' %]	29	[% INCLUDE 'doc-head-open.inc' %]
5	<title>	30	<title>
6	[% IF op =='add_form' %]	31	[% IF op == 'view' %]
7	[% IF job %]	32	Details of job #[% job.id \| html %] &rsaquo;
8	View background job	33	[% END %]
9	[% ELSE %]	34	Background jobs &rsaquo;
10	Background jobs	35	Administration &rsaquo; Koha
11	[% END %] &rsaquo; Background jobs &rsaquo; [% END %]
12	Administration &rsaquo; Koha
13	</title>	36	</title>
		37
14	[% INCLUDE 'doc-head-close.inc' %]	38	[% INCLUDE 'doc-head-close.inc' %]
15	</head>	39	</head>
16		40
17	<body id="admin_background_jobs" class="admin">	41	<body id="admin_background_jobs" class="admin">
18	[% INCLUDE 'header.inc' %]	42	[% INCLUDE 'header.inc' %]
		43	[% INCLUDE 'prefs-admin-search.inc' %]
19		44
20	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">	45	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
21	<ol>	46	<ol>
Lines 27-35 Administration &rsaquo; Koha Link Here
27	<li>	52	<li>
28	<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>	53	<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
29	</li>	54	</li>
30	<li>	55	[% IF op == 'view' %]
31	<a href="#" aria-current="page">Background jobs</a>	56	<li>
32	</li>	57	<a href="/cgi-bin/koha/admin/background_jobs.pl">Background jobs</a>
		58	</li>
		59	<li>
		60	<a href="#" aria-current="page">Details of job #[% job.id \| html %]</a>
		61	</li>
		62	[% ELSE %]
		63	<li>
		64	<a href="#" aria-current="page">Background jobs</a>
		65	</li>
		66	[% END %]
33	[% ELSE %]	67	[% ELSE %]
34	<li>	68	<li>
35	<a href="#" aria-current="page">Administration</a>	69	<a href="#" aria-current="page">Administration</a>
Lines 55-71 Administration &rsaquo; Koha Link Here
55	[% END %]	89	[% END %]
56		90
57	[% IF op == 'view' %]	91	[% IF op == 'view' %]
58	<h1>Detail of job #[% job.id \| html %]</h1>	92	<h1>Details of job #[% job.id \| html %]</h1>
59		93
60	<fieldset class="rows">	94	<fieldset class="rows">
61	<ol>	95	<ol>
62	<li><span class="label">Job ID: </span>[% job.id \| html %]</li>	96	<li><span class="label">Job ID: </span>[% job.id \| html %]</li>
63	<li><label for="job_status">Status: </label>[% job.status \| html %]</li>	97	<li>
		98	<label for="job_status">Status: </label>
		99	[% PROCESS show_job_status %]
		100	</li>
64	<li><label for="job_progress">Progress: </label>[% job.progress \|\| 0 \| html %] / [% job.size \| html %]</li>	101	<li><label for="job_progress">Progress: </label>[% job.progress \|\| 0 \| html %] / [% job.size \| html %]</li>
65	<li><label for="job_type">Type: </label>[% job.type \| html %]</li>	102	<li>
66	<li><label for="job_enqueued_on">Queued: </label>[% job.enqueued_on \| html %]</li>	103	<label for="job_type">Type: </label>
67	<li><label for="job_started_on">Started: </label>[% job.started_on \| html %]</li>	104	[% PROCESS show_job_type %]
68	<li><label for="job_ended_on">Ended: </label>[% job.ended_on \| html %]</li>	105	</li>
		106	<li>
		107	<label for="job_enqueued_on">Queued: </label>
		108	[% job.enqueued_on \| $KohaDates with_hours = 1 %]
		109	</li>
		110	<li>
		111	<label for="job_started_on">Started: </label>
		112	[% job.started_on \| $KohaDates with_hours = 1 %]
		113	</li>
		114	<li>
		115	<label for="job_ended_on">Ended: </label>
		116	[% job.ended_on \| $KohaDates with_hours = 1 %]
		117	</li>
69	<li><label for="job_data">Report: </label>	118	<li><label for="job_data">Report: </label>
70	[% SWITCH job.type %]	119	[% SWITCH job.type %]
71	[% CASE 'batch_biblio_record_modification' %]	120	[% CASE 'batch_biblio_record_modification' %]
Lines 156-162 Administration &rsaquo; Koha Link Here
156	</fieldset>	205	</fieldset>
157		206
158	[% IF CAN_user_parameters_manage_background_jobs %]	207	[% IF CAN_user_parameters_manage_background_jobs %]
159	<a href="/cgi-bin/koha/admin/background_jobs.pl">Return to the job list</a>	208	<fieldset class="action">
		209	<a href="/cgi-bin/koha/admin/background_jobs.pl">Return to the job list</a>
		210	</fieldset>
160	[% END %]	211	[% END %]
161	[% END %]	212	[% END %]
162		213
Lines 182-188 Administration &rsaquo; Koha Link Here
182	[% FOREACH job IN jobs %]	233	[% FOREACH job IN jobs %]
183	<tr>	234	<tr>
184	<td>[% job.id \| html %]</td>	235	<td>[% job.id \| html %]</td>
185	<td>[% job.status \| html %]</td>	236	<td>
		237	[% PROCESS show_job_status %]
		238	</td>
186	<td>[% job.progress \|\| 0 \| html %] / [% job.size \| html %]</td>	239	<td>[% job.progress \|\| 0 \| html %] / [% job.size \| html %]</td>
187	<td>	240	<td>
188	[% SWITCH job.type %]	241	[% SWITCH job.type %]
Lines 191-199 Administration &rsaquo; Koha Link Here
191	[% CASE %][% job.type \| html %]	244	[% CASE %][% job.type \| html %]
192	[% END %]	245	[% END %]
193	</td>	246	</td>
194	<td>[% job.enqueued_on \| html %]</td>	247	<td>[% job.enqueued_on \| $KohaDates with_hours = 1 %]</td>
195	<td>[% job.started_on\| html %]</td>	248	<td>[% job.started_on\| $KohaDates with_hours = 1 %]</td>
196	<td>[% job.ended_on\| html %]</td>	249	<td>[% job.ended_on\| $KohaDates with_hours = 1 %]</td>
197	<td class="actions">	250	<td class="actions">
198	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id \| html %]"><i class="fa fa-eye"></i> View</a>	251	<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job.id \| html %]"><i class="fa fa-eye"></i> View</a>
199	[% IF job.status == 'new' \|\| job.status == 'started' %]	252	[% IF job.status == 'new' \|\| job.status == 'started' %]
200	-