Attachment #18282 for bug #8215

View | Details | Raw Unified | Return to bug 8215
Collapse All | Expand All




package C4::CourseReserves;

# 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., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use Modern::Perl;

require Exporter;

use C4::Context;
use C4::Items qw(GetItem ModItem);
use C4::Biblio qw(GetBiblioFromItemNumber);
use C4::Circulation qw(GetOpenIssue);

use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG @FIELDS);

BEGIN {
    @ISA    = qw(Exporter);
    @EXPORT = qw(
      &GetCourse
      &ModCourse
      &GetCourses
      &DelCourse

      &GetCourseInstructors
      &ModCourseInstructors

      &GetCourseItem
      &ModCourseItem

      &GetCourseReserve
      &ModCourseReserve
      &GetCourseReserves
      &DelCourseReserve

      &SearchCourses

      &GetItemReservesInfo
    );

    $DEBUG = 0;
    @FIELDS = ( 'itype', 'ccode', 'holdingbranch', 'location' );
}

=head1 NAME

C4::CourseReserves - Koha course reserves module

=head1 SYNOPSIS

use C4::CourseReserves;

=head1 DESCRIPTION

This module deals with course reserves.

=head1 FUNCTIONS

=head2 GetCourse

    $course = GetCourse( $course_id );

=cut

sub GetCourse {
    my ($course_id) = @_;
    warn whoami() . "( $course_id )" if $DEBUG;

    my $query = "SELECT * FROM courses WHERE course_id = ?";
    my $dbh   = C4::Context->dbh;
    my $sth   = $dbh->prepare($query);
    $sth->execute($course_id);

    my $course = $sth->fetchrow_hashref();

    $query = "
        SELECT b.* FROM course_instructors ci
        LEFT JOIN borrowers b ON ( ci.borrowernumber = b.borrowernumber )
        WHERE course_id =  ?
    ";
    $sth = $dbh->prepare($query);
    $sth->execute($course_id);
    $course->{'instructors'} = $sth->fetchall_arrayref( {} );

    return $course;
}

=head2 ModCourse

    ModCourse( [ course_id => $id ] [, course_name => $course_name ] [etc...] );

=cut

sub ModCourse {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $dbh = C4::Context->dbh;

    my $course_id;
    if ( defined $params{'course_id'} ) {
        $course_id = $params{'course_id'};
        delete $params{'course_id'};
    }

    my @query_keys;
    my @query_values;

    my $query;

    $query .= ($course_id) ? ' UPDATE ' : ' INSERT ';
    $query .= ' courses SET ';

    foreach my $key ( keys %params ) {
        push( @query_keys,   "$key=?" );
        push( @query_values, $params{$key} );
    }
    $query .= join( ',', @query_keys );

    if ($course_id) {
        $query .= " WHERE course_id = ?";
        push( @query_values, $course_id );
    }

    $dbh->do( $query, undef, @query_values );

    $course_id = $course_id
      || $dbh->last_insert_id( undef, undef, 'courses', 'course_id' );

    EnableOrDisableCourseItems(
        course_id => $course_id,
        enabled   => $params{'enabled'}
    );

    return $course_id;
}

=head2 GetCourses

  @courses = GetCourses( [ fieldname => $value ] [, fieldname2 => $value2 ] [etc...] );

=cut

sub GetCourses {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my @query_keys;
    my @query_values;

    my $query = "
        SELECT courses.*
        FROM courses
        LEFT JOIN course_reserves ON course_reserves.course_id = courses.course_id
        LEFT JOIN course_items ON course_items.ci_id = course_reserves.ci_id
    ";

    if ( keys %params ) {

        $query .= " WHERE ";

        foreach my $key ( keys %params ) {
            push( @query_keys,   " $key LIKE ? " );
            push( @query_values, $params{$key} );
        }

        $query .= join( ' AND ', @query_keys );
    }

    $query .= " GROUP BY courses.course_id ";

    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute(@query_values);

    my $courses = $sth->fetchall_arrayref( {} );

    foreach my $c (@$courses) {
        $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} );
    }

    return $courses;
}

=head2 DelCourse

  DelCourse( $course_id );

=cut

sub DelCourse {
    my ($course_id) = @_;

    my $course_reserves = GetCourseReserves( course_id => $course_id );

    foreach my $res (@$course_reserves) {
        DelCourseReserve( cr_id => $res->{'cr_id'} );
    }

    my $query = "
        DELETE FROM course_instructors
        WHERE course_id = ?
    ";
    C4::Context->dbh->do( $query, undef, $course_id );

    $query = "
        DELETE FROM courses
        WHERE course_id = ?
    ";
    C4::Context->dbh->do( $query, undef, $course_id );
}

=head2 EnableOrDisableCourseItems

  EnableOrDisableCourseItems( course_id => $course_id, enabled => $enabled );

  For each item on reserve for this course,
  if the course item has no active course reserves,
  swap the fields for the item to make it 'normal'
  again.

  enabled => 'yes' to enable course items
  enabled => 'no' to disable course items

=cut

sub EnableOrDisableCourseItems {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $course_id = $params{'course_id'};
    my $enabled   = $params{'enabled'} || 0;

    my $lookfor = ( $enabled eq 'yes' ) ? 'no' : 'yes';

    return unless ( $course_id && $enabled );
    return unless ( $enabled eq 'yes' || $enabled eq 'no' );

    my $course_reserves = GetCourseReserves( course_id => $course_id );

    if ( $enabled eq 'yes' ) {
        foreach my $course_reserve (@$course_reserves) {
            if (
                CountCourseReservesForItem(
                    ci_id   => $course_reserve->{'ci_id'},
                    enabled => 'yes'
                )
              )
            {
                EnableOrDisableCourseItem(
                    ci_id   => $course_reserve->{'ci_id'},
                    enabled => 'yes',
                );
            }
        }
    }
    if ( $enabled eq 'no' ) {
        foreach my $course_reserve (@$course_reserves) {
            unless (
                CountCourseReservesForItem(
                    ci_id   => $course_reserve->{'ci_id'},
                    enabled => 'yes'
                )
              )
            {
                EnableOrDisableCourseItem(
                    ci_id   => $course_reserve->{'ci_id'},
                    enabled => 'no',
                );
            }
        }
    }
}

=head2 EnableOrDisableCourseItem

    EnableOrDisableCourseItem( ci_id => $ci_id, enabled => $enabled );

    enabled => 'yes' to enable course items
    enabled => 'no' to disable course items

=cut

sub EnableOrDisableCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id   = $params{'ci_id'};
    my $enabled = $params{'enabled'};

    return unless ( $ci_id && $enabled );
    return unless ( $enabled eq 'yes' || $enabled eq 'no' );

    my $course_item = GetCourseItem( ci_id => $ci_id );

    ## We don't want to 'enable' an already enabled item,
    ## or disable and already disabled item,
    ## as that would cause the fields to swap
    if ( $course_item->{'enabled'} ne $enabled ) {
        _SwapAllFields($ci_id);

        my $query = "
            UPDATE course_items
            SET enabled = ?
            WHERE ci_id = ?
        ";

        C4::Context->dbh->do( $query, undef, $enabled, $ci_id );

    }

}

=head2 GetCourseInstructors

    @$borrowers = GetCourseInstructors( $course_id );

=cut

sub GetCourseInstructors {
    my ($course_id) = @_;
    warn "C4::CourseReserves::GetCourseInstructors( $course_id )"
      if $DEBUG;

    my $query = "
        SELECT * FROM borrowers
        RIGHT JOIN course_instructors ON ( course_instructors.borrowernumber = borrowers.borrowernumber )
        WHERE course_instructors.course_id = ?
    ";

    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute($course_id);

    return $sth->fetchall_arrayref( {} );
}

=head2 ModCourseInstructors

    ModCourseInstructors( mode => $mode, course_id => $course_id, [ cardnumbers => $cardnumbers ] OR [ borrowernumbers => $borrowernumbers  );

    $mode can be 'replace', 'add', or 'delete'

    $cardnumbers and $borrowernumbers are both references to arrays

    Use either cardnumbers or borrowernumber, but not both.

=cut

sub ModCourseInstructors {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $course_id       = $params{'course_id'};
    my $mode            = $params{'mode'};
    my $cardnumbers     = $params{'cardnumbers'};
    my $borrowernumbers = $params{'borrowernumbers'};

    return unless ($course_id);
    return
      unless ( $mode eq 'replace'
        || $mode eq 'add'
        || $mode eq 'delete' );
    return unless ( $cardnumbers || $borrowernumbers );
    return if ( $cardnumbers && $borrowernumbers );

    my @cardnumbers = @$cardnumbers if ( ref($cardnumbers) eq 'ARRAY' );
    my @borrowernumbers = @$borrowernumbers
      if ( ref($borrowernumbers) eq 'ARRAY' );

    my $field  = (@cardnumbers) ? 'cardnumber' : 'borrowernumber';
    my @fields = (@cardnumbers) ? @cardnumbers : @borrowernumbers;
    my $placeholders = join( ',', ('?') x scalar @fields );

    my $dbh = C4::Context->dbh;

    $dbh->do( "DELETE FROM course_instructors WHERE course_id = ?",
        undef, $course_id )
      if ( $mode eq 'replace' );

    my $query;

    if ( $mode eq 'add' || $mode eq 'replace' ) {
        $query = "
            INSERT INTO course_instructors ( course_id, borrowernumber )
            SELECT ?, borrowernumber
            FROM borrowers
            WHERE $field IN ( $placeholders )
        ";
    }
    else {
        $query = "
            DELETE FROM course_instructors
            WHERE course_id = ?
            AND borrowernumber IN (
                SELECT borrowernumber FROM borrowers WHERE $field IN ( $placeholders )
            )
        ";
    }

    my $sth = $dbh->prepare($query);

    $sth->execute( $course_id, @fields ) if (@fields);
}

=head2 GetCourseItem {

  $course_item = GetCourseItem( itemnumber => $itemnumber [, ci_id => $ci_id );

=cut

sub GetCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id      = $params{'ci_id'};
    my $itemnumber = $params{'itemnumber'};

    return unless ( $itemnumber || $ci_id );

    my $field = ($itemnumber) ? 'itemnumber' : 'ci_id';
    my $value = ($itemnumber) ? $itemnumber  : $ci_id;

    my $query = "SELECT * FROM course_items WHERE $field = ?";
    my $dbh   = C4::Context->dbh;
    my $sth   = $dbh->prepare($query);
    $sth->execute($value);

    my $course_item = $sth->fetchrow_hashref();

    if ($course_item) {
        $query = "SELECT * FROM course_reserves WHERE ci_id = ?";
        $sth   = $dbh->prepare($query);
        $sth->execute( $course_item->{'ci_id'} );
        my $course_reserves = $sth->fetchall_arrayref( {} );

        $course_item->{'course_reserves'} = $course_reserves
          if ($course_reserves);
    }
    return $course_item;
}

=head2 ModCourseItem {

  ModCourseItem( %params );

  Creates or modifies an existing course item.

=cut

sub ModCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $itemnumber    = $params{'itemnumber'};
    my $itype         = $params{'itype'};
    my $ccode         = $params{'ccode'};
    my $holdingbranch = $params{'holdingbranch'};
    my $location      = $params{'location'};

    return unless ($itemnumber);

    my $course_item = GetCourseItem( itemnumber => $itemnumber );

    my $ci_id;

    if ($course_item) {
        $ci_id = $course_item->{'ci_id'};

        _UpdateCourseItem(
            ci_id       => $ci_id,
            course_item => $course_item,
            %params
        );
    }
    else {
        $ci_id = _AddCourseItem(%params);
    }

    return $ci_id;

}

=head2 _AddCourseItem

    my $ci_id = _AddCourseItem( %params );

=cut

sub _AddCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my ( @fields, @values );

    push( @fields, 'itemnumber = ?' );
    push( @values, $params{'itemnumber'} );

    foreach (@FIELDS) {
        if ( $params{$_} ) {
            push( @fields, "$_ = ?" );
            push( @values, $params{$_} );
        }
    }

    my $query = "INSERT INTO course_items SET " . join( ',', @fields );
    my $dbh = C4::Context->dbh;
    $dbh->do( $query, undef, @values );

    my $ci_id = $dbh->last_insert_id( undef, undef, 'course_items', 'ci_id' );

    return $ci_id;
}

=head2 _UpdateCourseItem

  _UpdateCourseItem( %params );

=cut

sub _UpdateCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id         = $params{'ci_id'};
    my $course_item   = $params{'course_item'};
    my $itype         = $params{'itype'};
    my $ccode         = $params{'ccode'};
    my $holdingbranch = $params{'holdingbranch'};
    my $location      = $params{'location'};

    return unless ( $ci_id || $course_item );

    $course_item = GetCourseItem( ci_id => $ci_id )
      unless ($course_item);
    $ci_id = $course_item->{'ci_id'} unless ($ci_id);

    ## Revert fields that had an 'original' value, but now don't
    ## Update the item fields to the stored values from course_items
    ## and then set those fields in course_items to NULL
    my @fields_to_revert;
    foreach (@FIELDS) {
        if ( !$params{$_} && $course_item->{$_} ) {
            push( @fields_to_revert, $_ );
        }
    }
    _RevertFields(
        ci_id       => $ci_id,
        fields      => \@fields_to_revert,
        course_item => $course_item
    ) if (@fields_to_revert);

    ## Update fields that still have an original value, but it has changed
    ## This necessitates only changing the current item values, as we still
    ## have the original values stored in course_items
    my %mod_params;
    foreach (@FIELDS) {
        if (   $params{$_}
            && $course_item->{$_}
            && $params{$_} ne $course_item->{$_} )
        {
            $mod_params{$_} = $params{$_};
        }
    }
    ModItem( \%mod_params, undef, $course_item->{'itemnumber'} );

    ## Update fields that didn't have an original value, but now do
    ## We must save the original value in course_items, and also
    ## update the item fields to the new value
    my $item = GetItem( $course_item->{'itemnumber'} );
    my %mod_params_new;
    my %mod_params_old;
    foreach (@FIELDS) {
        if ( $params{$_} && !$course_item->{$_} ) {
            $mod_params_new{$_} = $params{$_};
            $mod_params_old{$_} = $item->{$_};
        }
    }
    _ModStoredFields( 'ci_id' => $params{'ci_id'}, %mod_params_old );
    ModItem( \%mod_params_new, undef, $course_item->{'itemnumber'} );

}

=head2 _ModStoredFields

    _ModStoredFields( %params );

    Updates the values for the 'original' fields in course_items
    for a given ci_id

=cut

sub _ModStoredFields {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    return unless ( $params{'ci_id'} );

    my ( @fields_to_update, @values_to_update );

    foreach (@FIELDS) {
        if ( $params{$_} ) {
            push( @fields_to_update, $_ );
            push( @values_to_update, $params{$_} );
        }
    }

    my $query =
        "UPDATE course_items SET "
      . join( ',', map { "$_=?" } @fields_to_update )
      . " WHERE ci_id = ?";

    C4::Context->dbh->do( $query, undef, @values_to_update, $params{'ci_id'} )
      if (@values_to_update);

}

=head2 _RevertFields

    _RevertFields( ci_id => $ci_id, fields => \@fields_to_revert );

=cut

sub _RevertFields {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id       = $params{'ci_id'};
    my $course_item = $params{'course_item'};
    my $fields      = $params{'fields'};
    my @fields      = @$fields;

    return unless ($ci_id);

    $course_item = GetCourseItem( ci_id => $params{'ci_id'} )
      unless ($course_item);

    my $mod_item_params;
    my @fields_to_null;
    foreach my $field (@fields) {
        foreach (@FIELDS) {
            if ( $field eq $_ && $course_item->{$_} ) {
                $mod_item_params->{$_} = $course_item->{$_};
                push( @fields_to_null, $_ );
            }
        }
    }
    ModItem( $mod_item_params, undef, $course_item->{'itemnumber'} );

    my $query =
        "UPDATE course_items SET "
      . join( ',', map { "$_=NULL" } @fields_to_null )
      . " WHERE ci_id = ?";

    C4::Context->dbh->do( $query, undef, $ci_id ) if (@fields_to_null);
}

=head2 _SwapAllFields

    _SwapAllFields( $ci_id );

=cut

sub _SwapAllFields {
    my ($ci_id) = @_;
    warn "C4::CourseReserves::_SwapFields( $ci_id )" if $DEBUG;

    my $course_item = GetCourseItem( ci_id => $ci_id );
    my $item = GetItem( $course_item->{'itemnumber'} );

    my %course_item_fields;
    my %item_fields;
    foreach (@FIELDS) {
        if ( $course_item->{$_} ) {
            $course_item_fields{$_} = $course_item->{$_};
            $item_fields{$_}        = $item->{$_};
        }
    }

    ModItem( \%course_item_fields, undef, $course_item->{'itemnumber'} );
    _ModStoredFields( %item_fields, ci_id => $ci_id );
}

