From 5edc7ef9a75c681715e23aa47f962b47866be615 Mon Sep 17 00:00:00 2001 From: tipaul Date: Tue, 8 Apr 2003 09:39:17 +0000 Subject: [PATCH] fixes for #207, 208, 211 --- imemberentry.pl | 21 +++- .../default/en/members/imemberentry.tmpl | 96 +++++++------------ .../default/en/members/member-password.tmpl | 2 +- .../default/en/members/memberentry.tmpl | 90 ++++++++--------- .../default/en/members/moremember.tmpl | 20 ++-- member-password.pl | 3 +- memberentry.pl | 20 +++- moremember.pl | 1 + newjmember.pl | 1 - 9 files changed, 127 insertions(+), 127 deletions(-) diff --git a/imemberentry.pl b/imemberentry.pl index 8aea1cb9e3..2d6a93a418 100755 --- a/imemberentry.pl +++ b/imemberentry.pl @@ -28,6 +28,7 @@ use C4::Output; use CGI; use C4::Search; use C4::Interface::CGI::Output; +use C4::Koha; use HTML::Template; my $input = new CGI; @@ -50,9 +51,23 @@ my $type=$input->param('type'); my $data=borrdata('',$member); -$template->param({ startmenumember => startmenu('member'), - endmenumember => endmenu('member'), - member => $member }); +my @branches; +my @select_branch; +my %select_branches; +my $branches=getbranches(); +foreach my $branch (keys %$branches) { + push @select_branch, $branch; + $select_branches{$branch} = $branches->{$branch}->{'branchname'}; +} +my $CGIbranch=CGI::scrolling_list( -name => 'branch', + -values => \@select_branch, + -default => $data->{'branchcode'}, + -labels => \%select_branches, + -size => 1, + -multiple => 0 ); + +$template->param(member => $member, + CGIbranch => $CGIbranch); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl index 504cfa4b1f..21401b5e33 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl @@ -1,14 +1,4 @@ - - - - - - - - +
Add New Institution
@@ -27,7 +17,7 @@ - Member# , Card Number* + Member# , Card Number*
@@ -35,111 +25,93 @@   - + /images/background-mem.gif"> INSTITUTION DETAILS - + /images/background-mem.gif"> - + Institution Name - - Institution Name + -   - + /images/background-mem.gif"> INSTITUTION ADDRESS - - - - - - - - Postal Address* Town* Area - + + + + + + +   - + /images/background-mem.gif"> CONTACT DETAILS - - - - Contact Name* - - - - + - + + Phone (day) Fax Email - -   - - + + + +   + Notes + + +   - + - LIBRARY USE + /images/background-mem.gif">LIBRARY USE + + + + Notes -   - - Notes - - - + /images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 > @@ -153,4 +125,4 @@ - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl index 94e3ff822e..3b1243eb1e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl @@ -6,7 +6,7 @@ Click here to continue to see Member Info. -

,

+

,

> New UserID: >
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl index 97168adedb..4b800284b9 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl @@ -28,6 +28,13 @@ + + Title + Initials + Given Names* + Surname* + Prefered Name + + - Title - Initials - Given Names* - Surname* - Prefered Name + + Ethnicity + Ethnicity Notes + +    + + Membership Category* - - - + + + - Postal Address* - Town* - Area + Street Address if different + Town - - - Street Address if different - Town - /images/background-mem.gif">MEMBER CONTACT DETAILS + + Phone (Home) + Fax + Email + Text Messaging + @@ -120,31 +122,30 @@ - - Phone (Home) - Fax - Email - Text Messaging - - + Phone (Day) - - Phone (Day) + + /images/background-mem.gif">ALTERNATE CONTACT DETAILS + + Name* + Phone + Relationship* + @@ -157,22 +158,15 @@ - - Name* - Phone - Relationship* - + + /images/background-mem.gif">LIBRARY USE + Notes -   - - - /images/background-mem.gif">LIBRARY USE - Notes diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl index df9c5e9cd1..6e071f460e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl @@ -1,6 +1,5 @@ -

@@ -13,14 +12,17 @@ -

- - /images/add-child.gif"> - - -

-


- (, )

+ +

+

+ /images/add-child.gif"> + + +
+

+ +
+ (, )

Card Number:
Postal Address: ,
Home Address: ,
diff --git a/member-password.pl b/member-password.pl index bb4e27b5f8..a69a5b899d 100755 --- a/member-password.pl +++ b/member-password.pl @@ -62,7 +62,8 @@ if ( $newpassword ) { for (my $i=0; $i<$length; $i++) { $defaultnewpassword.=substr($chars, int(rand(length($chars))),1); } - $template->param( surname => $bor->{'surname'}, + $template->param( othernames => $bor->{'othernames'}, + surname => $bor->{'surname'}, firstname => $bor->{'firstname'}, userid => $bor->{'userid'}, defaultnewpassword => $defaultnewpassword ); diff --git a/memberentry.pl b/memberentry.pl index 72d2314f79..b915b9b047 100755 --- a/memberentry.pl +++ b/memberentry.pl @@ -179,7 +179,22 @@ if ($delete){ #Convert dateofbirth to correct format $data->{'dateofbirth'} = format_date($data->{'dateofbirth'}); - $template->param( + my @branches; + my @select_branch; + my %select_branches; + my $branches=getbranches(); + foreach my $branch (keys %$branches) { + push @select_branch, $branch; + $select_branches{$branch} = $branches->{$branch}->{'branchname'}; + } + my $CGIbranch=CGI::scrolling_list( -name => 'branch', + -values => \@select_branch, + -default => $data->{'branchcode'}, + -labels => \%select_branches, + -size => 1, + -multiple => 0 ); + + $template->param( member => $member, address => $data->{'streetaddress'}, firstname => $data->{'firstname'}, @@ -208,7 +223,8 @@ if ($delete){ expiry => $data->{'expiry'}, cardnumber => $cardnumber, dateofbirth => $data->{'dateofbirth'}, - dateformat => display_date_format()); + dateformat => display_date_format(), + CGIbranch => $CGIbranch); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/moremember.pl b/moremember.pl index ab3bfc7172..50ddd24763 100755 --- a/moremember.pl +++ b/moremember.pl @@ -68,6 +68,7 @@ my $data=borrdata('',$bornum); $data->{'dateenrolled'} = format_date($data->{'dateenrolled'}); $data->{'expiry'} = format_date($data->{'expiry'}); $data->{'dateofbirth'} = format_date($data->{'dateofbirth'}); +$data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I'); $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'}); diff --git a/newjmember.pl b/newjmember.pl index 580ca9b541..20303f9478 100755 --- a/newjmember.pl +++ b/newjmember.pl @@ -36,7 +36,6 @@ my $input = new CGI; #or insert data my $insert=$input->param('insert'); -#print $input->header; my $template = gettemplate("newjmember.tmpl"); #get rest of data -- 2.39.2