Attachment #2306 for bug #2889

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




				<th>TOTAL</th>
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
				    <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_LOOP NAME="loopcell" -->
							<td><!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE--> &nbsp;
								<!-- /TMPL_IF -->
							</td>
						<!-- /TMPL_LOOP -->
						<td><!-- TMPL_VAR NAME="totalrow" -->
							<!-- TMPL_VAR NAME="totalrow" -->
						</td>
					</tr>
				<!-- /TMPL_LOOP -->

			</tr>
		</thead>
		<tbody>
			<tr class="highlight">
				<td>Placed On</td>
				<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
				<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>

				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
				</td>
			</tr>
			<tr class="highlight">
				<td>&nbsp;</td>
				<td colspan="2">group by <select name="PlacedOnDisplay">
					<option value="">None</option>

				</td>
				<td>&nbsp;</td>
			</tr>
			<tr class="highlight">
				<td>Vendor</td>
				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>

				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
			</tr>

			<tr class="highlight">
				<td>Budget</td>
				<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
				<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>

			</tr>

			<!-- TMPL_IF Name="hassort1" -->
				<tr class="highlight">
					<td>Sort1</td>
					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>

				</tr>
			<!-- /TMPL_IF -->
			<!-- TMPL_IF Name="hassort2" -->
				<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
					<td>Sort2</td>
					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>




				<!-- /TMPL_LOOP -->
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
					<td><!-- TMPL_VAR NAME="rowtitle" --></td>
					<!-- TMPL_VAR NAME="rowtitle" --></td>
					<!-- TMPL_LOOP NAME="loopcell" -->
							<td><!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF -->
							<!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF -->
							<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
							<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
						</td>
						<td><!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
						</td>
					<!-- /TMPL_LOOP -->
				</tr>

Lines 46-52 function Dopop(link) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl (-1 / +1 lines)
46	<!-- /TMPL_LOOP -->	46	<!-- /TMPL_LOOP -->
47	</tr>	47	</tr>
48	<!-- TMPL_LOOP NAME="looprow" -->	48	<!-- TMPL_LOOP NAME="looprow" -->
49	<!-- TMPL_IF NAME="hilighted" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->	49	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
50	<td><!-- TMPL_VAR NAME="rowtitle" --></td>	50	<td><!-- TMPL_VAR NAME="rowtitle" --></td>
51	<!-- TMPL_LOOP NAME="loopcell" -->	51	<!-- TMPL_LOOP NAME="loopcell" -->
52	<td>	52	<td>




				<th>TOTAL</th>
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_LOOP NAME="loopcell" -->
							<td><!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
							<!--TMPL_ELSE-->&nbsp;
							<!--/TMPL_IF-->
								<!--/TMPL_IF-->
							</td>
						<!-- /TMPL_LOOP -->
						<td><!-- TMPL_VAR NAME="totalrow" -->
							<!-- TMPL_VAR NAME="totalrow" -->
						</td>
					</tr>
				<!-- /TMPL_LOOP-->

				<!-- TMPL_ELSE -->
				<tr><td colspan="4"><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /></td></tr>
			<!-- /TMPL_IF -->
			 <tr class="highlight">
				<td>Item Type</td>
				<td><input type="radio" name="Line" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td>
				<td><input type="radio" name="Column" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td>

				<td><input type="radio" name="Column" value="publishercode" /></td>
				<td><input type="text" name="Filter" /></td>
			</tr>
			<tr class="highlight">
				<td>Publication Year</td>
				<td><input type="radio" name="Line" value="publicationyear" /></td>
				<td><input type="radio" name="Column" value="publicationyear" /></td>

					</select>
				</td>
			</tr>
			<tr class="highlight">
				<td>Shelving Location</td>
				<td><input type="radio" name="Line" value="items.location" /></td>
				<td><input type="radio" name="Column" value="items.location" /></td>

					</select>
				</td>
			</tr>
            <tr class="highlight">
                <td colspan="3">Filter barcode</td>
                <td>
                    <select name="Filter" id="like">




				<th>TOTAL</th>
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_LOOP NAME="loopcell" -->
						<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
						</td>
							</td>
						<!-- /TMPL_LOOP -->
						<td><!-- TMPL_VAR NAME="totalrow" -->
							<!-- TMPL_VAR NAME="totalrow" -->
						</td>
					</tr>
				<!-- /TMPL_LOOP -->

			</tr>
		</thead>
		<tbody>
			<tr class="highlight">
				<td>Checkout date</td>
				<td><input type="radio" name="Line" value="timestamp" /></td>
				<td><input type="radio" name="Column" value="timestamp" /></td>

							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
				</td>
			</tr>
			<tr class="highlight"> 
				<td>&nbsp;</td>
				<td colspan="2">by <select name="IssueDisplay">
					<option value=""> </option>

				</td>
				<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
			</tr>
			<tr class="highlight">
				<td>Patron category</td>
				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>

				<td><input type="radio" name="Column" value="itemtype" /></td>
				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
			</tr>
			<tr class="highlight">
				<td>Library</td>
				<td><input type="radio" name="Line" value="branchcode" /></td>
				<td><input type="radio" name="Column" value="branchcode" /></td>

			</tr> -->