=head2 GetCourseItems {

  $course_items = GetCourseItems(
      [course_id => $course_id]
      [, itemnumber => $itemnumber ]
  );

=cut

sub GetCourseItems {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $course_id  = $params{'course_id'};
    my $itemnumber = $params{'itemnumber'};

    return unless ($course_id);

    my @query_keys;
    my @query_values;

    my $query = "SELECT * FROM course_items";

    if ( keys %params ) {

        $query .= " WHERE ";

        foreach my $key ( keys %params ) {
            push( @query_keys,   " $key LIKE ? " );
            push( @query_values, $params{$key} );
        }

        $query .= join( ' AND ', @query_keys );
    }

    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute(@query_values);

    return $sth->fetchall_arrayref( {} );
}

=head2 DelCourseItem {

  DelCourseItem( ci_id => $cr_id );

=cut

sub DelCourseItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id = $params{'ci_id'};

    return unless ($ci_id);

    _RevertFields( ci_id => $ci_id, fields => \@FIELDS );

    my $query = "
        DELETE FROM course_items
        WHERE ci_id = ?
    ";
    C4::Context->dbh->do( $query, undef, $ci_id );
}

=head2 GetCourseReserve {

  $course_item = GetCourseReserve( %params );

=cut

sub GetCourseReserve {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $cr_id     = $params{'cr_id'};
    my $course_id = $params{'course_id'};
    my $ci_id     = $params{'ci_id'};

    return unless ( $cr_id || ( $course_id && $ci_id ) );

    my $dbh = C4::Context->dbh;
    my $sth;

    if ($cr_id) {
        my $query = "
            SELECT * FROM course_reserves
            WHERE cr_id = ?
        ";
        $sth = $dbh->prepare($query);
        $sth->execute($cr_id);
    }
    else {
        my $query = "
            SELECT * FROM course_reserves
            WHERE course_id = ? AND ci_id = ?
        ";
        $sth = $dbh->prepare($query);
        $sth->execute( $course_id, $ci_id );
    }

    my $course_reserve = $sth->fetchrow_hashref();
    return $course_reserve;
}

=head2 ModCourseReserve

    $id = ModCourseReserve( %params );

=cut

sub ModCourseReserve {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $course_id   = $params{'course_id'};
    my $ci_id       = $params{'ci_id'};
    my $staff_note  = $params{'staff_note'};
    my $public_note = $params{'public_note'};

    return unless ( $course_id && $ci_id );

    my $course_reserve =
      GetCourseReserve( course_id => $course_id, ci_id => $ci_id );
    my $cr_id;

    my $dbh = C4::Context->dbh;

    if ($course_reserve) {
        $cr_id = $course_reserve->{'cr_id'};

        my $query = "
            UPDATE course_reserves
            SET staff_note = ?, public_note = ?
            WHERE cr_id = ?
        ";
        $dbh->do( $query, undef, $staff_note, $public_note, $cr_id );
    }
    else {
        my $query = "
            INSERT INTO course_reserves SET
            course_id = ?,
            ci_id = ?,
            staff_note = ?,
            public_note = ?
        ";
        $dbh->do( $query, undef, $course_id, $ci_id, $staff_note,
            $public_note );
        $cr_id =
          $dbh->last_insert_id( undef, undef, 'course_reserves', 'cr_id' );
    }

    my $course = GetCourse($course_id);
    EnableOrDisableCourseItem(
        ci_id   => $params{'ci_id'},
        enabled => $course->{'enabled'}
    );

    return $cr_id;
}

=head2 GetCourseReserves {

  $course_reserves = GetCourseReserves( %params );

  Required:
      course_id OR ci_id
  Optional:
      include_items   => 1,
      include_count   => 1,
      include_courses => 1,

=cut

sub GetCourseReserves {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $course_id     = $params{'course_id'};
    my $ci_id         = $params{'ci_id'};
    my $include_items = $params{'include_items'};
    my $include_count = $params{'include_count'};
    my $include_courses = $params{'include_courses'};

    return unless ( $course_id || $ci_id );

    my $field = ($course_id) ? 'course_id' : 'ci_id';
    my $value = ($course_id) ? $course_id  : $ci_id;

    my $query = "
        SELECT cr.*, ci.itemnumber
        FROM course_reserves cr, course_items ci
        WHERE cr.$field = ?
        AND cr.ci_id = ci.ci_id
    ";
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute($value);

    my $course_reserves = $sth->fetchall_arrayref( {} );

    if ($include_items) {
        foreach my $cr (@$course_reserves) {
            $cr->{'course_item'} = GetCourseItem( ci_id => $cr->{'ci_id'} );
            $cr->{'item'} = GetBiblioFromItemNumber( $cr->{'itemnumber'} );
            $cr->{'issue'} = GetOpenIssue( $cr->{'itemnumber'} );
        }
    }

    if ($include_count) {
        foreach my $cr (@$course_reserves) {
            $cr->{'reserves_count'} =
              CountCourseReservesForItem( ci_id => $cr->{'ci_id'} );
        }
    }

    if ($include_courses) {
        foreach my $cr (@$course_reserves) {
            $cr->{'courses'} =
              GetCourses( itemnumber => $cr->{'itemnumber'} );
        }
    }

    return $course_reserves;
}

=head2 DelCourseReserve {

  DelCourseReserve( cr_id => $cr_id );

=cut

sub DelCourseReserve {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $cr_id = $params{'cr_id'};

    return unless ($cr_id);

    my $dbh = C4::Context->dbh;

    my $course_reserve = GetCourseReserve( cr_id => $cr_id );

    my $query = "
        DELETE FROM course_reserves
        WHERE cr_id = ?
    ";
    $dbh->do( $query, undef, $cr_id );

    ## If there are no other course reserves for this item
    ## delete the course_item as well
    unless ( CountCourseReservesForItem( ci_id => $course_reserve->{'ci_id'} ) )
    {
        DelCourseItem( ci_id => $course_reserve->{'ci_id'} );
    }

}

=head2 GetReservesInfo

    my $arrayref = GetItemReservesInfo( itemnumber => $itemnumber );

    For a given item, returns an arrayref of reserves hashrefs,
    with a course hashref under the key 'course'

=cut

sub GetItemReservesInfo {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $itemnumber = $params{'itemnumber'};

    return unless ($itemnumber);

    my $course_item = GetCourseItem( itemnumber => $itemnumber );

    return unless ( keys %$course_item );

    my $course_reserves = GetCourseReserves( ci_id => $course_item->{'ci_id'} );

    foreach my $cr (@$course_reserves) {
        $cr->{'course'} = GetCourse( $cr->{'course_id'} );
    }

    return $course_reserves;
}

=head2 CountCourseReservesForItem

    $bool = CountCourseReservesForItem( %params );

    ci_id - course_item id
    OR
    itemnumber - course_item itemnumber

    enabled = 'yes' or 'no'
    Optional, if not supplied, counts reserves
    for both enabled and disabled courses

=cut

sub CountCourseReservesForItem {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $ci_id      = $params{'ci_id'};
    my $itemnumber = $params{'itemnumber'};
    my $enabled    = $params{'enabled'};

    return unless ( $ci_id || $itemnumber );

    my $course_item =
      GetCourseItem( ci_id => $ci_id, itemnumber => $itemnumber );

    my @params = ( $course_item->{'ci_id'} );
    push( @params, $enabled ) if ($enabled);

    my $query = "
        SELECT COUNT(*) AS count
        FROM course_reserves cr
        LEFT JOIN courses c ON ( c.course_id = cr.course_id )
        WHERE ci_id = ?
    ";
    $query .= "AND c.enabled = ?" if ($enabled);

    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute(@params);

    my $row = $sth->fetchrow_hashref();

    return $row->{'count'};
}

=head2 SearchCourses

    my $courses = SearchCourses( term => $search_term, enabled => 'yes' );

=cut

sub SearchCourses {
    my (%params) = @_;
    warn identify_myself(%params) if $DEBUG;

    my $term = $params{'term'};

    my $enabled = $params{'enabled'} || '%';

    my @params;
    my $query = "SELECT c.* FROM courses c";

    $query .= "
        LEFT JOIN course_instructors ci
            ON ( c.course_id = ci.course_id )
        LEFT JOIN borrowers b
            ON ( ci.borrowernumber = b.borrowernumber )
        LEFT JOIN authorised_values av
            ON ( c.department = av.authorised_value )
        WHERE
            ( av.category = 'DEPARTMENT' OR av.category = 'TERM' )
            AND
            (
                department LIKE ? OR
                course_number LIKE ? OR
                section LIKE ? OR
                course_name LIKE ? OR
                term LIKE ? OR
                public_note LIKE ? OR
                CONCAT(surname,' ',firstname) LIKE ? OR
                CONCAT(firstname,' ',surname) LIKE ? OR
                lib LIKE ? OR
                lib_opac LIKE ?
           )
           AND
           c.enabled LIKE ?
        GROUP BY c.course_id
    ";

    $term   = "%$term%";
    @params = ($term) x 10;

    $query .= " ORDER BY department, course_number, section, term, course_name ";

    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);

    $sth->execute(@params, $enabled);

    my $courses = $sth->fetchall_arrayref( {} );

    foreach my $c (@$courses) {
        $c->{'instructors'} = GetCourseInstructors( $c->{'course_id'} );
    }

    return $courses;
}

sub whoami  { ( caller(1) )[3] }
sub whowasi { ( caller(2) )[3] }

sub stringify_params {
    my (%params) = @_;

    my $string = "\n";

    foreach my $key ( keys %params ) {
        $string .= "    $key => " . $params{$key} . "\n";
    }

    return "( $string )";
}

sub identify_myself {
    my (%params) = @_;

    return whowasi() . stringify_params(%params);
}

1;

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

Lines 206-215 sub GetSupportList{ Link Here

(-)a/C4/Koha.pm (-5 / +17 lines)
206	}	206	}
207	=head2 GetItemTypes	207	=head2 GetItemTypes
208		208
209	$itemtypes = &GetItemTypes();	209	$itemtypes = &GetItemTypes( style => $style );
210		210
211	Returns information about existing itemtypes.	211	Returns information about existing itemtypes.
212		212
		213	Params:
		214	style: either 'array' or 'hash', defaults to 'hash'.
		215	'array' returns an arrayref,
		216	'hash' return a hashref with the itemtype value as the key
		217
213	build a HTML select with the following code :	218	build a HTML select with the following code :
214		219
215	=head3 in PERL SCRIPT	220	=head3 in PERL SCRIPT
Lines 242-247 build a HTML select with the following code : Link Here
242	=cut	247	=cut
243		248
244	sub GetItemTypes {	249	sub GetItemTypes {
		250	my ( %params ) = @_;
		251	my $style = defined( $params{'style'} ) ? $params{'style'} : 'hash';
245		252
246	# returns a reference to a hash of references to itemtypes...	253	# returns a reference to a hash of references to itemtypes...
247	my %itemtypes;	254	my %itemtypes;
Lines 252-261 sub GetItemTypes { Link Here
252	\|;	259	\|;
253	my $sth = $dbh->prepare($query);	260	my $sth = $dbh->prepare($query);
254	$sth->execute;	261	$sth->execute;
255	while ( my $IT = $sth->fetchrow_hashref ) {	262
256	$itemtypes{ $IT->{'itemtype'} } = $IT;	263	if ( $style eq 'hash' ) {
		264	while ( my $IT = $sth->fetchrow_hashref ) {
		265	$itemtypes{ $IT->{'itemtype'} } = $IT;
		266	}
		267	return ( \%itemtypes );
		268	} else {
		269	return $sth->fetchall_arrayref({});
257	}	270	}
258	return ( \%itemtypes );
259	}	271	}
260		272
261	sub get_itemtypeinfos_of {	273	sub get_itemtypeinfos_of {
Lines 1130-1136 sub IsAuthorisedValueCategory { Link Here
1130		1142
1131	=head2 GetAuthorisedValueByCode	1143	=head2 GetAuthorisedValueByCode
1132		1144
1133	$authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode );	1145	$authorised_value = GetAuthorisedValueByCode( $category, $authvalcode, $opac );
1134		1146
1135	Return the lib attribute from authorised_values from the row identified	1147	Return the lib attribute from authorised_values from the row identified
1136	by the passed category and code	1148	by the passed category and code




package Koha::Template::Plugin::AuthorisedValues;

# Copyright ByWater Solutions 2012

# 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 Modern::Perl;

use Template::Plugin;
use base qw( Template::Plugin );

use Encode qw{encode decode};

use C4::Koha;

sub GetByCode {
    my ( $self, $category, $code, $opac ) = @_;
    return encode('UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) );
}

1;




package Koha::Template::Plugin::Branches;

# Copyright ByWater Solutions 2012

# 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 Modern::Perl;

use Template::Plugin;
use base qw( Template::Plugin );

use C4::Koha;

sub GetName {
    my ( $self, $branchcode ) = @_;

    my $query = "SELECT branchname FROM branches WHERE branchcode = ?";
    my $sth   = C4::Context->dbh->prepare($query);
    $sth->execute($branchcode);
    my $b = $sth->fetchrow_hashref();
    return $b->{'branchname'};
}

1;




package Koha::Template::Plugin::ItemTypes;

# Copyright ByWater Solutions 2012

# 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 Modern::Perl;

use Template::Plugin;
use base qw( Template::Plugin );

use C4::Koha;

sub GetDescription {
    my ( $self, $itemtype ) = @_;

    my $query = "SELECT description FROM itemtypes WHERE itemtype = ?";
    my $sth   = C4::Context->dbh->prepare($query);
    $sth->execute($itemtype);
    my $d = $sth->fetchrow_hashref();
    return $d->{'description'};

}

1;

Lines 265-270 my $target_map = { Link Here

(-)a/Makefile.PL (+1 lines)
265	'./changelanguage.pl' => 'INTRANET_CGI_DIR',	265	'./changelanguage.pl' => 'INTRANET_CGI_DIR',
266	'./check_sysprefs.pl' => 'NONE',	266	'./check_sysprefs.pl' => 'NONE',
267	'./circ' => 'INTRANET_CGI_DIR',	267	'./circ' => 'INTRANET_CGI_DIR',
		268	'./course_reserves' => 'INTRANET_CGI_DIR',
268	'./offline_circ' => 'INTRANET_CGI_DIR',	269	'./offline_circ' => 'INTRANET_CGI_DIR',
269	'./edithelp.pl' => 'INTRANET_CGI_DIR',	270	'./edithelp.pl' => 'INTRANET_CGI_DIR',
270	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },	271	'./etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 },

Lines 247-253 sub default_form { Link Here

(-)a/admin/authorised_values.pl (-1 / +1 lines)
247	}	247	}
248		248
249	# push koha system categories	249	# push koha system categories
250	foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) {	250	foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP DEPARTMENT TERM)) {
251	push @category_list, $_ unless $categories{$_};	251	push @category_list, $_ unless $categories{$_};
252	}	252	}
253		253

Lines 41-46 use C4::XSLT; Link Here

(-)a/catalogue/detail.pl (+5 lines)
41	use C4::Images;	41	use C4::Images;
42	use Koha::DateUtils;	42	use Koha::DateUtils;
43	use C4::HTML5Media;	43	use C4::HTML5Media;
		44	use C4::CourseReserves;
44		45
45	# use Smart::Comments;	46	# use Smart::Comments;
46		47
Lines 269-274 foreach my $item (@items) { Link Here
269	$materials_flag = 1;	270	$materials_flag = 1;
270	}	271	}
271		272
		273	if ( C4::Context->preference('UseCourseReserves') ) {
		274	$item->{'course_reserves'} = GetItemReservesInfo( itemnumber => $item->{'itemnumber'} );
		275	}
		276
272	if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"	277	if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
273	and C4::Context->preference('SeparateHoldings')) {	278	and C4::Context->preference('SeparateHoldings')) {
274	if ($itembranchcode and $itembranchcode eq $currentbranch) {	279	if ($itembranchcode and $itembranchcode eq $currentbranch) {




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use C4::Koha;
use C4::Biblio;
use C4::Branch;

use C4::CourseReserves;

my $cgi = new CGI;

my $action    = $cgi->param('action')    || '';
my $course_id = $cgi->param('course_id') || '';
my $barcode   = $cgi->param('barcode')   || '';

die('No course_id provided') unless ($course_id);

my $item = GetBiblioFromItemNumber( undef, $barcode );

my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "course_reserves/add_items-step$step.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { coursereserves => 'add_reserves' },
    }
);
$template->param( ERROR_BARCODE_NOT_FOUND => $barcode )
  unless ( $barcode && $item && $action eq 'lookup' );

$template->param( course => GetCourse($course_id) );

if ( $action eq 'lookup' ) {
    my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
    my $course_reserve = ($course_item)
      ? GetCourseReserve(
        course_id => $course_id,
        ci_id     => $course_item->{'ci_id'}
      )
      : undef;

    $template->param(
        item           => $item,
        course_item    => $course_item,
        course_reserve => $course_reserve,

        ccodes    => GetAuthorisedValues('CCODE'),
        locations => GetAuthorisedValues('LOC'),
        itypes    => GetItemTypes( style => 'array' ),
        branches  => GetBranchesLoop(),
    );

}
elsif ( $action eq 'add' ) {
    my $ci_id = ModCourseItem(
        itemnumber    => $cgi->param('itemnumber'),
        itype         => $cgi->param('itype'),
        ccode         => $cgi->param('ccode'),
        holdingbranch => $cgi->param('holdingbranch'),
        location      => $cgi->param('location'),
    );

    my $cr_id = ModCourseReserve(
        course_id   => $course_id,
        ci_id       => $ci_id,
        staff_note  => $cgi->param('staff_note'),
        public_note => $cgi->param('public_note'),
    );
}

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use C4::Koha;

use C4::CourseReserves;

my $cgi = new CGI;

my $action = $cgi->param('action') || '';
my $course_id = $cgi->param('course_id');

my $flagsrequired;
$flagsrequired->{coursereserves} = 'delete_reserves' if ( $action eq 'del_reserve' );

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "course_reserves/course-details.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => $flagsrequired,
    }
);

