From fcbb6bc73dbd8e1f5a848afcff0603863747e73b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 22 Jul 2010 14:16:27 -0400 Subject: [PATCH] Fix for Bug 5030 - Improve handling of duplicate patrons - Making duplicate patron warning dialog simpler but more explicit - Pointing duplicate patron preview window to new brief version of moremember.pl to display more patron details than the previous version. --- .../intranet-tmpl/prog/en/css/staff-global.css | 17 +++- .../prog/en/modules/members/borrowers_details.tmpl | 63 ------------- .../prog/en/modules/members/memberentrygen.tmpl | 25 ++--- .../prog/en/modules/members/moremember-brief.tmpl | 97 ++++++++++++++++++++ koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png | Bin 0 -> 205 bytes members/borrowers_details.pl | 75 --------------- members/moremember.pl | 3 + 7 files changed, 125 insertions(+), 155 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png delete mode 100755 members/borrowers_details.pl 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 13ac2c7..914042e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -21,6 +21,11 @@ a.overdue,.overdue { color : #cc0000; } +a.popup { + background : transparent url("../../img/pop-up-link.png") center right no-repeat; + padding-right : 15px; +} + body { text-align : left; padding:0 0 2.5em 0; @@ -1128,11 +1133,21 @@ td input.approve { color:black; padding: .4em .4em .4em 34px; } - + .dialog input.edit { background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center; color:black; + max-width : 13em; + padding: .4em .4em .4em 34px; + white-space: normal; +} + +.dialog input.new { + background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center; + color:black; + max-width : 13em; padding: .4em .4em .4em 34px; + white-space: normal; } .dialog input.print { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl deleted file mode 100644 index 763cf66..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl +++ /dev/null @@ -1,63 +0,0 @@ - -Patron Details - - - - -
-
- -

Patron Details

- -
- - -

- - - " /> -

-

- - - " /> -

- - - -

- - " /> -

-

- - " /> - -

-

- - " /> -

- -

- - - " /> -

-

- - " /> -

- - - - - -

- Close Window -

- -
- -
- diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index b21d35a..007dbd7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -83,22 +83,15 @@ -

-

-

Duplicate suspected

- ');" >Detail - Duplicate ? - &category_type=">Yes -     No, it is not - - - - - +

Duplicate patron record?

+

');" >View existing record

+ " />" /> + +
+ +
- -

@@ -144,7 +137,8 @@ -
+ +" /> " /> " /> @@ -153,7 +147,6 @@ " /> " /> " /> -" /> " /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl new file mode 100644 index 0000000..9dd5ed3 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl @@ -0,0 +1,97 @@ + +Koha › Check duplicate patron + + + + +
+
+

+ ()

+
+
+
+ + + +

+ + , + +
+
+ +
+

+ +
+
    + +
  1. Organization phone:
  2. +
  3. Organization email:
  4. + +
  5. Home:
  6. +
  7. Mobile:
  8. +
  9. Work:
  10. + + + +
  11. Professional phone:
  12. +
  13. Professional mobile:
  14. + +
  15. Fax:
  16. + +
  17. Email (home):">
  18. +
  19. Email (work): ">
  20. + +
  21. Initials:
  22. +
  23. Date of birth:
  24. +
  25. Sex:
  26. + +
  27. Ethnicity:
  28. +
  29. Ethnicity notes:
  30. + + + +
  31. Guarantees:
  32. + + + +
  33. Guarantor:">,
  34. + + +
+
+
+
+
+
+

Library use

+
+
    +
  1. Card number:
  2. +
  3. Borrowernumber:
  4. +
  5. Category: ()
  6. +
  7. Registration date:
  8. +
  9. Expiration date: + + + + + +
  10. +
  11. Library:
  12. + +
  13. Sort field 1:
  14. +
  15. Sort field 2:
  16. +
+
+
+
+
+
+
+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png b/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png new file mode 100644 index 0000000000000000000000000000000000000000..77ffc75e040d8c27f8ba21b010c19a47a1b15792 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQY`6?zK#qG>ra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%u?6^qxH2%D`Tzg_Os8|nKoO>r zAiv=M3{STkcma9#o-U3d6}OTSQc_YHm>L+87&b~CY+zJqm~fMUk!3RTMn)!%BMl(( tOdC+TNt+?5fx#(_nMGiei9-V;1J4x(>!kFQJwT%vJYD@<);T3K0Ra1$I)nfK literal 0 HcmV?d00001 diff --git a/members/borrowers_details.pl b/members/borrowers_details.pl deleted file mode 100755 index c861ad4..0000000 --- a/members/borrowers_details.pl +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/perl -# NOTE: This file uses standard 8-space tabs -# DO NOT SET TAB SIZE TO 4 - - -#script to set up screen for modification of borrower details -#written 20/12/99 by chris@katipo.co.nz - - -# Copyright 2000-2002 Katipo Communications -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use strict; -#use warnings; FIXME - Bug 2505 -use CGI; -use C4::Auth; -use C4::Context; -use C4::Output; -use C4::Members; -use C4::Koha; -use C4::Dates qw(format_date); -use C4::Input; -use C4::Log; -my $input = new CGI; -my $dbh = C4::Context->dbh; -my %data; - -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "members/borrowers_details.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {borrowers => 1}, - debug => 1, - }); - -my $data; -my $categorycode=$input->param('categorycode'); -my $borrowernumber=$input->param('borrowernumber'); -my $description=$input->param('description'); -my $category_type=$input->param('category_type'); - -$data=GetMember('borrowernumber' => $borrowernumber); - -$template->param( borrowernumber => $borrowernumber,#register number - #transform value in capital or capital for first letter of the word - firstname => ucfirst($data->{'firstname'}), - surname => uc($data->{'surname'}), - categorycode => $data->{'categorycode'}, - title => $data->{'title'}, - category_type => $data->{'category_type'}, - "title_".$data->{'title'} => " SELECTED ", - dateofbirth => format_date($data->{'dateofbirth'}), - description => $data->{'description'} - ); -$template->param(Institution => 1) if ($category_type eq "I"); -output_html_with_http_headers $input, $cookie, $template->output; - -# Local Variables: -# tab-width: 8 -# End: diff --git a/members/moremember.pl b/members/moremember.pl index 34a3e09..104670b 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -89,6 +89,9 @@ if ($print eq "page") { $template_name = "members/moremember-receipt.tmpl"; $quickslip = 1; $flagsrequired = { circulate => "circulate_remaining_permissions" }; +} elsif ($print eq "brief") { + $template_name = "members/moremember-brief.tmpl"; + $flagsrequired = { borrowers => 1 }; } else { $template_name = "members/moremember.tmpl"; $flagsrequired = { borrowers => 1 }; -- 1.7.0.4