<!--End Modified -->
			<!-- TMPL_IF Name="hassort1" -->
				<tr class="highlight"> 
					<td>Sort1</td>
					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>

				</tr>
			<!-- /TMPL_IF -->
			<!-- TMPL_IF Name="hassort2" -->
				<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
					<td>Sort2</td>
					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>

Lines 23-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl (-2 / +1 lines)
23	<th>count</th>	23	<th>count</th>
24	</tr>	24	</tr>
25	<!-- TMPL_LOOP NAME="loopitemtype" -->	25	<!-- TMPL_LOOP NAME="loopitemtype" -->
26	<tr>	26	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
27	<td><!-- TMPL_VAR NAME="itemtype" --></td>	27	<td><!-- TMPL_VAR NAME="itemtype" --></td>
28	<td><!-- TMPL_VAR NAME="count" --></td>	28	<td><!-- TMPL_VAR NAME="count" --></td>
29	</tr>	29	</tr>
30	-

Return to bug 2889

Lines 34-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl (-13 / +10 lines)
34	<th>TOTAL</th>	34	<th>TOTAL</th>
35	</tr>	35	</tr>
36	<!-- TMPL_LOOP NAME="looprow" -->	36	<!-- TMPL_LOOP NAME="looprow" -->
37	<tr>	37	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
38	<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	38	<td><!-- TMPL_VAR NAME="rowtitle" --></td>
39	<!-- TMPL_VAR NAME="rowtitle" --></td>
40	<!-- TMPL_LOOP NAME="loopcell" -->	39	<!-- TMPL_LOOP NAME="loopcell" -->
41	<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	40	<td><!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
42	<!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
43	<!-- TMPL_ELSE-->	41	<!-- TMPL_ELSE-->
44	<!-- /TMPL_IF -->	42	<!-- /TMPL_IF -->
45	</td>	43	</td>
46	<!-- /TMPL_LOOP -->	44	<!-- /TMPL_LOOP -->
47	<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	45	<td><!-- TMPL_VAR NAME="totalrow" -->
48	<!-- TMPL_VAR NAME="totalrow" -->
49	</td>	46	</td>
50	</tr>	47	</tr>
51	<!-- /TMPL_LOOP -->	48	<!-- /TMPL_LOOP -->
Lines 74-80 Link Here
74	</tr>	71	</tr>
75	</thead>	72	</thead>
76	<tbody>	73	<tbody>
77	<tr class="hilighted">	74	<tr class="highlight">
78	<td>Placed On</td>	75	<td>Placed On</td>
79	<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>	76	<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
80	<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>	77	<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
Lines 144-150 Link Here
144	<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>	141	<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
145	</td>	142	</td>
146	</tr>	143	</tr>
147	<tr class="hilighted">	144	<tr class="highlight">
148	<td> </td>	145	<td> </td>
149	<td colspan="2">group by <select name="PlacedOnDisplay">	146	<td colspan="2">group by <select name="PlacedOnDisplay">
150	<option value="">None</option>	147	<option value="">None</option>
Lines 238-244 Link Here
238	</td>	235	</td>
239	<td> </td>	236	<td> </td>
240	</tr>	237	</tr>
241	<tr class="hilighted">	238	<tr class="highlight">
242	<td>Vendor</td>	239	<td>Vendor</td>
243	<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>	240	<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
244	<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>	241	<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
Lines 251-257 Link Here
251	<td><!-- TMPL_VAR NAME="CGIItemType" --></td>	248	<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
252	</tr>	249	</tr>
253		250
254	<tr>	251	<tr class="highlight">
255	<td>Budget</td>	252	<td>Budget</td>
256	<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>	253	<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
257	<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>	254	<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
Lines 259-265 Link Here
259	</tr>	256	</tr>
260		257
261	<!-- TMPL_IF Name="hassort1" -->	258	<!-- TMPL_IF Name="hassort1" -->
262	<tr class="hilighted">	259	<tr class="highlight">
263	<td>Sort1</td>	260	<td>Sort1</td>
264	<td><input type="radio" name="Line" value="aqorders.sort1" /></td>	261	<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
265	<td><input type="radio" name="Column" value="aqorders.sort1" /></td>	262	<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
Lines 267-273 Link Here
267	</tr>	264	</tr>
268	<!-- /TMPL_IF -->	265	<!-- /TMPL_IF -->
269	<!-- TMPL_IF Name="hassort2" -->	266	<!-- TMPL_IF Name="hassort2" -->
270	<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->	267	<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
271	<td>Sort2</td>	268	<td>Sort2</td>
272	<td><input type="radio" name="Line" value="aqorders.sort2" /></td>	269	<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
273	<td><input type="radio" name="Column" value="aqorders.sort2" /></td>	270	<td><input type="radio" name="Column" value="aqorders.sort2" /></td>

