[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports cat_issues_top.tmpl,NONE,1.1 bor_issues_top.tmpl,NONE,1.1 reports-home.tmpl,1.17,1.18 issues_avg_stats.tmpl,1.1,1.2

Henri-Damien LAURENT hdl at users.sourceforge.net
Wed Mar 23 22:51:53 CET 2005


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31787/koha-tmpl/intranet-tmpl/default/en/reports

Modified Files:
	reports-home.tmpl issues_avg_stats.tmpl 
Added Files:
	cat_issues_top.tmpl bor_issues_top.tmpl 
Log Message:
Fixes on issues_avg_stats
Adding Top lists to reports on Issues for borrowers and Items

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
<div id="mainbloc" >

<!-- TMPL_IF NAME="do_it" -->
	<!-- TMPL_LOOP NAME="mainloop" -->
		<h1 class="reports">Koha : Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
		<!-- TMPL_IF NAME="loopfilter"-->
			<p>Filtered on</p>
			<!-- TMPL_LOOP NAME="loopfilter" -->
					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
			<!-- /TMPL_LOOP -->
		<!-- /TMPL_IF NAME="loopfilter"-->
		<br>
		<table>
			<tr >
				<th class="reports">Rank/Titles</th>
				<!-- TMPL_LOOP NAME="loopcol" -->
					<th class="reports"><!-- TMPL_VAR NAME="coltitle" --></th>
				<!-- /TMPL_LOOP -->
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
					<tr>
						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
						<!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_LOOP NAME="loopcell" -->
							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
							</td>
						<!-- /TMPL_LOOP -->
					</tr>
				<!-- /TMPL_LOOP NAME="looprow" -->
		</table>
	<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
	<h1 class = "reports">Koha : Top List On Catalogue Issues  </h1>
	<form method="post">
	
	<table>
		<thead>
			<tr>
			<th class="reports">Limit to </th>
			<th class="reports">By </th>
			<th class="reports" colspan="2">Filters</th>
			</tr>
		</thead>
		<tbody>
			<tr>
				<td>
					<select name="Limit">
						<option value ="5" checked> 5</option>
						<option value ="10">10</option>
						<option value ="15">15</option>
						<option value ="20">20</option>
	<!--					<option value ="25">25</option>
						<option value ="40">40</option>
						<option value ="50">50</option>
						<option value ="100">100</option>-->
					</select>
				</td>
				<td>
					<select name="Criteria">
						<option value ="" checked>None</option>
						<option value ="issuingbranch">Branch</option>
						<option value ="categorycode">Categorycode</option>
						<option value ="itemtype">Itemtype</option>
						<option value ="Day">Day</option>
						<option value ="Week">Week</option>
						<option value ="Month">Month</option>
						<option value ="Year">Year</option>
					</select>
				</td>
			</tr>
			
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Issue date</td>
				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
								<script language="JavaScript" type="text/javascript">
									function validate1(date) {
										var day = date.getDate();
										var month = date.getMonth() + 1;
										var year = date.getFullYear();
										var weekDay = date.getDay();
										var dayMonth = month + '-' + day;
										var dateString = year + '-' + month + '-' + day;
										var dateTo = document.getElementById('to').value.split("-");
										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
										if (date > limitDate) {
											return true;
										} else {
											return false;
										}
									}
					
									Calendar.setup(
										{
											inputField : "from",
											ifFormat : "%Y-%m-%d",
											button : "openCalendarFrom",
											disableFunc : validate1,
											dateStatusFunc : validate1
										}
									);
								</script>
					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
							<script type="text/javascript">
								function validate2(date) {
									var day = date.getDate();
									var month = date.getMonth() + 1;
									var year = date.getFullYear();
									var weekDay = date.getDay();
									var dayMonth = month + '-' + day;
									var dateString = year + '-' + month + '-' + day;
									var dateFrom = document.getElementById('from').value.split("-");
									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
									if (limitDate > date) {
										return true;
									} else {
										return false;
									}
								}
		
								Calendar.setup(
									{
										inputField : "to",
										ifFormat : "%Y-%m-%d",
										button : "openCalendarTo",
										disableFunc : validate2,
										dateStatusFunc : validate2
									}
								);
							</script>
				</td>
			</tr>
			<tr>
				<td> &nbsp;</td>
				<td> &nbsp;</td>
				<td>Returns</td>
				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
								<script language="JavaScript" type="text/javascript">
									function validate1(date) {
										var day = date.getDate();
										var month = date.getMonth() + 1;
										var year = date.getFullYear();
										var weekDay = date.getDay();
										var dayMonth = month + '-' + day;
										var dateString = year + '-' + month + '-' + day;
										var dateTo = document.getElementById('toRO').value.split("-");
										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
										if (date > limitDate) {
											return true;
										} else {
											return false;
										}
									}
					
									Calendar.setup(
										{
											inputField : "fromRO",
											ifFormat : "%Y-%m-%d",
											button : "openCalendarFromRO",
											disableFunc : validate1,
											dateStatusFunc : validate1
										}
									);
								</script>
					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
							<script type="text/javascript">
								function validate2(date) {
									var day = date.getDate();
									var month = date.getMonth() + 1;
									var year = date.getFullYear();
									var weekDay = date.getDay();
									var dayMonth = month + '-' + day;
									var dateString = year + '-' + month + '-' + day;
									var dateFrom = document.getElementById('fromRO').value.split("-");
									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
									if (limitDate > date) {
										return true;
									} else {
										return false;
									}
								}
		
								Calendar.setup(
									{
										inputField : "toRO",
										ifFormat : "%Y-%m-%d",
										button : "openCalendarToRO",
										disableFunc : validate2,
										dateStatusFunc : validate2
									}
								);
							</script>
				</td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Branch</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Document Type</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Borrower Category</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Day</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Month</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Year</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
		</tbody>
	</table>
	
	<div id="bloc25">
		<h3 class="reports"> Output </h3>
		<input type="radio" checked name="output" value="screen" > To screen into the browser
		<br>
		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
		<!-- TMPL_VAR NAME="CGIextChoice" -->
		<!-- TMPL_VAR NAME="CGIsepChoice" -->
	</p>
	</div>
	<p>
	<input TYPE="submit" value="OK" class="button reports">
	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
	<input type="hidden" name="do_it" value="1">
	</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
<div id="mainbloc" >

<!-- TMPL_IF NAME="do_it" -->
	<!-- TMPL_LOOP NAME="mainloop" -->
		<h1 class="reports">Koha : Top <!-- TMPL_VAR NAME="limit"--> List On borrowers' Issues </h1>
		<!-- TMPL_IF NAME="loopfilter"-->
			<p>Filtered on</p>
			<!-- TMPL_LOOP NAME="loopfilter" -->
					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
			<!-- /TMPL_LOOP -->
		<!-- /TMPL_IF NAME="loopfilter"-->
		<br>
		<table>
			<tr >
				<th class="reports">Rank/Borrowers</th>
				<!-- TMPL_LOOP NAME="loopcol" -->
					<th class="reports"><!-- TMPL_VAR NAME="coltitle" --></th>
				<!-- /TMPL_LOOP -->
			</tr>
				<!-- TMPL_LOOP NAME="looprow" -->
					<tr>
						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
						<!-- TMPL_VAR NAME="rowtitle" --></td>
						<!-- TMPL_LOOP NAME="loopcell" -->
							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
							</td>
						<!-- /TMPL_LOOP -->
					</tr>
				<!-- /TMPL_LOOP NAME="looprow" -->
		</table>
	<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
	<h1 class = "reports">Koha : Top List On borrowers' Issues  </h1>
	<form method="post">
	
	<table>
		<thead>
			<tr>
			<th class="reports">Limit to </th>
			<th class="reports">By </th>
			<th class="reports" colspan="2">Filters</th>
			</tr>
		</thead>
		<tbody>
			<tr>
				<td>
					<select name="Limit">
						<option value ="5" checked> 5</option>
						<option value ="10">10</option>
						<option value ="15">15</option>
						<option value ="20">20</option>
	<!--					<option value ="25">25</option>
						<option value ="40">40</option>
						<option value ="50">50</option>
						<option value ="100">100</option>-->
					</select>
				</td>
				<td>
					<select name="Criteria">
						<option value ="" checked>None</option>
						<option value ="issuingbranch">Branch</option>
						<option value ="categorycode">Categorycode</option>
						<option value ="itemtype">Itemtype</option>
						<option value ="Day">Day</option>
						<option value ="Week">Week</option>
						<option value ="Month">Month</option>
						<option value ="Year">Year</option>
					</select>
				</td>
			</tr>
			
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Issue date</td>
				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
								<script language="JavaScript" type="text/javascript">
									function validate1(date) {
										var day = date.getDate();
										var month = date.getMonth() + 1;
										var year = date.getFullYear();
										var weekDay = date.getDay();
										var dayMonth = month + '-' + day;
										var dateString = year + '-' + month + '-' + day;
										var dateTo = document.getElementById('to').value.split("-");
										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
										if (date > limitDate) {
											return true;
										} else {
											return false;
										}
									}
					
									Calendar.setup(
										{
											inputField : "from",
											ifFormat : "%Y-%m-%d",
											button : "openCalendarFrom",
											disableFunc : validate1,
											dateStatusFunc : validate1
										}
									);
								</script>
					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
							<script type="text/javascript">
								function validate2(date) {
									var day = date.getDate();
									var month = date.getMonth() + 1;
									var year = date.getFullYear();
									var weekDay = date.getDay();
									var dayMonth = month + '-' + day;
									var dateString = year + '-' + month + '-' + day;
									var dateFrom = document.getElementById('from').value.split("-");
									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
									if (limitDate > date) {
										return true;
									} else {
										return false;
									}
								}
		
								Calendar.setup(
									{
										inputField : "to",
										ifFormat : "%Y-%m-%d",
										button : "openCalendarTo",
										disableFunc : validate2,
										dateStatusFunc : validate2
									}
								);
							</script>
				</td>
			</tr>
			<tr>
				<td> &nbsp;</td>
				<td> &nbsp;</td>
				<td>Returns</td>
				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
								<script language="JavaScript" type="text/javascript">
									function validate1(date) {
										var day = date.getDate();
										var month = date.getMonth() + 1;
										var year = date.getFullYear();
										var weekDay = date.getDay();
										var dayMonth = month + '-' + day;
										var dateString = year + '-' + month + '-' + day;
										var dateTo = document.getElementById('toRO').value.split("-");
										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
										if (date > limitDate) {
											return true;
										} else {
											return false;
										}
									}
					
									Calendar.setup(
										{
											inputField : "fromRO",
											ifFormat : "%Y-%m-%d",
											button : "openCalendarFromRO",
											disableFunc : validate1,
											dateStatusFunc : validate1
										}
									);
								</script>
					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
							<script type="text/javascript">
								function validate2(date) {
									var day = date.getDate();
									var month = date.getMonth() + 1;
									var year = date.getFullYear();
									var weekDay = date.getDay();
									var dayMonth = month + '-' + day;
									var dateString = year + '-' + month + '-' + day;
									var dateFrom = document.getElementById('fromRO').value.split("-");
									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
									if (limitDate > date) {
										return true;
									} else {
										return false;
									}
								}
		
								Calendar.setup(
									{
										inputField : "toRO",
										ifFormat : "%Y-%m-%d",
										button : "openCalendarToRO",
										disableFunc : validate2,
										dateStatusFunc : validate2
									}
								);
							</script>
				</td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Branch</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Document Type</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Borrower Category</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Day</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr class="hilighted">
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Month</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
			<tr>
				<td>&nbsp;</td>
				<td>&nbsp;</td>
				<td>Year</td>
				<td><input type="text" name="Filter" value=""></td>
			</tr>
		</tbody>
	</table>
	
	<div id="bloc25">
		<h3 class="reports"> Output </h3>
		<input type="radio" checked name="output" value="screen" > To screen into the browser
		<br>
		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
		<!-- TMPL_VAR NAME="CGIextChoice" -->
		<!-- TMPL_VAR NAME="CGIsepChoice" -->
	</p>
	</div>
	<p>
	<input TYPE="submit" value="OK" class="button reports">
	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
	<input type="hidden" name="do_it" value="1">
	</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: reports-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** reports-home.tmpl	17 Mar 2005 14:53:03 -0000	1.17
--- reports-home.tmpl	23 Mar 2005 21:51:21 -0000	1.18
***************
*** 2,6 ****
--- 2,13 ----
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
+ 
+ 
  <h1 class="reports">Reports</h1>
+ <table>
+ <tbody>
+ <tr>
+ <td>
+ <p>
  <div id="bloc25">
  	<h2 class="reports">Stat wizard on </h2>
***************
*** 10,13 ****
--- 17,40 ----
  	<p><a href="/cgi-bin/koha/reports/issues_stats.pl">Issues</a></p>
  </div>
+ </p>
+ <p>
+ <div id="bloc25">
+ 	<h2 class="reports">Top Lists </h2>
+ 	<p>on issues</p>
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Borrowers</a></li>
+ 		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items</a></li>
+ 	</ul>
+ </div>
+ <p>
+ </p>
+ <div id="bloc25">
+ 	<h2 class="reports">Outsiders</h2>
+ 	<p><a href="/cgi-bin/koha/reports/borrowers_out.pl">No issue Borrowers</a></p>
+ 	<p><a href="/cgi-bin/koha/reports/catalogue_out.pl">No issue Items</a></p>
+ </div>
+ </td>
+ </p>
+ <td>
  <div id="bloc25">
  	<h2 class="reports">Other stats</h2>
***************
*** 23,28 ****
--- 50,58 ----
  		<li><a href="/cgi-bin/koha/overdue.pl">Overdue items</a></li>
  		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
+ 		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
  	</ul>
  </div>
+ </td>
+ <td>
  <div id="bloc25">
  	<h2 class="reports">data exports</h2>
***************
*** 32,35 ****
--- 62,69 ----
  		<li>Issues</li>
  </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
  </div>
  <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: issues_avg_stats.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issues_avg_stats.tmpl	22 Mar 2005 17:03:37 -0000	1.1
--- issues_avg_stats.tmpl	23 Mar 2005 21:51:22 -0000	1.2
***************
*** 258,267 ****
  	
  	<div id="bloc25">
- 		<h3 class="reports"> Cell value </h3>
- 			<p><input type="radio" name="Cellvalue" value="1" checked> Count issues </p>
- 			<p><input type="radio" name="Cellvalue" value="2"> Average issuing time / Average loan period<p>
- 			<p><input type="radio" name="Cellvalue" value="3"> Circulation rate </p>
- 	</div>
- 	<div id="bloc25">
  		<h3 class="reports"> Output </h3>
  		<input type="radio" checked name="output" value="screen" > To screen into the browser
--- 258,261 ----





More information about the Koha-cvs mailing list