die("No course_id given") unless ($course_id);

if ( $action eq 'del_reserve' ) {
    DelCourseReserve( cr_id => $cgi->param('cr_id') );
}

my $course          = GetCourse($course_id);
my $course_reserves = GetCourseReserves(
    course_id       => $course_id,
    include_items   => 1,
    include_courses => 1
);

$template->param(
    course          => $course,
    course_reserves => $course_reserves,
);

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;

use C4::CourseReserves;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "course_reserves/course-reserves.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => {},
    }
);

my $search_on = $cgi->param('search_on');
my %params;
if ($search_on) {
    $params{'course_name'} = "%$search_on%";
}

my $courses = GetCourses(%params);
if ( $search_on && @$courses == 1 ) {
    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=" . $courses->[0]->{'course_id'});
} else {
    $template->param( courses => $courses );
    output_html_with_http_headers $cgi, $cookie, $template->output;
}




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use C4::Koha;

use C4::CourseReserves;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "course_reserves/course.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { coursereserves => 'manage_courses' },
    }
);

my $course_id = $cgi->param('course_id');

if ($course_id) {
    my $course = GetCourse($course_id);
    $template->param(%$course);
}

$template->param(
    departments => GetAuthorisedValues('DEPARTMENT'),
    terms => GetAuthorisedValues('TERM'),
);

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2012 ByWater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Output;
use C4::Reserves;
use C4::Auth;

use C4::CourseReserves;

my $cgi = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "about.tmpl",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { coursereserves => 'manage_courses' },
    }
);

my $action = $cgi->param('action');

if ( $action eq 'del' ) {
    DelCourse( $cgi->param('course_id') );
    print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl");
}
else {
    my %params;

    $params{'course_id'} = $cgi->param('course_id')
      if ( $cgi->param('course_id') );
    $params{'department'}     = $cgi->param('department');
    $params{'course_number'}  = $cgi->param('course_number');
    $params{'section'}        = $cgi->param('section');
    $params{'course_name'}    = $cgi->param('course_name');
    $params{'term'}           = $cgi->param('term');
    $params{'staff_note'}     = $cgi->param('staff_note');
    $params{'public_note'}    = $cgi->param('public_note');
    $params{'students_count'} = $cgi->param('students_count');
    $params{'enabled'} = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no';

    my $course_id = ModCourse(%params);

    my @instructors = $cgi->param('instructors');
    ModCourseInstructors(
        mode        => 'replace',
        cardnumbers => \@instructors,
        course_id   => $course_id
    );
    print $cgi->redirect(
        "/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id");
}

Lines 15-18 INSERT INTO `userflags` VALUES(14,'editauthorities','Normdaten ändern',0); Link Here

(-)a/installer/data/mysql/de-DE/mandatory/userflags.sql (+1 lines)
15	INSERT INTO `userflags` VALUES(15,'serials','Zugriff auf Abonnementverwaltung/Zeitschriftenmodul',0);	15	INSERT INTO `userflags` VALUES(15,'serials','Zugriff auf Abonnementverwaltung/Zeitschriftenmodul',0);
16	INSERT INTO `userflags` VALUES(16,'reports','Zugriff auf Reportmodul',0);	16	INSERT INTO `userflags` VALUES(16,'reports','Zugriff auf Reportmodul',0);
17	INSERT INTO `userflags` VALUES(17,'staffaccess','Berechtigungen/Logins für Bibliotheksmitarbeiter vergeben',0);	17	INSERT INTO `userflags` VALUES(17,'staffaccess','Berechtigungen/Logins für Bibliotheksmitarbeiter vergeben',0);
		18	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
18	INSERT INTO `userflags` VALUES(19,'plugins', 'Koha Plugins', '0');	19	INSERT INTO `userflags` VALUES(19,'plugins', 'Koha Plugins', '0');

Lines 53-58 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/de-DE/mandatory/userpermissions.sql (+3 lines)
53	(15, 'routing', 'Umlauflisten verwalten'),	53	(15, 'routing', 'Umlauflisten verwalten'),
54	(16, 'execute_reports', 'SQL-Reports ausführen'),	54	(16, 'execute_reports', 'SQL-Reports ausführen'),
55	(16, 'create_reports', 'SQL-Reports erstellen'),	55	(16, 'create_reports', 'SQL-Reports erstellen'),
		56	(18, 'manage_courses', 'Add, edit and delete courses'),
		57	(18, 'add_reserves', 'Add course reserves'),
		58	(18, 'delete_reserves', 'Remove course reserves'),
56	(19, 'manage', 'Plugins verwealten (installieren/deinstallieren)'),	59	(19, 'manage', 'Plugins verwealten (installieren/deinstallieren)'),
57	(19, 'tool', 'Werkzeug-Plugins verwenden'),	60	(19, 'tool', 'Werkzeug-Plugins verwenden'),
58	(19, 'report', 'Report-Plugins verwenden'),	61	(19, 'report', 'Report-Plugins verwenden'),

Lines 15-18 INSERT INTO `userflags` VALUES(14,'editauthorities','Edit Authorities',0); Link Here

(-)a/installer/data/mysql/en/mandatory/userflags.sql (-1 / +2 lines)
15	INSERT INTO `userflags` VALUES(15,'serials','Manage serial subscriptions',0);	15	INSERT INTO `userflags` VALUES(15,'serials','Manage serial subscriptions',0);
16	INSERT INTO `userflags` VALUES(16,'reports','Allow access to the reports module',0);	16	INSERT INTO `userflags` VALUES(16,'reports','Allow access to the reports module',0);
17	INSERT INTO `userflags` VALUES(17,'staffaccess','Allow staff members to modify permissions for other staff members',0);	17	INSERT INTO `userflags` VALUES(17,'staffaccess','Allow staff members to modify permissions for other staff members',0);
18	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	18	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
		19	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');

Lines 53-58 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (+3 lines)
53	(15, 'routing', 'Routing'),	53	(15, 'routing', 'Routing'),
54	(16, 'execute_reports', 'Execute SQL reports'),	54	(16, 'execute_reports', 'Execute SQL reports'),
55	(16, 'create_reports', 'Create SQL Reports'),	55	(16, 'create_reports', 'Create SQL Reports'),
		56	(18, 'manage_courses', 'Add, edit and delete courses'),
		57	(18, 'add_reserves', 'Add course reserves'),
		58	(18, 'delete_reserves', 'Remove course reserves'),
56	(19, 'manage', 'Manage plugins ( install / uninstall )'),	59	(19, 'manage', 'Manage plugins ( install / uninstall )'),
57	(19, 'tool', 'Use tool plugins'),	60	(19, 'tool', 'Use tool plugins'),
58	(19, 'report', 'Use report plugins'),	61	(19, 'report', 'Use report plugins'),

Lines 15-18 INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities', Link Here

(-)a/installer/data/mysql/es-ES/mandatory/userflags.sql (+1 lines)
15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);	15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);
16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);	16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);
17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);	17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);
		18	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
18	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	19	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');

Lines 53-58 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/es-ES/mandatory/userpermissions.sql (+3 lines)
53	(15, 'routing', 'Routing'),	53	(15, 'routing', 'Routing'),
54	(16, 'execute_reports', 'Execute SQL reports'),	54	(16, 'execute_reports', 'Execute SQL reports'),
55	(16, 'create_reports', 'Create SQL Reports'),	55	(16, 'create_reports', 'Create SQL Reports'),
		56	(18, 'manage_courses', 'Add, edit and delete courses'),
		57	(18, 'add_reserves', 'Add course reserves'),
		58	(18, 'delete_reserves', 'Remove course reserves'),
56	(19, 'manage', 'Manage plugins ( install / uninstall )'),	59	(19, 'manage', 'Manage plugins ( install / uninstall )'),
57	(19, 'tool', 'Use tool plugins'),	60	(19, 'tool', 'Use tool plugins'),
58	(19, 'report', 'Use report plugins'),	61	(19, 'report', 'Use report plugins'),