Lines 34-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl (-14 / +11 lines)
34	<th>TOTAL</th>	34	<th>TOTAL</th>
35	</tr>	35	</tr>
36	<!-- TMPL_LOOP NAME="looprow" -->	36	<!-- TMPL_LOOP NAME="looprow" -->
37	<tr>	37	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
38	<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	38	<td><!-- TMPL_VAR NAME="rowtitle" --></td>
39	<!-- TMPL_VAR NAME="rowtitle" --></td>
40	<!-- TMPL_LOOP NAME="loopcell" -->	39	<!-- TMPL_LOOP NAME="loopcell" -->
41	<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	40	<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
42	<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->	41	</td>
43	</td>
44	<!-- /TMPL_LOOP -->	42	<!-- /TMPL_LOOP -->
45	<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->	43	<td><!-- TMPL_VAR NAME="totalrow" -->
46	<!-- TMPL_VAR NAME="totalrow" -->
47	</td>	44	</td>
48	</tr>	45	</tr>
49	<!-- /TMPL_LOOP -->	46	<!-- /TMPL_LOOP -->
Lines 73-79 Link Here
73	</tr>	70	</tr>
74	</thead>	71	</thead>
75	<tbody>	72	<tbody>
76	<tr class="hilighted">	73	<tr class="highlight">
77	<td>Checkout date</td>	74	<td>Checkout date</td>
78	<td><input type="radio" name="Line" value="timestamp" /></td>	75	<td><input type="radio" name="Line" value="timestamp" /></td>
79	<td><input type="radio" name="Column" value="timestamp" /></td>	76	<td><input type="radio" name="Column" value="timestamp" /></td>
Lines 137-143 Link Here
137	</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>	134	</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
138	</td>	135	</td>
139	</tr>	136	</tr>
140	<tr class="hilighted">	137	<tr class="highlight">
141	<td> </td>	138	<td> </td>
142	<td colspan="2">by <select name="IssueDisplay">	139	<td colspan="2">by <select name="IssueDisplay">
143	<option value=""> </option>	140	<option value=""> </option>
Lines 225-231 Link Here
225	</td>	222	</td>
226	<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>	223	<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
227	</tr>	224	</tr>
228	<tr class="hilighted">	225	<tr class="highlight">
229	<td>Patron category</td>	226	<td>Patron category</td>
230	<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>	227	<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
231	<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>	228	<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
Lines 237-243 Link Here
237	<td><input type="radio" name="Column" value="itemtype" /></td>	234	<td><input type="radio" name="Column" value="itemtype" /></td>
238	<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>	235	<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
239	</tr>	236	</tr>
240	<tr class="hilighted">	237	<tr class="highlight">
241	<td>Library</td>	238	<td>Library</td>
242	<td><input type="radio" name="Line" value="branchcode" /></td>	239	<td><input type="radio" name="Line" value="branchcode" /></td>
243	<td><input type="radio" name="Column" value="branchcode" /></td>	240	<td><input type="radio" name="Column" value="branchcode" /></td>
Lines 252-258 Link Here
252	</tr> -->	249	</tr> -->
253	<!--End Modified -->	250	<!--End Modified -->
254	<!-- TMPL_IF Name="hassort1" -->	251	<!-- TMPL_IF Name="hassort1" -->
255	<tr class="hilighted">	252	<tr class="highlight">
256	<td>Sort1</td>	253	<td>Sort1</td>
257	<td><input type="radio" name="Line" value="borrowers.sort1" /></td>	254	<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
258	<td><input type="radio" name="Column" value="borrowers.sort1" /></td>	255	<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
Lines 260-266 Link Here
260	</tr>	257	</tr>
261	<!-- /TMPL_IF -->	258	<!-- /TMPL_IF -->
262	<!-- TMPL_IF Name="hassort2" -->	259	<!-- TMPL_IF Name="hassort2" -->
263	<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->	260	<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
264	<td>Sort2</td>	261	<td>Sort2</td>
265	<td><input type="radio" name="Line" value="borrowers.sort2" /></td>	262	<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
266	<td><input type="radio" name="Column" value="borrowers.sort2" /></td>	263	<td><input type="radio" name="Column" value="borrowers.sort2" /></td>