X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fhousebound.pl;h=574bacdbb1bdd1aa5978f22332d7966fb605204f;hb=b0cb7f44ef80d5f6a3d45ce87543a27637c68c6f;hp=516effc84116622e39fd79e28392581871da4ad6;hpb=656efcb5364ae09cfffb02a8ad4f13ff8f5d7db7;p=koha.git diff --git a/members/housebound.pl b/members/housebound.pl index 516effc841..574bacdbb1 100755 --- a/members/housebound.pl +++ b/members/housebound.pl @@ -27,7 +27,11 @@ use Modern::Perl; use CGI; use C4::Auth; +use C4::Context; +use C4::Members::Attributes qw(GetBorrowerAttributes); use C4::Output; +use DateTime; +use Koha::DateUtils; use Koha::Libraries; use Koha::Patrons; use Koha::Patron::Categories; @@ -43,7 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $input, type => 'intranet', authnotrequired => 0, - flagsrequired => { borrowers => 1 }, + flagsrequired => { borrowers => 'edit_borrowers' }, } ); @@ -52,17 +56,14 @@ my $method = $input->param('method') // q{}; my $visit_id = $input->param('visit_id') // q{}; # Get patron -my $patron = eval { - return Koha::Patrons->new->find($input->param('borrowernumber')); -}; -push @messages, { type => 'error', code => 'error_on_patron_load' } - if ( $@ or !$patron ); +my $borrowernumber = $input->param('borrowernumber'); +my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"; +my $patron = Koha::Patrons->find($borrowernumber); +output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } ); # Get supporting cast -my ( $branch, $category, $houseboundprofile, $visit ); -if ( $patron ) { - $branch = Koha::Libraries->new->find($patron->branchcode); - $category = Koha::Patron::Categories->new->find($patron->categorycode); +my ( $houseboundprofile, $visit ); +if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it $houseboundprofile = $patron->housebound_profile; } if ( $visit_id ) { @@ -74,20 +75,19 @@ if ( $visit_id ) { } # Main processing -my ( $houseboundvisits, $deliverers, $choosers ); -my ( $houseboundvisit, $deliverer, $chooser ); +my ( $deliverers, $choosers, $houseboundvisit ); if ( $method eq 'updateconfirm' and $houseboundprofile ) { # We have received the input from the profile edit form. We must save the # changes, and return to simple display. $houseboundprofile->set({ - day => $input->param('day') // q{}, - frequency => $input->param('frequency') // q{}, - fav_itemtypes => $input->param('fav_itemtypes') // q{}, - fav_subjects => $input->param('fav_subjects') // q{}, - fav_authors => $input->param('fav_authors') // q{}, - referral => $input->param('referral') // q{}, - notes => $input->param('notes') // q{}, + day => scalar $input->param('day') // q{}, + frequency => scalar $input->param('frequency') // q{}, + fav_itemtypes => scalar $input->param('fav_itemtypes') // q{}, + fav_subjects => scalar $input->param('fav_subjects') // q{}, + fav_authors => scalar $input->param('fav_authors') // q{}, + referral => scalar $input->param('referral') // q{}, + notes => scalar $input->param('notes') // q{}, }); my $success = eval { return $houseboundprofile->store }; push @messages, { type => 'error', code => 'error_on_profile_store' } @@ -98,13 +98,13 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { # save it, and return to simple display. $houseboundprofile = Koha::Patron::HouseboundProfile->new({ borrowernumber => $patron->borrowernumber, - day => $input->param('day') // q{}, - frequency => $input->param('frequency') // q{}, - fav_itemtypes => $input->param('fav_itemtypes') // q{}, - fav_subjects => $input->param('fav_subjects') // q{}, - fav_authors => $input->param('fav_authors') // q{}, - referral => $input->param('referral') // q{}, - notes => $input->param('notes') // q{}, + day => scalar $input->param('day') // q{}, + frequency => scalar $input->param('frequency') // q{}, + fav_itemtypes => scalar $input->param('fav_itemtypes') // q{}, + fav_subjects => scalar $input->param('fav_subjects') // q{}, + fav_authors => scalar $input->param('fav_authors') // q{}, + referral => scalar $input->param('referral') // q{}, + notes => scalar $input->param('notes') // q{}, }); my $success = eval { return $houseboundprofile->store }; push @messages, { type => 'error', code => 'error_on_profile_create' } @@ -112,8 +112,8 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { $method = undef; } elsif ( $method eq 'visit_update_or_create' ) { # We want to edit, edit a visit, so we must pass its details. - $deliverers = Koha::Patrons->new->housebound_deliverers; - $choosers = Koha::Patrons->new->housebound_choosers; + $deliverers = Koha::Patrons->search_housebound_deliverers; + $choosers = Koha::Patrons->search_housebound_choosers; $houseboundvisit = $visit; } elsif ( $method eq 'visit_delete' and $visit ) { # We want ot delete a specific visit. @@ -125,11 +125,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { # We have received input for editing a visit. We must store and return to # simple display. $visit->set({ - borrowernumber => $input->param('borrowernumber') // q{}, - appointment_date => $input->param('date') // q{}, - day_segment => $input->param('segment') // q{}, - chooser_brwnumber => $input->param('chooser') // q{}, - deliverer_brwnumber => $input->param('deliverer') // q{}, + borrowernumber => scalar $input->param('borrowernumber') // q{}, + appointment_date => dt_from_string($input->param('date') // q{}), + day_segment => scalar $input->param('segment') // q{}, + chooser_brwnumber => scalar $input->param('chooser') // q{}, + deliverer_brwnumber => scalar $input->param('deliverer') // q{}, }); my $success = eval { return $visit->store }; push @messages, { type => 'error', code => 'error_on_visit_store' } @@ -139,11 +139,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { # We have received input for creating a visit. We must store and return # to simple display. my $visit = Koha::Patron::HouseboundVisit->new({ - borrowernumber => $input->param('borrowernumber') // q{}, - appointment_date => $input->param('date') // q{}, - day_segment => $input->param('segment') // q{}, - chooser_brwnumber => $input->param('chooser') // q{}, - deliverer_brwnumber => $input->param('deliverer') // q{}, + borrowernumber => scalar $input->param('borrowernumber') // q{}, + appointment_date => dt_from_string($input->param('date') // q{}), + day_segment => scalar $input->param('segment') // q{}, + chooser_brwnumber => scalar $input->param('chooser') // q{}, + deliverer_brwnumber => scalar $input->param('deliverer') // q{}, }); my $success = eval { return $visit->store }; push @messages, { type => 'error', code => 'error_on_visit_create' } @@ -154,12 +154,21 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) { # We don't have any profile information, so we must display a creation form. $method = 'update_or_create' if ( !$houseboundprofile ); +# Ensure template has all patron details. +$template->param( patron => $patron ); + +# Load extended patron attributes if necessary (taken from members/files.pl). +if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) { + my $attributes = GetBorrowerAttributes($patron->borrowernumber); + $template->param( + ExtendedPatronAttributes => 1, + extendedattributes => $attributes + ); +} + $template->param( - patron => $patron, housebound_profile => $houseboundprofile, visit => $houseboundvisit, - branch => $branch, - category => $category, messages => \@messages, method => $method, choosers => $choosers,