Lines 16-19 INSERT INTO `userflags` VALUES(13,'tools','Outils (export, import, impression de Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql (+1 lines)
16	INSERT INTO `userflags` VALUES(14,'editauthorities','Gestion des autorités',0);	16	INSERT INTO `userflags` VALUES(14,'editauthorities','Gestion des autorités',0);
17	INSERT INTO `userflags` VALUES(15,'serials','Gestion du module périodique',0);	17	INSERT INTO `userflags` VALUES(15,'serials','Gestion du module périodique',0);
18	INSERT INTO `userflags` VALUES(16,'reports','Accès aux statistiques',0);	18	INSERT INTO `userflags` VALUES(16,'reports','Accès aux statistiques',0);
		19	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
19	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	20	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');

Lines 53-61 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql (-1 / +3 lines)
53	(15, 'routing', 'Mettre en circulation'),	53	(15, 'routing', 'Mettre en circulation'),
54	(16, 'execute_reports', 'Lancer les rapports SQL'),	54	(16, 'execute_reports', 'Lancer les rapports SQL'),
55	(16, 'create_reports', 'Créer les rapports SQL Reports'),	55	(16, 'create_reports', 'Créer les rapports SQL Reports'),
		56	(18, 'manage_courses', 'Add, edit and delete courses'),
		57	(18, 'add_reserves', 'Add course reserves'),
		58	(18, 'delete_reserves', 'Remove course reserves'),
56	(19, 'manage', 'Manage plugins ( install / uninstall )'),	59	(19, 'manage', 'Manage plugins ( install / uninstall )'),
57	(19, 'tool', 'Use tool plugins'),	60	(19, 'tool', 'Use tool plugins'),
58	(19, 'report', 'Use report plugins'),	61	(19, 'report', 'Use report plugins'),
59	(19, 'configure', 'Configure plugins')	62	(19, 'configure', 'Configure plugins')
60
61	;	63	;

Lines 17-22 INSERT INTO `userflags` VALUES(14,'editauthorities','autorizza la modifica delle Link Here

(-)a/installer/data/mysql/it-IT/necessari/userflags.sql (-1 / +2 lines)
17	INSERT INTO `userflags` VALUES(15,'serials','autorizza la gestione degli abbonamenti ai periodici',0);	17	INSERT INTO `userflags` VALUES(15,'serials','autorizza la gestione degli abbonamenti ai periodici',0);
18	INSERT INTO `userflags` VALUES(16,'reports','autorizza accesso al modulo dei reports',0);	18	INSERT INTO `userflags` VALUES(16,'reports','autorizza accesso al modulo dei reports',0);
19	INSERT INTO `userflags` VALUES(17,'staffaccess','modifica la login o i permessi degli staff users',0);	19	INSERT INTO `userflags` VALUES(17,'staffaccess','modifica la login o i permessi degli staff users',0);
		20	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
20	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	21	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');
21		22
22	SET FOREIGN_KEY_CHECKS=1;	23	SET FOREIGN_KEY_CHECKS=1;

Lines 55-60 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/it-IT/necessari/userpermissions.sql (+3 lines)
55	(15, 'routing', 'Crea/Manipola liste di distribuzione dei fascicoli ( routing list)'),	55	(15, 'routing', 'Crea/Manipola liste di distribuzione dei fascicoli ( routing list)'),
56	(16, 'execute_reports', 'Esegui reports SQL'),	56	(16, 'execute_reports', 'Esegui reports SQL'),
57	(16, 'create_reports', 'Crea reports SQL'),	57	(16, 'create_reports', 'Crea reports SQL'),
		58	(18, 'manage_courses', 'Add, edit and delete courses'),
		59	(18, 'add_reserves', 'Add course reserves'),
		60	(18, 'delete_reserves', 'Remove course reserves'),
58	(19, 'manage', 'Manage plugins ( install / uninstall )'),	61	(19, 'manage', 'Manage plugins ( install / uninstall )'),
59	(19, 'tool', 'Use tool plugins'),	62	(19, 'tool', 'Use tool plugins'),
60	(19, 'report', 'Use report plugins'),	63	(19, 'report', 'Use report plugins'),




) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;

--
-- Table structure for table `courses`
--

-- The courses table stores the courses created for the
-- course reserves feature.

DROP TABLE IF EXISTS courses;
CREATE TABLE `courses` (
  `course_id` int(11) NOT NULL AUTO_INCREMENT,
  `department` varchar(20) DEFAULT NULL, -- Stores the authorised value DEPT
  `course_number` varchar(255) DEFAULT NULL, -- An arbitrary field meant to store the "course number" assigned to a course
  `section` varchar(255) DEFAULT NULL, -- Also arbitrary, but for the 'section' of a course.
  `course_name` varchar(255) DEFAULT NULL,
  `term` varchar(20) DEFAULT NULL, -- Stores the authorised value TERM
  `staff_note` mediumtext,
  `public_note` mediumtext,
  `students_count` varchar(20) DEFAULT NULL, -- Meant to be just an estimate of how many students will be taking this course/section
  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes', -- Determines whether the course is active
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

--
-- Table structure for table `course_instructors`
--

-- The course instructors table links Koha borrowers to the
-- courses they are teaching. Many instructors can teach many
-- courses. course_instructors is just a many-to-many join table.

DROP TABLE IF EXISTS course_instructors;
CREATE TABLE `course_instructors` (
  `course_id` int(11) NOT NULL,
  `borrowernumber` int(11) NOT NULL,
  PRIMARY KEY (`course_id`,`borrowernumber`),
  KEY `borrowernumber` (`borrowernumber`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Constraints for table `course_instructors`
--
ALTER TABLE `course_instructors`
  ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`),
  ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;

--
-- Table structure for table `course_items`
--

-- If an item is placed on course reserve for one or more courses
-- it will have an entry in this table. No matter how many courses an item
-- is part of, it will only have one row in this table.

DROP TABLE IF EXISTS course_items;
CREATE TABLE `course_items` (
  `ci_id` int(11) NOT NULL AUTO_INCREMENT,
  `itemnumber` int(11) NOT NULL, -- items.itemnumber for the item on reserve
  `itype` varchar(10) DEFAULT NULL, -- an optional new itemtype for the item to have while on reserve
  `ccode` varchar(10) DEFAULT NULL, -- an optional new category code for the item to have while on reserve
  `holdingbranch` varchar(10) DEFAULT NULL, -- an optional new holding branch for the item to have while on reserve
  `location` varchar(80) DEFAULT NULL, -- an optional new shelving location for the item to have while on reseve
  `enabled` enum('yes','no') NOT NULL DEFAULT 'no', -- If at least one enabled course has this item on reseve, this field will be 'yes', otherwise it will be 'no'
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`ci_id`),
   UNIQUE KEY `itemnumber` (`itemnumber`),
   KEY `holdingbranch` (`holdingbranch`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

--
-- Constraints for table `course_items`
--
ALTER TABLE `course_items`
  ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;

--
-- Table structure for table `course_reserves`
--

-- This table connects an item placed on course reserve to a course it is on reserve for.
-- There will be a row in this table for each course an item is on reserve for.

DROP TABLE IF EXISTS course_reserves;
CREATE TABLE `course_reserves` (
  `cr_id` int(11) NOT NULL AUTO_INCREMENT,
  `course_id` int(11) NOT NULL, -- Foreign key to the courses table
  `ci_id` int(11) NOT NULL, -- Foreign key to the course_items table
  `staff_note` mediumtext, -- Staff only note
  `public_note` mediumtext, -- Public, OPAC visible note
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`cr_id`),
   UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`),
   KEY `course_id` (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

--
-- Constraints for table `course_reserves`
--
ALTER TABLE `course_reserves`
  ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`);

--
-- Table structure for table `branch_borrower_circ_rules`
--


Lines 36-39 INSERT INTO `userflags` VALUES(14,'editauthorities','Tilgang til å endre autori Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql (+1 lines)
36	INSERT INTO `userflags` VALUES(15,'serials','Tilgang til å endre abonnementer',0);	36	INSERT INTO `userflags` VALUES(15,'serials','Tilgang til å endre abonnementer',0);
37	INSERT INTO `userflags` VALUES(16,'reports','Tilgang til rapportmodulen',0);	37	INSERT INTO `userflags` VALUES(16,'reports','Tilgang til rapportmodulen',0);
38	INSERT INTO `userflags` VALUES(17,'staffaccess','Endre innlogging og rettigheter for bibliotekansatte',0);	38	INSERT INTO `userflags` VALUES(17,'staffaccess','Endre innlogging og rettigheter for bibliotekansatte',0);
		39	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
39	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	40	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');

Lines 73-78 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql (+3 lines)
73	(15, 'routing', 'Sirkulasjon'),	73	(15, 'routing', 'Sirkulasjon'),
74	(16, 'execute_reports', 'Kjøre SQL-rapporter'),	74	(16, 'execute_reports', 'Kjøre SQL-rapporter'),
75	(16, 'create_reports', 'Opprette SQL-rapporter'),	75	(16, 'create_reports', 'Opprette SQL-rapporter'),
		76	(18, 'manage_courses', 'Add, edit and delete courses'),
		77	(18, 'add_reserves', 'Add course reserves'),
		78	(18, 'delete_reserves', 'Remove course reserves'),
76	(19, 'manage', 'Manage plugins ( install / uninstall )'),	79	(19, 'manage', 'Manage plugins ( install / uninstall )'),
77	(19, 'tool', 'Use tool plugins'),	80	(19, 'tool', 'Use tool plugins'),
78	(19, 'report', 'Use report plugins'),	81	(19, 'report', 'Use report plugins'),

Lines 15-18 INSERT INTO `userflags` VALUES(14,'editauthorities','Allow to edit authorities', Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/userflags.sql (+1 lines)
15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);	15	INSERT INTO `userflags` VALUES(15,'serials','Allow to manage serials subscriptions',0);
16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);	16	INSERT INTO `userflags` VALUES(16,'reports','Allow to access to the reports module',0);
17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);	17	INSERT INTO `userflags` VALUES(17,'staffaccess','Modify login / permissions for staff users',0);
		18	INSERT INTO `userflags` VALUES(18,'coursereserves','Course Reserves',0);
18	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');	19	INSERT INTO `userflags` VALUES(19, 'plugins', 'Koha plugins', '0');

Lines 54-59 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql (+3 lines)
54	(15, 'routing', 'Routing'),	54	(15, 'routing', 'Routing'),
55	(16, 'execute_reports', 'Execute SQL reports'),	55	(16, 'execute_reports', 'Execute SQL reports'),
56	(16, 'create_reports', 'Create SQL Reports'),	56	(16, 'create_reports', 'Create SQL Reports'),
		57	(18, 'manage_courses', 'Add, edit and delete courses'),
		58	(18, 'add_reserves', 'Add course reserves'),
		59	(18, 'delete_reserves', 'Remove course reserves'),
57	(19, 'manage', 'Manage plugins ( install / uninstall )'),	60	(19, 'manage', 'Manage plugins ( install / uninstall )'),
58	(19, 'tool', 'Use tool plugins'),	61	(19, 'tool', 'Use tool plugins'),
59	(19, 'report', 'Use report plugins'),	62	(19, 'report', 'Use report plugins'),

Lines 18-23 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql (+4 lines)
18	(15,'serials', 'Разрешение на управление подпиской периодических изданий',0),	18	(15,'serials', 'Разрешение на управление подпиской периодических изданий',0),
19	(16,'reports', 'Разрешение на доступ к модулю отчетов',0),	19	(16,'reports', 'Разрешение на доступ к модулю отчетов',0),
20	(17,'staffaccess', 'Смена имени(логина)/привилегий для работников библиотеки',0),	20	(17,'staffaccess', 'Смена имени(логина)/привилегий для работников библиотеки',0),
		21	(18,'coursereserves', 'Course Reserves',0),
21	(19,'plugins', 'Koha plugins', '0')	22	(19,'plugins', 'Koha plugins', '0')
22	;	23	;
23		24
Lines 78-83 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
78	(15, 'routing', 'Routing'),	79	(15, 'routing', 'Routing'),
79	(16, 'execute_reports', 'Execute SQL reports'),	80	(16, 'execute_reports', 'Execute SQL reports'),
80	(16, 'create_reports', 'Create SQL Reports'),	81	(16, 'create_reports', 'Create SQL Reports'),
		82	(18, 'manage_courses', 'Add, edit and delete courses'),
		83	(18, 'add_reserves', 'Add course reserves'),
		84	(18, 'delete_reserves', 'Remove course reserves'),
81	(19, 'manage', 'Manage plugins ( install / uninstall )'),	85	(19, 'manage', 'Manage plugins ( install / uninstall )'),
82	(19, 'tool', 'Use tool plugins'),	86	(19, 'tool', 'Use tool plugins'),
83	(19, 'report', 'Use report plugins'),	87	(19, 'report', 'Use report plugins'),

Lines 424-426 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES(' Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
424	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo');	424	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo');
425	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch\|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice');	425	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch\|OpacURLBranch','Decides which branch''s items to emphasize. If PatronBranch, emphasize the logged in user''s library''s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha''s Apache configuration file.','Choice');
426	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free');	426	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UniqueItemFields', 'barcode', 'Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table', '', 'Free');
		427	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo');

Lines 18-23 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql (+4 lines)
18	(15,'serials', 'Дозвіл на керування підпискою періодичних видань',0),	18	(15,'serials', 'Дозвіл на керування підпискою періодичних видань',0),
19	(16,'reports', 'Дозвіл на доступ до модуля звітів',0),	19	(16,'reports', 'Дозвіл на доступ до модуля звітів',0),
20	(17,'staffaccess', 'Зміна імені(логіну)/привілеїв для працівників бібліотеки',0),	20	(17,'staffaccess', 'Зміна імені(логіну)/привілеїв для працівників бібліотеки',0),
		21	(18,'coursereserves', 'Course Reserves',0),
21	(19,'plugins', 'Koha plugins', '0')	22	(19,'plugins', 'Koha plugins', '0')
22	;	23	;
23		24
Lines 78-83 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
78	(15, 'routing', 'Routing'),	79	(15, 'routing', 'Routing'),
79	(16, 'execute_reports', 'Execute SQL reports'),	80	(16, 'execute_reports', 'Execute SQL reports'),
80	(16, 'create_reports', 'Create SQL Reports'),	81	(16, 'create_reports', 'Create SQL Reports'),
		82	(18, 'manage_courses', 'Add, edit and delete courses'),
		83	(18, 'add_reserves', 'Add course reserves'),
		84	(18, 'delete_reserves', 'Remove course reserves'),
81	(19, 'manage', 'Manage plugins ( install / uninstall )'),	85	(19, 'manage', 'Manage plugins ( install / uninstall )'),
82	(19, 'tool', 'Use tool plugins'),	86	(19, 'tool', 'Use tool plugins'),
83	(19, 'report', 'Use report plugins'),	87	(19, 'report', 'Use report plugins'),




    SetVersion($DBversion);
}


$DBversion = "3.09.00.047";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
    # to preserve default behaviour as best as possible, set this new preference differently depending on whether IndependantBranches is set or not

    SetVersion ($DBversion);
}

$DBversion = "3.13.00.XXX";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
    $dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('UseCourseReserves', '0', NULL, 'Enable the course reserves feature.', 'YesNo')");
    $dbh->do("INSERT INTO userflags (bit,flag,flagdesc,defaulton) VALUES ('18','coursereserves','Course Reserves','0')");
    $dbh->do("
CREATE TABLE `courses` (
  `course_id` int(11) NOT NULL AUTO_INCREMENT,
  `department` varchar(20) DEFAULT NULL,
  `course_number` varchar(255) DEFAULT NULL,
  `section` varchar(255) DEFAULT NULL,
  `course_name` varchar(255) DEFAULT NULL,
  `term` varchar(20) DEFAULT NULL,
  `staff_note` mediumtext,
  `public_note` mediumtext,
  `students_count` varchar(20) DEFAULT NULL,
  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
CREATE TABLE `course_instructors` (
  `course_id` int(11) NOT NULL,
  `borrowernumber` int(11) NOT NULL,
  PRIMARY KEY (`course_id`,`borrowernumber`),
  KEY `borrowernumber` (`borrowernumber`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
ALTER TABLE `course_instructors`
  ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`),
  ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
    ");

    $dbh->do("
CREATE TABLE `course_items` (
  `ci_id` int(11) NOT NULL AUTO_INCREMENT,
  `itemnumber` int(11) NOT NULL,
  `itype` varchar(10) DEFAULT NULL,
  `ccode` varchar(10) DEFAULT NULL,
  `holdingbranch` varchar(10) DEFAULT NULL,
  `location` varchar(80) DEFAULT NULL,
  `enabled` enum('yes','no') NOT NULL DEFAULT 'no',
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`ci_id`),
   UNIQUE KEY `itemnumber` (`itemnumber`),
   KEY `holdingbranch` (`holdingbranch`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
ALTER TABLE `course_items`
  ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
");

    $dbh->do("
CREATE TABLE `course_reserves` (
  `cr_id` int(11) NOT NULL AUTO_INCREMENT,
  `course_id` int(11) NOT NULL,
  `ci_id` int(11) NOT NULL,
  `staff_note` mediumtext,
  `public_note` mediumtext,
  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`cr_id`),
   UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`),
   KEY `course_id` (`course_id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
");

    $dbh->do("
ALTER TABLE `course_reserves`
  ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`);
    ");

    $dbh->do("
INSERT INTO permissions (module_bit, code, description) VALUES
  (18, 'manage_courses', 'Add, edit and delete courses'),
  (18, 'add_reserves', 'Add course reserves'),
  (18, 'delete_reserves', 'Remove course reserves')
;
    ");


    print "Upgrade to $DBversion done (Add Course Reserves ( system preference UseCourseReserves ))\n";
    SetVersion($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 754-760 fieldset.rows .inputnote { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-1 / +1 lines)
754	visibility:visible; /* you propably don't need to change this one */	754	visibility:visible; /* you propably don't need to change this one */
755	display:block;	755	display:block;
756	}	756	}
757	#newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {	757	#new_course a, #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #newbasket a, #newrootbudget-button, #budgets_menuc .first-child {
758	padding-left : 34px;	758	padding-left : 34px;
759	background-image: url("../../img/toolbar-new.gif");	759	background-image: url("../../img/toolbar-new.gif");
760	background-position : center left;	760	background-position : center left;

Lines 24-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (+3 lines)
24	[% IF ( CAN_user_serials ) %]	24	[% IF ( CAN_user_serials ) %]
25	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>	25	<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
26	[% END %]	26	[% END %]
		27	[% IF ( CAN_user_coursereserves ) %]
		28	<li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course Reserves</a></li>
		29	[% END %]
27	[% IF ( CAN_user_reports ) %]	30	[% IF ( CAN_user_reports ) %]
28	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>	31	<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
29	[% END %]	32	[% END %]





 $(document).ready(function() {
    $('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });

    $(".close").click(function(){ window.close(); });

    if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
    if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
    if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }

    $(".focus").focus();
    $(".validated").validate();
});



// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
function checkEnter(e){ //e is event object passed from function invocation
	var characterCode; // literal character code will be stored in this variable

Lines 543-545 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+7 lines)
543	- and this password	543	- and this password
544	- pref: AutoSelfCheckPass	544	- pref: AutoSelfCheckPass
545	- .	545	- .
		546	Course Reserves:
		547	-
		548	- pref: UseCourseReserves
		549	choices:
		550	yes: Use
		551	no: "Don't use"
		552	- course reserves




[% USE AuthorisedValues %]

[% ShowCourseReserves = 0 %]
[% IF UseCourseReserves %]
    [% FOREACH item IN itemloop %]
       [% IF item.course_reserves %]
           [% FOREACH r IN item.course_reserves %]
               [% IF r.course.enabled == 'yes' %]
                   [% ShowCourseReserves = 1 %]
               [% END %]
           [% END %]
        [% END %]
    [% END %]
[% END %]

[% INCLUDE 'doc-head-open.inc' %]
[% INCLUDE 'greybox.inc' %]
<title>Koha &rsaquo; Catalog &rsaquo;

                [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
                [% IF ( hostrecords ) %]<th>Host records</th>[% END %]
                [% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
                [% IF ( ShowCourseReserves ) %]<th>Course Reserves</th>[% END %]
            </tr>
        </thead>
        <tbody>

                        <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber %]&amp;hostitemnumber=[% item.itemnumber %]">Create analytics</a></td>
                    [% END %]

                [% IF ShowCourseReserves %]
                    <td>
                        [% IF item.course_reserves %]
                            [% FOREACH r IN item.course_reserves %]
                                [% IF r.course.enabled == 'yes' %]
                                    <p>
                                      <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id %]">
                                         [% r.course.course_name %]
                                         <!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
                                         [% IF r.course.section %] [% r.course.section %] [% END %]
                                         [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
                                      </a>
                                   </p>
                               [% END %]
                           [% END %]
                       [% END %]
                    </td>
                [% END %]
                </tr>
            [% END %]
        </tbody>

Lines 10-16 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +1 lines)
10	window.close();	10	window.close();
11	[% END %]	11	[% END %]
12	[% END %]	12	[% END %]
13	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	13	$("fieldset.rows input").addClass("noEnterSubmit");
14	/* Inline edit/delete links */	14	/* Inline edit/delete links */
15	var biblionumber = $("input[name='biblionumber']").attr("value");	15	var biblionumber = $("input[name='biblionumber']").attr("value");
16	$("tr.editable td").click(function(event){	16	$("tr.editable td").click(function(event){




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<script type="text/javascript">
//<![CDATA[

$(document).ready(function() {
  $('#barcode').focus();
});

//]]>
</script>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        [% IF ERROR_BARCODE_NOT_FOUND %]
                            <div class="error">No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]</div>
                        [% END %]

                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
                            <input type="hidden" name="action" value="lookup" />

                            <fieldset class="rows">
                                <legend>Add items: scan barcode</legend>

                                    <p>

                                    <li>
                                        <label class="required" for="barcode">Item barcode:</label>
                                        <input id="barcode" name="barcode" type="text" />
                                    </li>
                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" value="Submit" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
                            </fieldset>
                        </form>
                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
  $('#submit').focus();
});
//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Reserve <i><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.title %]</a></i> for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        [% IF course_reserve %]<div class="warn" id="already_on_reserve_this">This course already has this item on reserve.<div>[% END %]
                        [% IF course_item    %]<div class="warn" id="already_on_reserve">Number of courses reserving this item: [% course_item.course_reserves.size %]<div>[% END %]

                        <form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
                            <input type="hidden" name="course_id" value="[% course.course_id %]" />
                            <input type="hidden" name="action" value="add" />

                            <fieldset class="rows">
                                <legend>Add <i>[% item.title %]</i> to <i>[% course.course_name %]</i></legend>
                                <ol>
                                    <li>
                                        <label for="barcode">Barcode:</label>
                                        <span id="barcode">[% item.barcode %]</span>
                                        <input type="hidden" name="itemnumber" value="[% item.itemnumber %]" />
                                    </li>

                                    [% IF item_level_itypes %]
                                    <li>
                                        <label class="required" for="itype">Item Type:</label>
                                        <select id="itype" name="itype">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH it IN itypes %]
                                                [% IF course_item.itype && ( ( course.enabled == 'yes' && it.itemtype == item.itype ) || ( course.enabled == 'no' && it.itemtype == course_item.itype ) ) %]
                                                    <option value="[% it.itemtype %]" selected="selected">[% it.description %]</option>
                                                [% ELSE %]
                                                    <option value="[% it.itemtype %]">[% it.description %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>
                                    [% END %]

                                    <li>
                                        <label class="required" for="ccode">Collection Code:</label>
                                        <select id="ccode" name="ccode">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH c IN ccodes %]
                                                [% IF course_item.ccode && ( ( course.enabled == 'yes' && c.authorised_value == item.ccode ) || ( course.enabled == 'no' && c.authorised_value == course_item.ccode ) ) %]
                                                    <option value="[% c.authorised_value %]" selected="selected">[% c.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% c.authorised_value %]">[% c.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="location">Shelving Location:</label>
                                        <select id="location" name="location">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH s IN locations %]
                                                [% IF course_item.location && ( ( course.enabled == 'yes' && s.authorised_value == item.location ) || ( course.enabled == 'no' && s.authorised_value == course_item.location ) ) %]
                                                    <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option>
                                                [% ELSE %]
                                                    <option value="[% s.authorised_value %]">[% s.lib %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label class="required" for="holdingbranch">Holding Library:</label>
                                        <select id="holdingbranch" name="holdingbranch">
                                            <option value="">LEAVE UNCHANGED</option>

                                            [% FOREACH b IN branches %]
                                                [% IF course_item.holdingbranch && ( ( course.enabled == 'yes' && b.value == item.holdingbranch ) || ( course.enabled == 'no' && b.value == course_item.holdingbranch ) ) %]
                                                    <option value="[% b.value %]" selected="selected">[% b.branchname %]</option>
                                                [% ELSE %]
                                                    <option value="[% b.value %]">[% b.branchname %]</option>
                                                [% END %]
                                            [% END %]
                                        </select>
                                    </li>

                                    <li>
                                        <label for="staff_note">Staff note:</label>
                                        <textarea name="staff_note" id="staff_note">[% course_reserve.staff_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="public_note">Public note:</label>
                                        <textarea name="public_note" id="public_note">[% course_reserve.public_note %]</textarea>
                                    </li>

                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" id="submit" value="Save" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
                            </fieldset>

                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% USE AuthorisedValues %]
[% USE ItemTypes %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves &rsaquo; New course</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[

    function confirmItemDelete(){
        return confirm( _('Are you sure you want to delete this item?');
    }

//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course details for <i>[% course.course_name %]</i></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div id="toolbar">
                <script type="text/javascript">
                //<![CDATA[
                    $(document).ready(function(){
                        addItemsButton     = new YAHOO.widget.Button("add_items");
                        editCourseButton   = new YAHOO.widget.Button("edit_course");
                        deleteCourseButton = new YAHOO.widget.Button("delete_course");

                        deleteCourseButton.on("click", confirmDelete );
                    });

                    function confirmDelete(p_oEvent){
                        if ( ! confirm( _('Are you sure you want to delete this course?') ) ) {
                            YAHOO.util.Event.stopEvent( p_oEvent );
                        }
                    }

                //]]>
                </script>
                <ul class="toolbar">
                    [% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add reserves</a></li>[% END %]
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit course</a></li>[% END %]
                    [% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete course</a></li>[% END %]
                </ul>
            </div><!-- /toolbar -->

            <table>
                <tr><th>Course name</th><td>[% course.course_name %]</td></tr>
                <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
                <tr><th>Department</th><td>_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
                <tr><th>Course number</th><td>[% course.course_number %]</td></tr>
                <tr><th>Section</th><td>[% course.section %]</td></tr>
                <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
                <tr><th>Staff note</th><td>[% course.staff_note %]</td></tr>
                <tr><th>Public note</th><td>[% course.public_note %]</td></tr>
                <tr><th>Students count</th><td>[% course.students_count %]</td></tr>
                <tr><th>Status</th><td>[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</td></tr>
            </table>

            <table>
                <thead>
                    <tr>
                        <th>Title</th>
                        <th>Barcode</th>
                        <th>Call number</th>
                        [% IF item_level_itypes %]<th>Item type</th>[% END %]
                        <th>Collection</th>
                        <th>Location</th>
                        <th>Library</th>
                        <th>Staff note</th>
                        <th>Public note</th>
                        [% IF CAN_user_coursereserves_add_reserves %]<th>&nbsp;<!-- Edit --></th>[% END %]
                        [% IF CAN_user_coursereserves_delete_reserves %]<th>&nbsp;<!-- Remove --></th>[% END %]
                        <th>Other course reserves</th>
                    </tr>
                </thead>

                <tbody>
                    [% FOREACH cr IN course_reserves %]
                        <tr>
                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
                            <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber %]&biblionumber=[% cr.item.biblionumber %]&bi=[% cr.item.biblioitemnumber %]">[% cr.item.barcode %]</a></td>
                            <td>[% cr.item.itemcallnumber %]</td>
                            [% IF item_level_itypes %]
                            <td>
                                [% IF cr.course_item.itype %]
                                    [% IF cr.course_item.enabled == 'yes' %]
                                        [% ItemTypes.GetDescription( cr.item.itype ) %]
                                    [% ELSE %]
                                        [% ItemTypes.GetDescription( cr.course_item.itype ) %]
                                    [% END %]
                                [% ELSE %]
                                     <i>Unchanged</i>
                                     ([% ItemTypes.GetDescription( cr.item.itype ) %])
                                [% END %]
                            </td>
                            [% END %]
                            <td>
                                 [% IF cr.course_item.ccode %]
                                     [% IF cr.course_item.enabled == 'yes' %]
                                          [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]
                                     [% ELSE %]
                                         [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %]
                                     [% END %]
                                 [% ELSE %]
                                     <i>Unchanged</i>
                                     ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %])
                                 [% END %]
                            </td>
                            <td>
                                [% IF cr.course_item.location %]
                                     [% IF cr.course_item.enabled == 'yes' %]
                                         [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]
                                    [% ELSE %]
                                        [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %]
                                    [% END %]
                                [% ELSE %]
                                    <i>Unchanged</i>
                                    ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %])
                                [% END %]
                            </td>
                            <td>
                                [% IF cr.course_item.holdingbranch %]
                                    [% IF cr.course_item.enabled == 'yes' %]
                                        [% Branches.GetName( cr.item.holdingbranch ) %]
                                    [% ELSE %]
                                        [% Branches.GetName( cr.course_item.holdingbranch ) %]
                                    [% END %]
                                [% ELSE %]
                                    <i>Unchanged</i>
                                    ([% Branches.GetName( cr.item.holdingbranch ) %])
                                [% END %]
                            </td>
                            <td>[% cr.staff_note %]</td>
                            <td>[% cr.public_note %]</td>

                            [% IF CAN_user_coursereserves_add_reserves %]
                                <td><a href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup">Edit</a></td>
                            [% END %]

                            [% IF CAN_user_coursereserves_delete_reserves %]
                                <td>
                                    [% IF cr.item.onloan %]
                                        On Loan
                                    [% ELSIF cr.item.itemlost %]
                                        Item Lost
                                    [% ELSE %]
                                        <a href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" onclick="return confirmItemDelete()" >Remove</a>
                                    [% END %]

                                </td>
                            [% END %]

                            <td>
                                [% FOREACH course IN cr.courses %]
                                    [% UNLESS cr.course_id == course.course_id %]
                                        <p>
                                            <a href="course-details.pl?course_id=[% course.course_id %]">
                                                [% course.course_name %]
                                                [% IF course.section %] [% course.section %] [% END %]
                                                [% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %]
                                            </a>
                                        </p>
                                    [% END %]
                                [% END %]
                            </td>
                        </tr>
                    [% END %]
                </tbody>
            </table>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% USE AuthorisedValues %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves</title>
[% INCLUDE 'doc-head-close.inc' %]

<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/css/datatables.css" />
<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
[% INCLUDE 'datatables-strings.inc' %]
<script type="text/javascript" src="/intranet-tmpl/prog/en/js/datatables.js"></script>
<script type="text/javascript" id="js">$(document).ready(function() {
 $(document).ready(function() {
    $("#course_reserves_table").dataTable($.extend(true, {}, dataTablesDefaults, {
        "sPaginationType": "four_button",
    }));
 });
});
</script>

</head>
<body id="lists_shelves" class="lists">

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">

                    <div id="toolbar">
                        <script type="text/javascript">
                        //<![CDATA[
                            $(document).ready(function(){
                                newCourseButton = new YAHOO.widget.Button("new_course");
                            });
                        //]]>
                        </script>
                        <ul class="toolbar">
                            [% IF ( CAN_user_coursereserves_manage_courses ) %]
                            <li><a id="new_course" href="/cgi-bin/koha/course_reserves/course.pl">New course</a></li>
                            [% END %]
                        </ul>
                    </div><!-- /toolbar -->

                    <!--
                    <div id="search-toolbar">
                        <script type="text/javascript">
                        //<![CDATA[
                            function submitSearchForm(p_oEvent){
                                $('#search_courses_form').submit();
                            }

                            $(document).ready(function(){
                                newCourseButton = new YAHOO.widget.Button("search_courses");
                                newCourseButton.on("click", submitSearchForm );
                            });
                        //]]>
                        </script>
                        <ul class="toolbar">
                            <li><form id="search_courses_form"><input type="text" name="search_on" id="search_on"></form></li>
                            <li><a id="search_courses">Search courses</a></li>
                        </ul>
                    </div>
                    -->

                    <h1>Courses</h1>
                    <table id="course_reserves_table">
                        <thead>
                            <tr>
                                <th>Name</th>
                                <th>Dept.</th>
                                <th>Course #</th>
                                <th>Section</th>
                                <th>Term</th>
                                <th>Instructors</th>
                                <th>Staff note</th>
                                <th>Public note</th>
                                <th># of Students</th>
                                <th>Enabled</th>
                            </tr>
                        </thead>

                        <tbody>
                            [% FOREACH c IN courses %]
                                <tr>
                                    <td><a href="course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) %]</td>
                                    <td>[% c.course_number %]</td>
                                    <td>[% c.section %]</td>
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
                                    <td>
                                        [% FOREACH i IN c.instructors %]
                                            <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>
                                        [% END %]
                                    </td>
                                    <td>[% c.staff_note %]</td>
                                    <td>[% c.public_note %]</td>
                                    <td>[% c.students_count %]</td>
                                    <td>
                                        [% IF c.enabled == 'yes' %]
                                            <img src="/intranet-tmpl/prog/img/approve.gif" />
                                        [% ELSE %]
                                            <img src="http://kohadev:8080/intranet-tmpl/prog/img/deny.gif" />
                                        [% END %]
                                    </td>
                            [% END %]
                        </tbody>
                    </table>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Course reserves &rsaquo; [% IF course_name %] Edit [% course_name %] [% ELSE %] New course [% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[

    function Check(f) {
        var _alertString = "";

        if( ! $("#department").val() ) {
            _alertString += _("- You must choose a department") + "\n";
        }

        if( ! $("#course_number").val() ) {
            _alertString += _("- You must choose a course number") + "\n";
        }

        if( ! $("#course_name").val() ) {
            _alertString += _("- You must add a course name") + "\n";
        }

        if ( _alertString.length ) {
            var alertHeader;
            alertHeader = _("Form not submitted because of the following problem(s)");
            alertHeader += "\n------------------------------------------------------------------------------------\n\n";

            alert( alertHeader + _alertString );
        } else {
            f.submit();
        }
    }

//]]>
</script>

<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
    $( "#find_instructor" ).autocomplete({
        source: "/cgi-bin/koha/circ/ysearch.pl",
        minLength: 3,
        select: function( event, ui ) {
            AddInstructor( ui.item.firstname + " " + ui.item.surname, ui.item.cardnumber );
            return false;
        }
    })
    .data( "autocomplete" )._renderItem = function( ul, item ) {
        return $( "<li></li>" )
        .data( "item.autocomplete", item )
        .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
        .appendTo( ul );
    };

});

function AddInstructor( name, cardnumber ) {
    div = "<div id='borrower_" + cardnumber + "'>" + name + " ( <a href='#' onclick='RemoveInstructor(" + cardnumber + ");'> Remove </a> ) <input type='hidden' name='instructors' value='" + cardnumber + "' /></div>";
    $('#instructors').append( div );

    $('#find_instructor').val('').focus();
}

function RemoveInstructor( cardnumber ) {
    $( '#borrower_' + cardnumber ).remove();
}

//]]>
</script>

</head>

<body>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; [% IF course_name %] Edit <i>[% course_name %]</i> [% ELSE %] New course [% END %]</div>

<div id="doc2" class="yui-t7">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">
                    <div class="yui-u first">
                        <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl">
                            [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id %]" />[% END %]
                            <fieldset class="rows">
                                <legend>[% IF course_id %] Edit [% ELSE %] Create [% END %] course</legend>
                                <ol>
                                    <li>
                                        <label class="required" for="department">Department:</label>
                                        [% IF departments %]
                                            <select id="department" name="department">
                                                <option value="">Select A Department</option>

                                                [% FOREACH d IN departments %]
                                                    [% IF d.authorised_value == department %]
                                                        <option value="[% d.authorised_value %]" selected="selected">[% d.lib %]</option>
                                                    [% ELSE %]
                                                        <option value="[% d.authorised_value %]">[% d.lib %]</option>
                                                    [% END %]
                                                [% END %]
                                            </select>
                                        [% ELSE %]
                                            <span id="department">No DEPARTMENT authorised values found! Please create one or more authorised values with the category DEPARTMENT.</span>
                                        [% END %]
                                    </li>

                                    <li>
                                        <label class="required" for="course_number">Course number:</label>
                                        <input id="course_number" name="course_number" type="text" value="[% course_number %]" />
                                    </li>

                                    <li>
                                        <label for="section">Section:</label>
                                        <input id="section" name="section" type="text" value="[% section %]"/>
                                    </li>

                                    <li>
                                        <label class="required" for="course_name">Course name:</label>
                                        <input id="course_name" name="course_name" type="text" value="[% course_name %]" />
                                    </li>

                                    <li>
                                        <label for="term">Term:</label>
                                        [% IF terms %]
                                            <select id="term" name="term">
                                                <option value=""></option>

                                                [% FOREACH t IN terms %]
                                                    [% IF t.authorised_value == term %]
                                                        <option value="[% t.authorised_value %]" selected="selected">[% t.lib %]</option>
                                                    [% ELSE %]
                                                        <option value="[% t.authorised_value %]">[% t.lib %]</option>
                                                    [% END %]
                                                [% END %]
                                            </select>
                                        [% ELSE %]
                                            <span id="term">No TERM authorised values found! Please create one or more authorised values with the category TERM.</span>
                                        [% END %]
                                    </li>

                                    <!-- TODO: Add Instructors -->
                                    <li>
                                        <label for="instructors">Instructors:</label>

                                        <fieldset>
                                             <div id="instructors">
                                                 [% FOREACH i IN instructors %]
                                                     <div id="borrower_[% i.cardnumber %]">
                                                         [% i.surname %], [% i.firstname %] ( <a href='#' onclick='RemoveInstructor( [% i.cardnumber %] );'> Remove </a> )
                                                         <input type='hidden' name='instructors' value='[% i.cardnumber %]' />
                                                     </div>
                                                 [% END %]
                                             </div>

                                        </fieldset>

                                        <fieldset>
                                            <label for="find_instructor">Instructor search:</label>
                                            <input autocomplete="off" id="find_instructor" type="text" style="width:150px" class="noEnterSubmit"/>
                                            <div id="find_instructor_container"></div>
                                        </fieldset>
                                    <li>
                                        <label for="staff_note">Staff note:</label>
                                        <textarea name="staff_note" id="staff_note">[% staff_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="public_note">Public note:</label>
                                        <textarea name="public_note" id="public_note">[% public_note %]</textarea>
                                    </li>

                                    <li>
                                        <label for="students_count">Number of students:</label>
                                        <input id="students_count" name="students_count" type="text" value="[% students_count %]" />
                                    </li>

                                    <li>
                                        <label for="enabled">Enabled?</label>
                                        [% IF enabled == 'no' %]
                                            <input type="checkbox" name="enabled" id="enabled" />
                                        [% ELSE %]
                                            <input type="checkbox" name="enabled" id="enabled" checked="checked" />
                                        [% END %]
                                    </li>
                                </ol>
                            </fieldset>

                            <fieldset class="action">
                                <input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />

                                <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a>
                            </fieldset>

                    </div>
                </div>
            </div>
        </div>
    </div>
</div>


[% INCLUDE 'intranet-bottom.inc' %]

Lines 4-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-1 / +1 lines)
4	<script type="text/javascript">	4	<script type="text/javascript">
5	//<![CDATA[	5	//<![CDATA[
6	$(document).ready(function(){	6	$(document).ready(function(){
7	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
8	$('#mancredit').preventDoubleFormSubmit();	7	$('#mancredit').preventDoubleFormSubmit();
		8	$("fieldset.rows input").addClass("noEnterSubmit");
9	});	9	});
10	//]]>	10	//]]>
11	</script>	11	</script>

Lines 4-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
4	<script type="text/javascript">	4	<script type="text/javascript">
5	//<![CDATA[	5	//<![CDATA[
6	$(document).ready(function(){	6	$(document).ready(function(){
7	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
8	$('#maninvoice').preventDoubleFormSubmit();	7	$('#maninvoice').preventDoubleFormSubmit();
		8	$("fieldset.rows input").addClass("noEnterSubmit");
9	});	9	});
10	//]]>	10	//]]>
11	</script>	11	</script>

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
6	<script type="text/javascript">	6	<script type="text/javascript">
7	//<![CDATA[	7	//<![CDATA[
8	$(document).ready(function() {	8	$(document).ready(function() {
9	$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });	9	$("fieldset.rows input").addClass("noEnterSubmit");
10	$("#guarantordelete").click(function() {	10	$("#guarantordelete").click(function() {
11	$("#contact-details").hide().find('a').remove();	11	$("#contact-details").hide().find('a').remove();
12	$("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });	12	$("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });

Lines 262-267 Link Here

(-)a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc (+1 lines)
262		262
263	<div id="moresearches">	263	<div id="moresearches">
264	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>	264	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
		265	[% IF ( UseCourseReserves ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
265	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]	266	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
266	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]	267	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]
267	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]	268	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]

Lines 131-136 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (+1 lines)
131		131
132	<div id="moresearches">	132	<div id="moresearches">
133	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>	133	<a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
		134	[% IF ( UseCourseReserves ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-course-reserves.pl">Course Reserves</a>[% END %]
134	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]	135	[% IF ( OpacBrowser ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
135	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]	136	[% IF ( OpacAuthorities ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]
136	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]	137	[% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> \| </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]




[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE ItemTypes %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">
[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
   <div id="bd">
[% INCLUDE 'masthead.inc' %]

<div id="doc2" class="yui-t7">
    <div id="yui-main">

        <table>
            <tr><th>Course Name</th><td>[% course.course_name %]</td></tr>
            <tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
            <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
            <tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
            <tr><th>Section</th><td>[% course.section %]</td></tr>
            <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
            <tr><th>Notes</th><td>[% course.public_note %]</td></tr>
        </table>

        <table>
            <thead>
                <tr>
                    <th>Title</th>
                    <th>Item type</th>
                    <th>Location</th>
                    <th>Collection</th>
                    <th>Call number</th>
                    <th>Copy</th>
                    <th>Status</td>
                    <th>Date due</td>
                    <th>Notes</th>
                </tr>
            </thead>

            <tbody>
                [% FOREACH cr IN course_reserves %]
                    <tr>
                        <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
                        <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
                        <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
                        <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
                        <td>[% cr.item.itemcallnumber %]</td>
                        <td>[% cr.item.copynumber %]</td>
                        <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
                        <td>[% cr.issue.date_due | $KohaDates %]</td>
                        <td>[% cr.public_note %]</td>
                    </tr>
                [% END %]
            </tbody>
        </table>

    </div>
</div>


[% INCLUDE 'opac-bottom.inc' %]




[% USE AuthorisedValues %]

[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">
[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
   <div id="bd">
[% INCLUDE 'masthead.inc' %]


<div id="doc2" class="yui-t7">
        <div id="yui-main">
            <div class="yui-b">
                <div class="yui-g">

                    <div id="search-toolbar">
                        <form id="search_courses_form">
                            <input type="text" name="search_on" id="search_on" />
                            <input type="submit" value="Search" />
                        </form>
                    </div><!-- /toolbar -->

                    <h1>Courses</h1>
                    <table id="course_reserves_table">
                        <thead>
                            <tr>
                                <th>Name</th>
                                <th>Dept.</th>
                                <th>Course #</th>
                                <th>Section</th>
                                <th>Term</th>
                                <th>Instructors</th>
                                <th>Notes</th>
                            </tr>
                        </thead>

                        <tbody>
                            [% FOREACH c IN courses %]
                                <tr>
                                    <td><a href="opac-course-details.pl?course_id=[% c.course_id %]">[% c.course_name %]</a></td>
                                    <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) %]</td>
                                    <td>[% c.course_number %]</td>
                                    <td>[% c.section %]</td>
                                    <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) %]</td>
                                    <td>
                                      [% FOREACH i IN c.instructors %]
                                          <div class="instructor">[% i.firstname %] [% i.surname %]</div>
                                      [% END %]
                                    </td>
                                    <td>[% c.public_note %]</td>
                            [% END %]
                        </tbody>
                    </table>
                </div>
            </div>
        </div>
</div>


[% INCLUDE 'opac-bottom.inc' %]




[% USE KohaDates %]
[% USE AuthorisedValues %]
[% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnDetail ) %]
[% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnDetail ) %]

[% ShowCourseReservesHeader = 0 %]
[% IF UseCourseReserves %]
    [% FOREACH ITEM_RESULT IN itemloop %]
       [% IF ITEM_RESULT.course_reserves %]
           [% FOREACH r IN ITEM_RESULT.course_reserves %]
               [% IF r.course.enabled == 'yes' %]
                   [% ShowCourseReservesHeader = 1 %]
               [% END %]
           [% END %]
        [% END %]
    [% END %]
[% END %]

[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>

        [% ELSIF show_priority %]
            <th>Item hold queue priority</th>
        [% END %]
        [% IF ( ShowCourseReservesHeader ) %]<th id="item_coursereserves">Course Reserves</th>[% END %]
        </tr></thead>
	    <tbody>[% FOREACH ITEM_RESULT IN items %]
      [% IF ITEM_RESULT.this_branch %]<tr class="highlight-row-detail">[% ELSE %]<tr>[% END %]

            [% END %]
                </td>
        [% END %]
        [% IF ShowCourseReservesHeader %]
            <td>
                [% IF ITEM_RESULT.course_reserves %]
                    [% FOREACH r IN ITEM_RESULT.course_reserves %]
                        <p>
                            <a href="opac-course-details.pl?course_id=[% r.course.course_id %]">
                                [% r.course.course_name %]
                                <!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
                                [% IF r.course.section %] [% r.course.section %] [% END %]
                                [% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
                            </a>
                        </p>
                    [% END %]
                [% END %]
            </td>
        [% END %]
	    </tr>
	    [% END %]</tbody>
	</table>




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use C4::Koha;

use C4::CourseReserves;

my $cgi = new CGI;

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {
        template_name   => "opac-course-details.tmpl",
        query           => $cgi,
        type            => "opac",
        authnotrequired => 1,
        debug           => 1,
    }
);

my $action = $cgi->param('action') || '';
my $course_id = $cgi->param('course_id');

die( "No course_id given" ) unless ( $course_id );

if ( $action eq 'del_reserve' ) {
    DelCourseReserve( cr_id => $cgi->param('cr_id') );
}

my $course = GetCourse( $course_id );
my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 );

$template->param(
    course => $course,
    course_reserves => $course_reserves,
);

output_html_with_http_headers $cgi, $cookie, $template->output;




#!/usr/bin/perl

#
# Copyright 2012 Bywater Solutions
#
# 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 Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;

use C4::CourseReserves;

my $cgi = new CGI;

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {
        template_name   => "opac-course-reserves.tmpl",
        query           => $cgi,
        type            => "opac",
        authnotrequired => 1,
        debug           => 1,
    }
);

my $search_on = $cgi->param('search_on');

my $courses = SearchCourses( term => $search_on, enabled => 'yes' );

if ( @$courses == 1 ) {
    print $cgi->redirect("/cgi-bin/koha/opac-course-details.pl?course_id=" . $courses->[0]->{'course_id'});
} else {
    $template->param( courses => $courses );
    output_html_with_http_headers $cgi, $cookie, $template->output;
}

Lines 50-55 use List::MoreUtils qw/any none/; Link Here

(-)a/opac/opac-detail.pl (+7 lines)
50	use C4::Images;	50	use C4::Images;
51	use Koha::DateUtils;	51	use Koha::DateUtils;
52	use C4::HTML5Media;	52	use C4::HTML5Media;
		53	use C4::CourseReserves;
53		54
54	BEGIN {	55	BEGIN {
55	if (C4::Context->preference('BakerTaylorEnabled')) {	56	if (C4::Context->preference('BakerTaylorEnabled')) {
Lines 1055-1058 if (C4::Context->preference('OpacHighlightedWords')) { Link Here
1055	}	1056	}
1056	$template->{VARS}->{'trackclicks'} = C4::Context->preference('TrackClicks');	1057	$template->{VARS}->{'trackclicks'} = C4::Context->preference('TrackClicks');
1057		1058
		1059	if ( C4::Context->preference('UseCourseReserves') ) {
		1060	foreach my $i ( @items ) {
		1061	$i->{'course_reserves'} = GetItemReservesInfo( itemnumber => $i->{'itemnumber'} );
		1062	}
		1063	}
		1064
1058	output_html_with_http_headers $query, $cookie, $template->output;	1065	output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl
#
# This is to test C4/Members
# It requires a working Koha database with the sample data

use strict;
use warnings;

use Test::More tests => 16;
use Data::Dumper;

BEGIN {
   use_ok('C4::Context');
        use_ok('C4::CourseReserves');
}

my $dbh = C4::Context->dbh;
$dbh->do("TRUNCATE TABLE course_instructors");
$dbh->do("TRUNCATE TABLE courses");
$dbh->do("TRUNCATE TABLE course_reserves");

my $sth = $dbh->prepare("SELECT * FROM borrowers ORDER BY RAND() LIMIT 10");
$sth->execute();
my @borrowers = @{$sth->fetchall_arrayref({})};

$sth = $dbh->prepare("SELECT * FROM items ORDER BY RAND() LIMIT 10");
$sth->execute();
my @items = @{$sth->fetchall_arrayref({})};

my $course_id = ModCourse(
      course_name => "Test Course",
  staff_note => "Test staff note",
       public_note => "Test public note",
);

ok( $course_id, "ModCourse created course successfully" );

$course_id = ModCourse(
     course_id => $course_id,
       staff_note => "Test staff note 2",
);

my $course = GetCourse( $course_id );

ok( $course->{'course_name'} eq "Test Course", "GetCourse returned correct course" );
ok( $course->{'staff_note'} eq "Test staff note 2", "ModCourse updated course succesfully" );

my $courses = GetCourses();
ok( $courses->[0]->{'course_name'} eq "Test Course", "GetCourses returns valid array of course data" );

ModCourseInstructors( mode => 'add', course_id => $course_id, borrowernumbers => [ $borrowers[0]->{'borrowernumber'} ] );
$course = GetCourse( $course_id );
ok( $course->{'instructors'}->[0]->{'borrowernumber'} == $borrowers[0]->{'borrowernumber'}, "ModCourseInstructors added instructors correctly");

my $course_instructors = GetCourseInstructors( $course_id );
ok( $course_instructors->[0]->{'borrowernumber'} eq $borrowers[0]->{'borrowernumber'}, "GetCourseInstructors returns valid data" );

my $ci_id = ModCourseItem( 'itemnumber' => $items[0]->{'itemnumber'} );
ok( $ci_id, "ModCourseItem returned valid data" );

my $course_item = GetCourseItem( 'ci_id' => $ci_id );
ok( $course_item->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetCourseItem returns valid data" );

my $cr_id = ModCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id );
ok( $cr_id, "ModCourseReserve returns valid data" );

my $course_reserve = GetCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id );
ok( $course_reserve->{'cr_id'} eq $cr_id, "GetCourseReserve returns valid data" );

my $course_reserves = GetCourseReserves( 'course_id' => $course_id );
ok( $course_reserves->[0]->{'ci_id'} eq $ci_id, "GetCourseReserves returns valid data." );

my $info = GetItemReservesInfo( itemnumber => $items[0]->{'itemnumber'} );
ok( $info->[0]->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetItemReservesInfo returns valid data." );

DelCourseReserve( 'cr_id' => $cr_id );
$course_reserve = GetCourseReserve( 'cr_id' => $cr_id );
ok( !defined( $course_reserve->{'cr_id'} ), "DelCourseReserve functions correctly" );

DelCourse( $course_id );
$course = GetCourse( $course_id );
ok( !defined( $course->{'course_id'} ), "DelCourse deleted course successfully" );

$dbh->do("TRUNCATE TABLE course_instructors");
$dbh->do("TRUNCATE TABLE courses");
$dbh->do("TRUNCATE TABLE course_reserves");

exit;

Return to bug 8215

Lines 469-474 CREATE TABLE collections_tracking ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+102 lines)
469	) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;	469	) ENGINE=InnoDB DEFAULT CHARACTER SET utf8;
470		470
471	--	471	--
		472	-- Table structure for table `courses`
		473	--
		474
		475	-- The courses table stores the courses created for the
		476	-- course reserves feature.
		477
		478	DROP TABLE IF EXISTS courses;
		479	CREATE TABLE `courses` (
		480	`course_id` int(11) NOT NULL AUTO_INCREMENT,
		481	`department` varchar(20) DEFAULT NULL, -- Stores the authorised value DEPT
		482	`course_number` varchar(255) DEFAULT NULL, -- An arbitrary field meant to store the "course number" assigned to a course
		483	`section` varchar(255) DEFAULT NULL, -- Also arbitrary, but for the 'section' of a course.
		484	`course_name` varchar(255) DEFAULT NULL,
		485	`term` varchar(20) DEFAULT NULL, -- Stores the authorised value TERM
		486	`staff_note` mediumtext,
		487	`public_note` mediumtext,
		488	`students_count` varchar(20) DEFAULT NULL, -- Meant to be just an estimate of how many students will be taking this course/section
		489	`enabled` enum('yes','no') NOT NULL DEFAULT 'yes', -- Determines whether the course is active
		490	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		491	PRIMARY KEY (`course_id`)
		492	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		493
		494	--
		495	-- Table structure for table `course_instructors`
		496	--
		497
		498	-- The course instructors table links Koha borrowers to the
		499	-- courses they are teaching. Many instructors can teach many
		500	-- courses. course_instructors is just a many-to-many join table.
		501
		502	DROP TABLE IF EXISTS course_instructors;
		503	CREATE TABLE `course_instructors` (
		504	`course_id` int(11) NOT NULL,
		505	`borrowernumber` int(11) NOT NULL,
		506	PRIMARY KEY (`course_id`,`borrowernumber`),
		507	KEY `borrowernumber` (`borrowernumber`)
		508	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		509
		510	--
		511	-- Constraints for table `course_instructors`
		512	--
		513	ALTER TABLE `course_instructors`
		514	ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`),
		515	ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
		516
		517	--
		518	-- Table structure for table `course_items`
		519	--
		520
		521	-- If an item is placed on course reserve for one or more courses
		522	-- it will have an entry in this table. No matter how many courses an item
		523	-- is part of, it will only have one row in this table.
		524
		525	DROP TABLE IF EXISTS course_items;
		526	CREATE TABLE `course_items` (
		527	`ci_id` int(11) NOT NULL AUTO_INCREMENT,
		528	`itemnumber` int(11) NOT NULL, -- items.itemnumber for the item on reserve
		529	`itype` varchar(10) DEFAULT NULL, -- an optional new itemtype for the item to have while on reserve
		530	`ccode` varchar(10) DEFAULT NULL, -- an optional new category code for the item to have while on reserve
		531	`holdingbranch` varchar(10) DEFAULT NULL, -- an optional new holding branch for the item to have while on reserve
		532	`location` varchar(80) DEFAULT NULL, -- an optional new shelving location for the item to have while on reseve
		533	`enabled` enum('yes','no') NOT NULL DEFAULT 'no', -- If at least one enabled course has this item on reseve, this field will be 'yes', otherwise it will be 'no'
		534	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		535	PRIMARY KEY (`ci_id`),
536	UNIQUE KEY `itemnumber` (`itemnumber`),
537	KEY `holdingbranch` (`holdingbranch`)
538	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
539
540	--
541	-- Constraints for table `course_items`
542	--
543	ALTER TABLE `course_items`
544	ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
545	ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
546
547	--
548	-- Table structure for table `course_reserves`
549	--
550
551	-- This table connects an item placed on course reserve to a course it is on reserve for.
552	-- There will be a row in this table for each course an item is on reserve for.
553
554	DROP TABLE IF EXISTS course_reserves;
555	CREATE TABLE `course_reserves` (
556	`cr_id` int(11) NOT NULL AUTO_INCREMENT,
557	`course_id` int(11) NOT NULL, -- Foreign key to the courses table
558	`ci_id` int(11) NOT NULL, -- Foreign key to the course_items table
559	`staff_note` mediumtext, -- Staff only note
560	`public_note` mediumtext, -- Public, OPAC visible note
561	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
562	PRIMARY KEY (`cr_id`),
563	UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`),
564	KEY `course_id` (`course_id`)
565	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
566
567	--
568	-- Constraints for table `course_reserves`
569	--
570	ALTER TABLE `course_reserves`
571	ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`);
572
573	--
472	-- Table structure for table `branch_borrower_circ_rules`	574	-- Table structure for table `branch_borrower_circ_rules`
473	--	575	--
474		576

Lines 5801-5807 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +90 lines)
5801	SetVersion($DBversion);	5801	SetVersion($DBversion);
5802	}	5802	}
5803		5803
5804
5805	$DBversion = "3.09.00.047";	5804	$DBversion = "3.09.00.047";
5806	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {	5805	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5807	# to preserve default behaviour as best as possible, set this new preference differently depending on whether IndependantBranches is set or not	5806	# to preserve default behaviour as best as possible, set this new preference differently depending on whether IndependantBranches is set or not
Lines 6846-6851 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6846	SetVersion ($DBversion);	6845	SetVersion ($DBversion);
6847	}	6846	}
6848		6847
		6848	$DBversion = "3.13.00.XXX";
		6849	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
		6850	$dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('UseCourseReserves', '0', NULL, 'Enable the course reserves feature.', 'YesNo')");
		6851	$dbh->do("INSERT INTO userflags (bit,flag,flagdesc,defaulton) VALUES ('18','coursereserves','Course Reserves','0')");
		6852	$dbh->do("
		6853	CREATE TABLE `courses` (
		6854	`course_id` int(11) NOT NULL AUTO_INCREMENT,
		6855	`department` varchar(20) DEFAULT NULL,
		6856	`course_number` varchar(255) DEFAULT NULL,
		6857	`section` varchar(255) DEFAULT NULL,
		6858	`course_name` varchar(255) DEFAULT NULL,
		6859	`term` varchar(20) DEFAULT NULL,
		6860	`staff_note` mediumtext,
		6861	`public_note` mediumtext,
		6862	`students_count` varchar(20) DEFAULT NULL,
		6863	`enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
		6864	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		6865	PRIMARY KEY (`course_id`)
		6866	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		6867	");
		6868
		6869	$dbh->do("
		6870	CREATE TABLE `course_instructors` (
		6871	`course_id` int(11) NOT NULL,
		6872	`borrowernumber` int(11) NOT NULL,
		6873	PRIMARY KEY (`course_id`,`borrowernumber`),
		6874	KEY `borrowernumber` (`borrowernumber`)
		6875	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		6876	");
		6877
		6878	$dbh->do("
		6879	ALTER TABLE `course_instructors`
		6880	ADD CONSTRAINT `course_instructors_ibfk_2` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`),
		6881	ADD CONSTRAINT `course_instructors_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
		6882	");
		6883
		6884	$dbh->do("
		6885	CREATE TABLE `course_items` (
		6886	`ci_id` int(11) NOT NULL AUTO_INCREMENT,
		6887	`itemnumber` int(11) NOT NULL,
		6888	`itype` varchar(10) DEFAULT NULL,
		6889	`ccode` varchar(10) DEFAULT NULL,
		6890	`holdingbranch` varchar(10) DEFAULT NULL,
		6891	`location` varchar(80) DEFAULT NULL,
		6892	`enabled` enum('yes','no') NOT NULL DEFAULT 'no',
		6893	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
		6894	PRIMARY KEY (`ci_id`),
		6895	UNIQUE KEY `itemnumber` (`itemnumber`),
		6896	KEY `holdingbranch` (`holdingbranch`)
		6897	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		6898	");
		6899
		6900	$dbh->do("
		6901	ALTER TABLE `course_items`
		6902	ADD CONSTRAINT `course_items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
		6903	ADD CONSTRAINT `course_items_ibfk_1` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
		6904	");
		6905
		6906	$dbh->do("
		6907	CREATE TABLE `course_reserves` (
		6908	`cr_id` int(11) NOT NULL AUTO_INCREMENT,
		6909	`course_id` int(11) NOT NULL,
		6910	`ci_id` int(11) NOT NULL,
		6911	`staff_note` mediumtext,
6912	`public_note` mediumtext,
6913	`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
6914	PRIMARY KEY (`cr_id`),
6915	UNIQUE KEY `pseudo_key` (`course_id`,`ci_id`),
6916	KEY `course_id` (`course_id`)
6917	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
6918	");
6919
6920	$dbh->do("
6921	ALTER TABLE `course_reserves`
6922	ADD CONSTRAINT `course_reserves_ibfk_1` FOREIGN KEY (`course_id`) REFERENCES `courses` (`course_id`);
6923	");
6924
6925	$dbh->do("
6926	INSERT INTO permissions (module_bit, code, description) VALUES
6927	(18, 'manage_courses', 'Add, edit and delete courses'),
6928	(18, 'add_reserves', 'Add course reserves'),
6929	(18, 'delete_reserves', 'Remove course reserves')
6930	;
6931	");
6932
6933
6934	print "Upgrade to $DBversion done (Add Course Reserves ( system preference UseCourseReserves ))\n";
6935	SetVersion($DBversion);
6936	}
6937
6849	=head1 FUNCTIONS	6938	=head1 FUNCTIONS
6850		6939
6851	=head2 TableExists($table)	6940	=head2 TableExists($table)

Lines 203-208 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (+2 lines)
203	$template->param( CAN_user_reports => 1 );	203	$template->param( CAN_user_reports => 1 );
204	$template->param( CAN_user_staffaccess => 1 );	204	$template->param( CAN_user_staffaccess => 1 );
205	$template->param( CAN_user_plugins => 1 );	205	$template->param( CAN_user_plugins => 1 );
		206	$template->param( CAN_user_coursereserves => 1 );
206	foreach my $module (keys %$all_perms) {	207	foreach my $module (keys %$all_perms) {
207	foreach my $subperm (keys %{ $all_perms->{$module} }) {	208	foreach my $subperm (keys %{ $all_perms->{$module} }) {
208	$template->param( "CAN_user_${module}_${subperm}" => 1 );	209	$template->param( "CAN_user_${module}_${subperm}" => 1 );
Lines 327-332 sub get_template_and_user { Link Here
327	noItemTypeImages => C4::Context->preference("noItemTypeImages"),	328	noItemTypeImages => C4::Context->preference("noItemTypeImages"),
328	marcflavour => C4::Context->preference("marcflavour"),	329	marcflavour => C4::Context->preference("marcflavour"),
329	persona => C4::Context->preference("persona"),	330	persona => C4::Context->preference("persona"),
		331	UseCourseReserves => C4::Context->preference("UseCourseReserves"),
330	);	332	);
331	if ( $in->{'type'} eq "intranet" ) {	333	if ( $in->{'type'} eq "intranet" ) {
332	$template->param(	334	$template->param(

Line 0 Link Here

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (+34 lines)
	1	package Koha::Template::Plugin::AuthorisedValues;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use Encode qw{encode decode};
	26
	27	use C4::Koha;
	28
	29	sub GetByCode {
	30	my ( $self, $category, $code, $opac ) = @_;
	31	return encode('UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) );
	32	}
	33
	34	1;

Line 0 Link Here

(-)a/Koha/Template/Plugin/Branches.pm (+37 lines)
	1	package Koha::Template::Plugin::Branches;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use C4::Koha;
	26
	27	sub GetName {
	28	my ( $self, $branchcode ) = @_;
	29
	30	my $query = "SELECT branchname FROM branches WHERE branchcode = ?";
	31	my $sth = C4::Context->dbh->prepare($query);
	32	$sth->execute($branchcode);
	33	my $b = $sth->fetchrow_hashref();
	34	return $b->{'branchname'};
	35	}
	36
	37	1;

Line 0 Link Here

(-)a/Koha/Template/Plugin/ItemTypes.pm (+38 lines)
	1	package Koha::Template::Plugin::ItemTypes;
	2
	3	# Copyright ByWater Solutions 2012
	4
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 2 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21
	22	use Template::Plugin;
	23	use base qw( Template::Plugin );
	24
	25	use C4::Koha;
	26
	27	sub GetDescription {
	28	my ( $self, $itemtype ) = @_;
	29
	30	my $query = "SELECT description FROM itemtypes WHERE itemtype = ?";
	31	my $sth = C4::Context->dbh->prepare($query);
	32	$sth->execute($itemtype);
	33	my $d = $sth->fetchrow_hashref();
	34	return $d->{'description'};
	35
	36	}
	37
	38	1;

Line 0 Link Here

(-)a/course_reserves/add_items.pl (+97 lines)
		1	#!/usr/bin/perl
		2
		3	#
		4	# Copyright 2012 Bywater Solutions
		5	#
		6	# This file is part of Koha.
		7	#
		8	# Koha is free software; you can redistribute it and/or modify it under the
		9	# terms of the GNU General Public License as published by the Free Software
		10	# Foundation; either version 2 of the License, or (at your option) any later
		11	# version.
		12	#
		13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License along
		18	# with Koha; if not, write to the Free Software Foundation, Inc.,
		19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		20
		21	use Modern::Perl;
		22
		23	use CGI;
		24
		25	use C4::Auth;
		26	use C4::Output;
		27	use C4::Koha;
		28	use C4::Biblio;
		29	use C4::Branch;
		30
		31	use C4::CourseReserves;
		32
		33	my $cgi = new CGI;
		34
		35	my $action = $cgi->param('action') \|\| '';
		36	my $course_id = $cgi->param('course_id') \|\| '';
		37	my $barcode = $cgi->param('barcode') \|\| '';
		38
		39	die('No course_id provided') unless ($course_id);
		40
		41	my $item = GetBiblioFromItemNumber( undef, $barcode );
		42
		43	my $step = ( $action eq 'lookup' && $item ) ? '2' : '1';
		44
		45	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		46	{
		47	template_name => "course_reserves/add_items-step$step.tmpl",
		48	query => $cgi,
		49	type => "intranet",
		50	authnotrequired => 0,
		51	flagsrequired => { coursereserves => 'add_reserves' },
		52	}
		53	);
		54	$template->param( ERROR_BARCODE_NOT_FOUND => $barcode )
		55	unless ( $barcode && $item && $action eq 'lookup' );
		56
		57	$template->param( course => GetCourse($course_id) );
		58
		59	if ( $action eq 'lookup' ) {
		60	my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
		61	my $course_reserve = ($course_item)
		62	? GetCourseReserve(
		63	course_id => $course_id,
		64	ci_id => $course_item->{'ci_id'}
65	)
66	: undef;
67
68	$template->param(
69	item => $item,
70	course_item => $course_item,
71	course_reserve => $course_reserve,
72
73	ccodes => GetAuthorisedValues('CCODE'),
74	locations => GetAuthorisedValues('LOC'),
75	itypes => GetItemTypes( style => 'array' ),
76	branches => GetBranchesLoop(),
77	);
78
79	}
80	elsif ( $action eq 'add' ) {
81	my $ci_id = ModCourseItem(
82	itemnumber => $cgi->param('itemnumber'),
83	itype => $cgi->param('itype'),
84	ccode => $cgi->param('ccode'),
85	holdingbranch => $cgi->param('holdingbranch'),
86	location => $cgi->param('location'),
87	);
88
89	my $cr_id = ModCourseReserve(
90	course_id => $course_id,
91	ci_id => $ci_id,
92	staff_note => $cgi->param('staff_note'),
93	public_note => $cgi->param('public_note'),
94	);
95	}
96
97	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/course-details.pl (+67 lines)
		1	#!/usr/bin/perl
		2
		3	#
		4	# Copyright 2012 Bywater Solutions
		5	#
		6	# This file is part of Koha.
		7	#
		8	# Koha is free software; you can redistribute it and/or modify it under the
		9	# terms of the GNU General Public License as published by the Free Software
		10	# Foundation; either version 2 of the License, or (at your option) any later
		11	# version.
		12	#
		13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License along
		18	# with Koha; if not, write to the Free Software Foundation, Inc.,
		19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		20
		21	use Modern::Perl;
		22
		23	use CGI;
		24
		25	use C4::Auth;
		26	use C4::Output;
		27	use C4::Koha;
		28
		29	use C4::CourseReserves;
		30
		31	my $cgi = new CGI;
		32
		33	my $action = $cgi->param('action') \|\| '';
		34	my $course_id = $cgi->param('course_id');
		35
		36	my $flagsrequired;
		37	$flagsrequired->{coursereserves} = 'delete_reserves' if ( $action eq 'del_reserve' );
		38
		39	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		40	{
		41	template_name => "course_reserves/course-details.tmpl",
		42	query => $cgi,
		43	type => "intranet",
		44	authnotrequired => 0,
		45	flagsrequired => $flagsrequired,
		46	}
		47	);
		48
		49	die("No course_id given") unless ($course_id);
		50
		51	if ( $action eq 'del_reserve' ) {
		52	DelCourseReserve( cr_id => $cgi->param('cr_id') );
		53	}
		54
		55	my $course = GetCourse($course_id);
		56	my $course_reserves = GetCourseReserves(
		57	course_id => $course_id,
		58	include_items => 1,
		59	include_courses => 1
		60	);
		61
		62	$template->param(
		63	course => $course,
		64	course_reserves => $course_reserves,
65	);
66
67	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/course-reserves.pl (+54 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27
	28	use C4::CourseReserves;
	29
	30	my $cgi = new CGI;
	31
	32	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	33	{
	34	template_name => "course_reserves/course-reserves.tmpl",
	35	query => $cgi,
	36	type => "intranet",
	37	authnotrequired => 0,
	38	flagsrequired => {},
	39	}
	40	);
	41
	42	my $search_on = $cgi->param('search_on');
	43	my %params;
	44	if ($search_on) {
	45	$params{'course_name'} = "%$search_on%";
	46	}
	47
	48	my $courses = GetCourses(%params);
	49	if ( $search_on && @$courses == 1 ) {
	50	print $cgi->redirect("/cgi-bin/koha/course_reserves/course-details.pl?course_id=" . $courses->[0]->{'course_id'});
	51	} else {
	52	$template->param( courses => $courses );
	53	output_html_with_http_headers $cgi, $cookie, $template->output;
	54	}

Line 0 Link Here

(-)a/course_reserves/course.pl (+55 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27	use C4::Koha;
	28
	29	use C4::CourseReserves;
	30
	31	my $cgi = new CGI;
	32
	33	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	34	{
	35	template_name => "course_reserves/course.tmpl",
	36	query => $cgi,
	37	type => "intranet",
	38	authnotrequired => 0,
	39	flagsrequired => { coursereserves => 'manage_courses' },
	40	}
	41	);
	42
	43	my $course_id = $cgi->param('course_id');
	44
	45	if ($course_id) {
	46	my $course = GetCourse($course_id);
	47	$template->param(%$course);
	48	}
	49
	50	$template->param(
	51	departments => GetAuthorisedValues('DEPARTMENT'),
	52	terms => GetAuthorisedValues('TERM'),
	53	);
	54
	55	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/course_reserves/mod_course.pl (+72 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2012 ByWater Solutions
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 2 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	use Modern::Perl;
		21
		22	use CGI;
		23
		24	use C4::Output;
		25	use C4::Reserves;
		26	use C4::Auth;
		27
		28	use C4::CourseReserves;
		29
		30	my $cgi = new CGI;
		31	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		32	{
		33	template_name => "about.tmpl",
		34	query => $cgi,
		35	type => "intranet",
		36	authnotrequired => 0,
		37	flagsrequired => { coursereserves => 'manage_courses' },
		38	}
		39	);
		40
		41	my $action = $cgi->param('action');
		42
		43	if ( $action eq 'del' ) {
		44	DelCourse( $cgi->param('course_id') );
		45	print $cgi->redirect("/cgi-bin/koha/course_reserves/course-reserves.pl");
		46	}
		47	else {
		48	my %params;
		49
		50	$params{'course_id'} = $cgi->param('course_id')
		51	if ( $cgi->param('course_id') );
		52	$params{'department'} = $cgi->param('department');
		53	$params{'course_number'} = $cgi->param('course_number');
		54	$params{'section'} = $cgi->param('section');
		55	$params{'course_name'} = $cgi->param('course_name');
		56	$params{'term'} = $cgi->param('term');
		57	$params{'staff_note'} = $cgi->param('staff_note');
		58	$params{'public_note'} = $cgi->param('public_note');
		59	$params{'students_count'} = $cgi->param('students_count');
		60	$params{'enabled'} = ( $cgi->param('enabled') eq 'on' ) ? 'yes' : 'no';
		61
		62	my $course_id = ModCourse(%params);
		63
		64	my @instructors = $cgi->param('instructors');
65	ModCourseInstructors(
66	mode => 'replace',
67	cardnumbers => \@instructors,
68	course_id => $course_id
69	);
70	print $cgi->redirect(
71	"/cgi-bin/koha/course_reserves/course-details.pl?course_id=$course_id");
72	}

Lines 5-20 function _(s) { return s; } // dummy function for gettext Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js (-3 / +4 lines)
5		5
6	$(document).ready(function() {	6	$(document).ready(function() {
7	$('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });	7	$('#header_search').tabs().bind('tabsshow', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });
8	$(".close").click(function(){ window.close(); });	8
		9	$(".close").click(function(){ window.close(); });
		10
9	if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }	11	if($("#header_search #checkin_search").length > 0){ $(document).bind('keydown','Alt+r',function (){ $("#header_search").tabs("select","#checkin_search"); $("#ret_barcode").focus(); }); } else { $(document).bind('keydown','Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
10	if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }	12	if($("#header_search #circ_search").length > 0){ $(document).bind('keydown','Alt+u',function (){ $("#header_search").tabs("select","#circ_search"); $("#findborrower").focus(); }); } else { $(document).bind('keydown','Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
11	if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }	13	if($("#header_search #catalog_search").length > 0){ $(document).bind('keydown','Alt+q',function (){ $("#header_search").tabs("select","#catalog_search"); $("#search-form").focus(); }); } else { $(document).bind('keydown','Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
		14
12	$(".focus").focus();	15	$(".focus").focus();
13	$(".validated").validate();	16	$(".validated").validate();
14	});	17	});
15		18
16
17
18	// http://jennifermadden.com/javascript/stringEnterKeyDetector.html	19	// http://jennifermadden.com/javascript/stringEnterKeyDetector.html
19	function checkEnter(e){ //e is event object passed from function invocation	20	function checkEnter(e){ //e is event object passed from function invocation
20	var characterCode; // literal character code will be stored in this variable	21	var characterCode; // literal character code will be stored in this variable

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+34 lines)
		1	[% USE AuthorisedValues %]
		2
		3	[% ShowCourseReserves = 0 %]
		4	[% IF UseCourseReserves %]
		5	[% FOREACH item IN itemloop %]
		6	[% IF item.course_reserves %]
		7	[% FOREACH r IN item.course_reserves %]
		8	[% IF r.course.enabled == 'yes' %]
		9	[% ShowCourseReserves = 1 %]
		10	[% END %]
		11	[% END %]
		12	[% END %]
		13	[% END %]
		14	[% END %]
		15
1	[% INCLUDE 'doc-head-open.inc' %]	16	[% INCLUDE 'doc-head-open.inc' %]
2	[% INCLUDE 'greybox.inc' %]	17	[% INCLUDE 'greybox.inc' %]
3	<title>Koha &rsaquo; Catalog &rsaquo;	18	<title>Koha &rsaquo; Catalog &rsaquo;
Lines 370-375 function verify_images() { Link Here
370	[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]	385	[% IF ( SpineLabelShowPrintOnBibDetails ) %]<th>Spine label</th>[% END %]
371	[% IF ( hostrecords ) %]<th>Host records</th>[% END %]	386	[% IF ( hostrecords ) %]<th>Host records</th>[% END %]
372	[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]	387	[% IF ( analyze ) %]<th>Used in</th><th></th>[% END %]
		388	[% IF ( ShowCourseReserves ) %]<th>Course Reserves</th>[% END %]
373	</tr>	389	</tr>
374	</thead>	390	</thead>
375	<tbody>	391	<tbody>
Lines 520-525 function verify_images() { Link Here
520	<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber %]&hostitemnumber=[% item.itemnumber %]">Create analytics</a></td>	536	<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber %]&hostitemnumber=[% item.itemnumber %]">Create analytics</a></td>
521	[% END %]	537	[% END %]
522		538
		539	[% IF ShowCourseReserves %]
		540	<td>
		541	[% IF item.course_reserves %]
		542	[% FOREACH r IN item.course_reserves %]
		543	[% IF r.course.enabled == 'yes' %]
		544	<p>
		545	<a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id %]">
		546	[% r.course.course_name %]
		547	<!--[% IF r.course.course_number %] [% r.course.course_number %] [% END %]-->
		548	[% IF r.course.section %] [% r.course.section %] [% END %]
		549	[% IF r.course.term %] [% AuthorisedValues.GetByCode( 'TERM', r.course.term ) %] [% END %]
		550	</a>
		551	</p>
		552	[% END %]
		553	[% END %]
		554	[% END %]
		555	</td>
		556	[% END %]
523	</tr>	557	</tr>
524	[% END %]	558	[% END %]
525	</tbody>	559	</tbody>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt (+63 lines)
	1	[% INCLUDE 'doc-head-open.inc' %]
	2	<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
	3	[% INCLUDE 'doc-head-close.inc' %]
	4	</head>
	5
	6	<script type="text/javascript">
	7	//<![CDATA[
	8
	9	$(document).ready(function() {
	10	$('#barcode').focus();
	11	});
	12
	13	//]]>
	14	</script>
	15
	16	<body>
	17
	18	[% INCLUDE 'header.inc' %]
	19	[% INCLUDE 'cat-search.inc' %]
	20
	21	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Add reserves for <i><a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]">[% course.course_name %]</a></i></div>
	22
	23	<div id="doc2" class="yui-t7">
	24	<div id="bd">
	25	<div id="yui-main">
	26	<div class="yui-b">
	27	<div class="yui-g">
	28	<div class="yui-u first">
	29	[% IF ERROR_BARCODE_NOT_FOUND %]
	30	<div class="error">No item found for barcode [% ERROR_BARCODE_NOT_FOUND %]</div>
	31	[% END %]
	32
	33	<form method="post" action="/cgi-bin/koha/course_reserves/add_items.pl">
	34	<input type="hidden" name="course_id" value="[% course.course_id %]" />
	35	<input type="hidden" name="action" value="lookup" />
	36
	37	<fieldset class="rows">
	38	<legend>Add items: scan barcode</legend>
	39
	40	<p>
	41
	42	<li>
	43	<label class="required" for="barcode">Item barcode:</label>
	44	<input id="barcode" name="barcode" type="text" />
	45	</li>
	46	</ol>
	47	</fieldset>
	48
	49	<fieldset class="action">
	50	<input type="submit" value="Submit" class="submit" />
	51
	52	<a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id %]" class="cancel">Cancel</a>
	53	</fieldset>
	54	</form>
	55	</div>
	56	</div>
	57	</div>
	58	</div>
	59	</div>
	60	</div>
	61
	62
	63	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt (+185 lines)
		1	[% USE AuthorisedValues %]
		2	[% USE ItemTypes %]
		3	[% USE Branches %]
		4	[% INCLUDE 'doc-head-open.inc' %]
		5	<title>Koha &rsaquo; Course reserves &rsaquo; New course</title>
		6	[% INCLUDE 'doc-head-close.inc' %]
		7
		8	<script type="text/javascript">
		9	//<![CDATA[
		10
		11	function confirmItemDelete(){
		12	return confirm( _('Are you sure you want to delete this item?');
		13	}
		14
		15	//]]>
		16	</script>
		17
		18	</head>
		19
		20	<body>
		21
		22	[% INCLUDE 'header.inc' %]
		23	[% INCLUDE 'cat-search.inc' %]
		24
		25	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a> &rsaquo; Course details for <i>[% course.course_name %]</i></div>
		26
		27	<div id="doc2" class="yui-t7">
		28	<div id="bd">
		29	<div id="yui-main">
		30	<div id="toolbar">
		31	<script type="text/javascript">
		32	//<![CDATA[
		33	$(document).ready(function(){
		34	addItemsButton = new YAHOO.widget.Button("add_items");
		35	editCourseButton = new YAHOO.widget.Button("edit_course");
		36	deleteCourseButton = new YAHOO.widget.Button("delete_course");
		37
		38	deleteCourseButton.on("click", confirmDelete );
		39	});
		40
		41	function confirmDelete(p_oEvent){
		42	if ( ! confirm( _('Are you sure you want to delete this course?') ) ) {
		43	YAHOO.util.Event.stopEvent( p_oEvent );
		44	}
		45	}
		46
		47	//]]>
		48	</script>
		49	<ul class="toolbar">
		50	[% IF CAN_user_coursereserves_add_reserves %]<li><a id="add_items" href="/cgi-bin/koha/course_reserves/add_items.pl?course_id=[% course.course_id %]">Add reserves</a></li>[% END %]
		51	[% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="edit_course" href="/cgi-bin/koha/course_reserves/course.pl?course_id=[% course.course_id %]">Edit course</a></li>[% END %]
		52	[% IF ( CAN_user_coursereserves_manage_courses ) %]<li><a id="delete_course" href="/cgi-bin/koha/course_reserves/mod_course.pl?course_id=[% course.course_id %]&action=del">Delete course</a></li>[% END %]
		53	</ul>
		54	</div><!-- /toolbar -->
		55
		56	<table>
		57	<tr><th>Course name</th><td>[% course.course_name %]</td></tr>
		58	<tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
		59	<tr><th>Department</th><td>_[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
		60	<tr><th>Course number</th><td>[% course.course_number %]</td></tr>
		61	<tr><th>Section</th><td>[% course.section %]</td></tr>
		62	<tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber %]">[% i.firstname %] [% i.surname %]</a></div>[% END %]</td></tr>
		63	<tr><th>Staff note</th><td>[% course.staff_note %]</td></tr>
		64	<tr><th>Public note</th><td>[% course.public_note %]</td></tr>
65	<tr><th>Students count</th><td>[% course.students_count %]</td></tr>
66	<tr><th>Status</th><td>[% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</td></tr>
67	</table>
68
69	<table>
70	<thead>
71	<tr>
72	<th>Title</th>
73	<th>Barcode</th>
74	<th>Call number</th>
75	[% IF item_level_itypes %]<th>Item type</th>[% END %]
76	<th>Collection</th>
77	<th>Location</th>
78	<th>Library</th>
79	<th>Staff note</th>
80	<th>Public note</th>
81	[% IF CAN_user_coursereserves_add_reserves %]<th> <!-- Edit --></th>[% END %]
82	[% IF CAN_user_coursereserves_delete_reserves %]<th> <!-- Remove --></th>[% END %]
83	<th>Other course reserves</th>
84	</tr>
85	</thead>
86
87	<tbody>
88	[% FOREACH cr IN course_reserves %]
89	<tr>
90	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
91	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber %]&biblionumber=[% cr.item.biblionumber %]&bi=[% cr.item.biblioitemnumber %]">[% cr.item.barcode %]</a></td>
92	<td>[% cr.item.itemcallnumber %]</td>
93	[% IF item_level_itypes %]
94	<td>
95	[% IF cr.course_item.itype %]
96	[% IF cr.course_item.enabled == 'yes' %]
97	[% ItemTypes.GetDescription( cr.item.itype ) %]
98	[% ELSE %]
99	[% ItemTypes.GetDescription( cr.course_item.itype ) %]
100	[% END %]
101	[% ELSE %]
102	<i>Unchanged</i>
103	([% ItemTypes.GetDescription( cr.item.itype ) %])
104	[% END %]
105	</td>
106	[% END %]
107	<td>
108	[% IF cr.course_item.ccode %]
109	[% IF cr.course_item.enabled == 'yes' %]
110	[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]
111	[% ELSE %]
112	[% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) %]
113	[% END %]
114	[% ELSE %]
115	<i>Unchanged</i>
116	([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %])
117	[% END %]
118	</td>
119	<td>
120	[% IF cr.course_item.location %]
121	[% IF cr.course_item.enabled == 'yes' %]
122	[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]
123	[% ELSE %]
124	[% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) %]
125	[% END %]
126	[% ELSE %]
127	<i>Unchanged</i>
128	([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %])
129	[% END %]
130	</td>
131	<td>
132	[% IF cr.course_item.holdingbranch %]
133	[% IF cr.course_item.enabled == 'yes' %]
134	[% Branches.GetName( cr.item.holdingbranch ) %]
135	[% ELSE %]
136	[% Branches.GetName( cr.course_item.holdingbranch ) %]
137	[% END %]
138	[% ELSE %]
139	<i>Unchanged</i>
140	([% Branches.GetName( cr.item.holdingbranch ) %])
141	[% END %]
142	</td>
143	<td>[% cr.staff_note %]</td>
144	<td>[% cr.public_note %]</td>
145
146	[% IF CAN_user_coursereserves_add_reserves %]
147	<td><a href="add_items.pl?course_id=[% course.course_id %]&barcode=[% cr.item.barcode %]&action=lookup">Edit</a></td>
148	[% END %]
149
150	[% IF CAN_user_coursereserves_delete_reserves %]
151	<td>
152	[% IF cr.item.onloan %]
153	On Loan
154	[% ELSIF cr.item.itemlost %]
155	Item Lost
156	[% ELSE %]
157	<a href="course-details.pl?course_id=[% course.course_id %]&action=del_reserve&cr_id=[% cr.cr_id %]" onclick="return confirmItemDelete()" >Remove</a>
158	[% END %]
159
160	</td>
161	[% END %]
162
163	<td>
164	[% FOREACH course IN cr.courses %]
165	[% UNLESS cr.course_id == course.course_id %]
166	<p>
167	<a href="course-details.pl?course_id=[% course.course_id %]">
168	[% course.course_name %]
169	[% IF course.section %] [% course.section %] [% END %]
170	[% IF course.term %] [% AuthorisedValues.GetByCode( 'TERM', course.term ) %] [% END %]
171	</a>
172	</p>
173	[% END %]
174	[% END %]
175	</td>
176	</tr>
177	[% END %]
178	</tbody>
179	</table>
180	</div>
181	</div>
182	</div>
183
184
185	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt (+63 lines)
	1	[% USE KohaDates %]
	2	[% USE AuthorisedValues %]
	3	[% USE ItemTypes %]
	4	[% USE Branches %]
	5	[% INCLUDE 'doc-head-open.inc' %]
	6	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog
	7	[% INCLUDE 'doc-head-close.inc' %]
	8	</head>
	9	<body id="opac-main">
	10	[% IF ( OpacNav ) %]<div id="doc3" class="yui-t1">[% ELSE %]<div id="doc3" class="yui-t7">[% END %]
	11	<div id="bd">
	12	[% INCLUDE 'masthead.inc' %]
	13
	14	<div id="doc2" class="yui-t7">
	15	<div id="yui-main">
	16
	17	<table>
	18	<tr><th>Course Name</th><td>[% course.course_name %]</td></tr>
	19	<tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>
	20	<tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
	21	<tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
	22	<tr><th>Section</th><td>[% course.section %]</td></tr>
	23	<tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
	24	<tr><th>Notes</th><td>[% course.public_note %]</td></tr>
	25	</table>
	26
	27	<table>
	28	<thead>
	29	<tr>
	30	<th>Title</th>
	31	<th>Item type</th>
	32	<th>Location</th>
	33	<th>Collection</th>
	34	<th>Call number</th>
	35	<th>Copy</th>
	36	<th>Status</td>
	37	<th>Date due</td>
	38	<th>Notes</th>
	39	</tr>
	40	</thead>
	41
	42	<tbody>
	43	[% FOREACH cr IN course_reserves %]
	44	<tr>
	45	<td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
	46	<td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
	47	<td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
	48	<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
	49	<td>[% cr.item.itemcallnumber %]</td>
	50	<td>[% cr.item.copynumber %]</td>
	51	<td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
	52	<td>[% cr.issue.date_due \| $KohaDates %]</td>
	53	<td>[% cr.public_note %]</td>
	54	</tr>
	55	[% END %]
	56	</tbody>
	57	</table>
	58
	59	</div>
	60	</div>
	61
	62
	63	[% INCLUDE 'opac-bottom.inc' %]

Line 0 Link Here

(-)a/opac/opac-course-details.pl (+60 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27	use C4::Koha;
	28
	29	use C4::CourseReserves;
	30
	31	my $cgi = new CGI;
	32
	33	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
	34	{
	35	template_name => "opac-course-details.tmpl",
	36	query => $cgi,
	37	type => "opac",
	38	authnotrequired => 1,
	39	debug => 1,
	40	}
	41	);
	42
	43	my $action = $cgi->param('action') \|\| '';
	44	my $course_id = $cgi->param('course_id');
	45
	46	die( "No course_id given" ) unless ( $course_id );
	47
	48	if ( $action eq 'del_reserve' ) {
	49	DelCourseReserve( cr_id => $cgi->param('cr_id') );
	50	}
	51
	52	my $course = GetCourse( $course_id );
	53	my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 );
	54
	55	$template->param(
	56	course => $course,
	57	course_reserves => $course_reserves,
	58	);
	59
	60	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/opac/opac-course-reserves.pl (+51 lines)
	1	#!/usr/bin/perl
	2
	3	#
	4	# Copyright 2012 Bywater Solutions
	5	#
	6	# This file is part of Koha.
	7	#
	8	# Koha is free software; you can redistribute it and/or modify it under the
	9	# terms of the GNU General Public License as published by the Free Software
	10	# Foundation; either version 2 of the License, or (at your option) any later
	11	# version.
	12	#
	13	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	14	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	15	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License along
	18	# with Koha; if not, write to the Free Software Foundation, Inc.,
	19	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	20
	21	use Modern::Perl;
	22
	23	use CGI;
	24
	25	use C4::Auth;
	26	use C4::Output;
	27
	28	use C4::CourseReserves;
	29
	30	my $cgi = new CGI;
	31
	32	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
	33	{
	34	template_name => "opac-course-reserves.tmpl",
	35	query => $cgi,
	36	type => "opac",
	37	authnotrequired => 1,
	38	debug => 1,
	39	}
	40	);
	41
	42	my $search_on = $cgi->param('search_on');
	43
	44	my $courses = SearchCourses( term => $search_on, enabled => 'yes' );
	45
	46	if ( @$courses == 1 ) {
	47	print $cgi->redirect("/cgi-bin/koha/opac-course-details.pl?course_id=" . $courses->[0]->{'course_id'});
	48	} else {
	49	$template->param( courses => $courses );
	50	output_html_with_http_headers $cgi, $cookie, $template->output;
	51	}

Line 0 Link Here

(-)a/t/db_dependent/CourseReserves.t (-1 / +88 lines)
0	-	1	#!/usr/bin/perl
		2	#
		3	# This is to test C4/Members
		4	# It requires a working Koha database with the sample data
		5
		6	use strict;
		7	use warnings;
		8
		9	use Test::More tests => 16;
		10	use Data::Dumper;
		11
		12	BEGIN {
		13	use_ok('C4::Context');
		14	use_ok('C4::CourseReserves');
		15	}
		16
		17	my $dbh = C4::Context->dbh;
		18	$dbh->do("TRUNCATE TABLE course_instructors");
		19	$dbh->do("TRUNCATE TABLE courses");
		20	$dbh->do("TRUNCATE TABLE course_reserves");
		21
		22	my $sth = $dbh->prepare("SELECT * FROM borrowers ORDER BY RAND() LIMIT 10");
		23	$sth->execute();
		24	my @borrowers = @{$sth->fetchall_arrayref({})};
		25
		26	$sth = $dbh->prepare("SELECT * FROM items ORDER BY RAND() LIMIT 10");
		27	$sth->execute();
		28	my @items = @{$sth->fetchall_arrayref({})};
		29
		30	my $course_id = ModCourse(
		31	course_name => "Test Course",
		32	staff_note => "Test staff note",
		33	public_note => "Test public note",
		34	);
		35
		36	ok( $course_id, "ModCourse created course successfully" );
		37
		38	$course_id = ModCourse(
		39	course_id => $course_id,
		40	staff_note => "Test staff note 2",
		41	);
		42
		43	my $course = GetCourse( $course_id );
		44
		45	ok( $course->{'course_name'} eq "Test Course", "GetCourse returned correct course" );
		46	ok( $course->{'staff_note'} eq "Test staff note 2", "ModCourse updated course succesfully" );
		47
		48	my $courses = GetCourses();
		49	ok( $courses->[0]->{'course_name'} eq "Test Course", "GetCourses returns valid array of course data" );
		50
		51	ModCourseInstructors( mode => 'add', course_id => $course_id, borrowernumbers => [ $borrowers[0]->{'borrowernumber'} ] );
		52	$course = GetCourse( $course_id );
		53	ok( $course->{'instructors'}->[0]->{'borrowernumber'} == $borrowers[0]->{'borrowernumber'}, "ModCourseInstructors added instructors correctly");
		54
		55	my $course_instructors = GetCourseInstructors( $course_id );
		56	ok( $course_instructors->[0]->{'borrowernumber'} eq $borrowers[0]->{'borrowernumber'}, "GetCourseInstructors returns valid data" );
		57
		58	my $ci_id = ModCourseItem( 'itemnumber' => $items[0]->{'itemnumber'} );
		59	ok( $ci_id, "ModCourseItem returned valid data" );
		60
		61	my $course_item = GetCourseItem( 'ci_id' => $ci_id );
		62	ok( $course_item->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetCourseItem returns valid data" );
		63
		64	my $cr_id = ModCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id );
		65	ok( $cr_id, "ModCourseReserve returns valid data" );
66
67	my $course_reserve = GetCourseReserve( 'course_id' => $course_id, 'ci_id' => $ci_id );
68	ok( $course_reserve->{'cr_id'} eq $cr_id, "GetCourseReserve returns valid data" );
69
70	my $course_reserves = GetCourseReserves( 'course_id' => $course_id );
71	ok( $course_reserves->[0]->{'ci_id'} eq $ci_id, "GetCourseReserves returns valid data." );
72
73	my $info = GetItemReservesInfo( itemnumber => $items[0]->{'itemnumber'} );
74	ok( $info->[0]->{'itemnumber'} eq $items[0]->{'itemnumber'}, "GetItemReservesInfo returns valid data." );
75
76	DelCourseReserve( 'cr_id' => $cr_id );
77	$course_reserve = GetCourseReserve( 'cr_id' => $cr_id );
78	ok( !defined( $course_reserve->{'cr_id'} ), "DelCourseReserve functions correctly" );
79
80	DelCourse( $course_id );
81	$course = GetCourse( $course_id );
82	ok( !defined( $course->{'course_id'} ), "DelCourse deleted course successfully" );
83
84	$dbh->do("TRUNCATE TABLE course_instructors");
85	$dbh->do("TRUNCATE TABLE courses");
86	$dbh->do("TRUNCATE TABLE course_reserves");
87
88	exit;