From bebd8961d9ad308f4edbf9e4389e57cdeee7f5e9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 22 Apr 2008 09:54:55 -0500 Subject: [PATCH] More cleanup and corrections for circulation reports. Signed-off-by: Joshua Ferraro --- .../prog/en/modules/circ/billing.tmpl | 154 ++++++++---------- .../prog/en/modules/circ/branchoverdues.tmpl | 18 +- .../prog/en/modules/circ/overdue.tmpl | 9 +- .../prog/en/modules/circ/reserveratios.tmpl | 5 +- .../prog/en/modules/circ/transferstodo.tmpl | 7 +- .../en/modules/circ/transferstoreceive.tmpl | 7 +- .../prog/en/modules/circ/waitingreserves.tmpl | 46 ++++-- 7 files changed, 134 insertions(+), 112 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl index 67574c6267..71888fc69c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/billing.tmpl @@ -3,7 +3,6 @@ /lib/calendar/calendar-system.css" /> - @@ -16,24 +15,82 @@ -
+
-
+
-

Billing on -
From - to

-
+

Billing from to

+

Reported on

+ + + + +

The following patrons have bills.

+ + + + + + + + + + + + + + + + + + + + +
Patron + &to=">Sort + Fee Item + &to=">Sort + Description + &to=">Sort + Type + &to=">Sort + Date + &to=">Sort + Total Amount + &to=">Sort +
+

">

+ ?subject=Account: "> + +

+
+

+
+

+
+

+
+

+
+

+
+ + No items found. + + +
+
+
-

-

+
  1. -" /> -
  2. +
  3. " /> @@ -63,8 +120,8 @@ Calendar.setup( dateStatusFunc : validate1 } ); - -
  4. +
  5. " type="text" /> @@ -96,77 +153,10 @@ Calendar.setup( } ); -(inclusive) +(inclusive)
- -

+
-

The following patrons have bills.

-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Patron - &to=">Sort - Fee Item - &to=">Sort - Description - &to=">Sort - Type - &to=">Sort - Date - &to=">Sort - Total Amount - &to=">Sort -
-

">

- ?subject=Account: "> - -

-
-

-
-

-
-

-
-

-
-

-
- - No items found. - -
- -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl index 77d4102423..831b0bd4c7 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl @@ -1,5 +1,5 @@ -Koha › Circulation ’ Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --> +Koha › Circulation › Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --> @@ -53,24 +53,24 @@ -

-

-

- "> + +"> + +"> + +">   ()
Barcode : -

-

">  

+ ">  

?subject=Overdue: "> -

-

+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index 9d235f49b6..f5f3d38415 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -56,9 +56,12 @@ $.tablesorter.addParser({ ) - -

">

-

+ +"> + +"> + +"> , by diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl index d7f94a40cc..e558766f3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl @@ -44,8 +44,7 @@ $.tablesorter.addParser({

Calculated on . From to

These items have a large number of holds.

-
- + class="problem" > - + - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl index b7c30200bd..2b91306831 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl @@ -1,6 +1,25 @@ Koha › Circulation › Holds awaiting pickup + + @@ -39,31 +58,34 @@
-
Reserves @@ -117,7 +116,6 @@ $.tablesorter.addParser({ -
@@ -195,7 +193,6 @@ Calendar.setup(
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl index 1703e2fde4..3b25d5ace3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl @@ -50,7 +50,12 @@ $.tablesorter.addParser({

Hold over
">  ( )
Barcode :
+"> + +"> + +">   ( )
Barcode :
">  

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl index b6ccf669c0..063e365c7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -55,7 +55,12 @@ $.tablesorter.addParser({

check this transfer
"> + +"> + +"> + +">   ( )
Barcode :
- +
+ - - + + class="problem" > - + - +
Available since Title Patron Localisation Action

Hold Over
-

- "> -   () + + + +"> + +"> + +">   ()
Barcode : -

-

">,

+ ">,

?subject=Reservation: "> -

" /> @@ -78,7 +100,7 @@
No holds found.
-- 2.39.5