From 8ed972f0fe9665fe7df06768e241a6e232e4fcc2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 22 Apr 2008 09:54:17 -0500 Subject: [PATCH] Refining some circ reports interfaces, adding table sorting. Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 14 ++ .../prog/en/modules/admin/branches.tmpl | 26 ++- .../prog/en/modules/circ/overdue.tmpl | 95 +++++---- .../prog/en/modules/circ/pendingreserves.tmpl | 195 +++++++++-------- .../prog/en/modules/circ/reserveratios.tmpl | 200 ++++++++++-------- .../prog/en/modules/circ/transferstodo.tmpl | 49 +++-- .../en/modules/circ/transferstoreceive.tmpl | 50 +++-- 7 files changed, 371 insertions(+), 258 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index baadc3f939..2962295146 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -448,6 +448,20 @@ fieldset.brief div.hint, fieldset.rows div.hint { margin-bottom : .4em; } +div.yui-b fieldset.brief { + padding : .4em .7em; +} + +div.yui-b fieldset.brief ol { + font-size : 85%; + margin : 0; + padding : 0; +} + +div.yui-b fieldset.brief select { + width: 12em; +} + fieldset.rows { border-width : 1px; border-bottom : 1px solid black; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl index d5732a9a58..5ab26597a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -2,6 +2,7 @@ Koha › Administration › <!-- TMPL_IF NAME="editcategory" --><!-- TMPL_IF NAME="categorycode" -->Libraries, branches, & Groups › Edit Group <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Libraries, branches, & Groups › New Group<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Libraries, branches, & Groups › Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF name="add" --> <!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Libraries, branches, & Groups › Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Libraries, branches, & Groups › Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Libraries, branches, & Groups<!-- /TMPL_IF --> + @@ -35,6 +36,11 @@ $(document).ready(function() { yuiToolbar(); + $.tablesorter.defaults.widgets = ['zebra']; + $("#branchest").tablesorter({ + sortList: [[0,0]], + headers: { 3:{sorter:false},4:{sorter:false},5:{sorter:false},6:{sorter:false}} + }); }); // YUI Toolbar Functions @@ -130,18 +136,23 @@
Library cannot be deleted because there are patrons using that library
Category cannot be deleted because there are libraries using that category
- - - + +
Name
+ + - + - + + + + + - +
Name Code Address Properties IP Printer  
@@ -183,8 +194,11 @@ ?branchcode=&branchname=&op=delete">Delete
+ +
There are no branches defined. Start defining libraries.
+ 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 7539d8c385..9d235f49b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -1,6 +1,25 @@ Koha › Circulation › Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --> + + @@ -8,17 +27,49 @@ -
+
-
+

Items Overdue as of

-
-
- Filter on : +

Results

+">Download file of all overdues (for branch all branches. Other filters are ignored) +
+ + + + + + + + + + + + + + + + + + + + +
Due DatePatronBranchTitle
"> ?subject=Overdue: ">[email] ()"> ( + ) +

">

+

+
+
+
+
+
+ +
+

Filter On:

  1. " />
-
+ - -

Results

-">Download file of all overdues (for branch all branches. Other filters are ignored) -
- - - - - - - - - - - - - - - - - - - - -
Due DatePatronBranchTitle
"> ?subject=Overdue: ">[email] ()"> ( - ) -

">

-

-
-
-
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 3d7a49baf2..74cba1c567 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -8,6 +8,25 @@ + + @@ -16,93 +35,19 @@ -
+
-
- -

Pending holds placed between and

-
-
-
-

- - -" /> -/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> - - -" type="text" /> -/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> - -
-(Inclusive, default is 10 years ago to yesterday, set "to" to today as needed. ) - -

-
-

The following holds have not been filled. Please retrieve them and check them in

-
+
+

Pending holds placed between and

+

Reported on

+

The following holds have not been filled. Please retrieve them and check them in.

- - +
+ @@ -112,7 +57,7 @@ Calendar.setup( - - + - + @@ -179,12 +124,92 @@ Calendar.setup(

Waiting

Fullfilled

- +
Pull This Many Items Patrons with Holds Title + Title &to=">Sort @@ -135,9 +80,9 @@ Calendar.setup( &to=">Sort

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

Refine Results

+
    +
  1. + +" /> +/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" /> +
    2. +
  2. +" type="text" /> +/lib/calendar/cal.gif" alt="" id="openCalendarTo" style="cursor: pointer;" border="0" /> +
    3. +
+

(Inclusive, default is 10 years ago to yesterday, set "to" to today as needed. )

+
+
+
+
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 31941392d2..d7f94a40cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl @@ -8,6 +8,25 @@ + + @@ -16,25 +35,98 @@ -
+
-
- -

Hold Ratios to Calculate Items Needed
- Calculated on
From - to

-
-
+
+

Hold Ratios to Calculate Items Needed

+

Calculated on . From + to

+

These items have a large number of holds.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Reserves + &order=reservecount&from=&to=">Sort + Items + &order=itemcount&from=&to=">Sort + Title + &order=biblio&from=&to=">Sort + Holding Branches + &order=branch&from=&to=">Sort + Location + &order=location&from=&to=">Sort + Itype + &order=itype&from=&to=">Sort + Call Numbers + &order=callnumber&from=&to=">Sort + Items Needed +
+

+ 		+

+ 		+

+ + "> + + + + + "> + + + + "> + + + + +

+

+

Order:

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

-

+

Refine Results:

+
  1. -" /> -
    2. +
  2. " /> @@ -64,8 +156,8 @@ Calendar.setup( dateStatusFunc : validate1 } ); - -
    3. +
  3. " type="text" /> @@ -96,87 +188,13 @@ Calendar.setup( dateStatusFunc : validate2 } ); - +
(inclusive) - -

+
+
-

These items have a large number of holds.

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Reserves - &order=reservecount&from=&to=">Sort - Items - &order=itemcount&from=&to=">Sort - Title - &order=biblio&from=&to=">Sort - Holding Branches - &order=branch&from=&to=">Sort - Location - &order=location&from=&to=">Sort - Itype - &order=itype&from=&to=">Sort - Call Numbers - &order=callnumber&from=&to=">Sort - Items Needed -
-

- 		-

- 		-

- - "> - - - - - "> - - - - "> - - - - -

-

-

Order:

- - No items found. - -
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 a264991a2e..1703e2fde4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl @@ -1,6 +1,24 @@ Koha › Circulation › Transfers to do + + @@ -15,44 +33,33 @@
-

Transfers to do

+

Transfers to do,

- - - - - +

Holds waiting for:

+
Holds waiting for:
+ - - + + class="problem" > - - + - + - +
Date of hold Title Patron Localisation Action

Hold over 		-

- "> -   ( ) -
Barcode : -

- 		-

- ">  
+

">  ( )
Barcode : 		">  

?subject=Reservation: "> -

" /> @@ -62,7 +69,7 @@
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 bc0224e2a0..b6ccf669c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -1,6 +1,24 @@ Koha › Circulation › Transfers to your library + + @@ -15,35 +33,34 @@
-

Transfers made TO your library on :

+

Transfers made to your library on :

Your library is the destination for the following transfer(s)

- +
- + - - - class="problem" > + + + + + + + - - - + - +
Coming from
Date of transfer Title Reserved by Localisation Action

check this transfer		 -

- "> +

">   ( )
Barcode : -

- -

- "> +

+ ">  

@@ -52,14 +69,13 @@ -

None

"> @@ -67,7 +83,7 @@ -->
-- 2.39.5