Attachment #155422 for bug #30719

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




package Koha::Illbatch;

# Copyright PTFS Europe 2022
#
# 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 3 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, see <http://www.gnu.org/licenses>.

use Modern::Perl;
use Koha::Database;
use Koha::Illrequest::Logger;
use Koha::IllbatchStatus;
use JSON qw( to_json );
use base qw(Koha::Object);

=head1 NAME

Koha::Illbatch - Koha Illbatch Object class

=head2 Class methods

=head3 status

    my $status = Koha::Illbatch->status;

Return the status object associated with this batch

=cut

sub status {
    my ( $self ) = @_;
    return Koha::IllbatchStatus->_new_from_dbic(
        scalar $self->_result->statuscode
    );
}

=head3 patron

    my $patron = Koha::Illbatch->patron;

Return the patron object associated with this batch

=cut

sub patron {
    my ( $self ) = @_;
    return Koha::Patron->_new_from_dbic(
        scalar $self->_result->borrowernumber
    );
}

=head3 branch

    my $branch = Koha::Illbatch->branch;

Return the branch object associated with this batch

=cut

sub branch {
    my ( $self ) = @_;
    return Koha::Library->_new_from_dbic(
        scalar $self->_result->branchcode
    );
}

=head3 requests_count

    my $requests_count = Koha::Illbatch->requests_count;

Return the number of requests associated with this batch

=cut

sub requests_count {
    my ( $self ) = @_;
    return Koha::Illrequests->search({
        batch_id => $self->id
    })->count;
}

=head3 create_and_log

    $batch->create_and_log;

Log batch creation following storage

=cut

sub create_and_log {
    my ( $self ) = @_;

    $self->store;

    my $logger = Koha::Illrequest::Logger->new;

    $logger->log_something({
        modulename   => 'ILL',
        actionname  => 'batch_create',
        objectnumber => $self->id,
        infos        => to_json({})
    });
}

=head3 update_and_log

    $batch->update_and_log;

Log batch update following storage

=cut

sub update_and_log {
    my ( $self, $params ) = @_;

    my $before = {
        name       => $self->name,
        branchcode => $self->branchcode
    };

    $self->set( $params );
    my $update = $self->store;

    my $after = {
        name       => $self->name,
        branchcode => $self->branchcode
    };

    my $logger = Koha::Illrequest::Logger->new;

    $logger->log_something({
        modulename   => 'ILL',
        actionname  => 'batch_update',
        objectnumber => $self->id,
        infos        => to_json({
            before => $before,
            after  => $after
        })
    });
}

=head3 delete_and_log

    $batch->delete_and_log;

Log batch delete

=cut

sub delete_and_log {
    my ( $self ) = @_;

    my $logger = Koha::Illrequest::Logger->new;

    $logger->log_something({
        modulename   => 'ILL',
        actionname  => 'batch_delete',
        objectnumber => $self->id,
        infos        => to_json({})
    });

    $self->delete;
}

=head2 Internal methods

=head3 _type

    my $type = Koha::Illbatch->_type;

Return this object's type

=cut

sub _type {
    return 'Illbatch';
}

=head1 AUTHOR

Andrew Isherwood <andrew.isherwood@ptfs-europe.com>

=cut

1;




package Koha::Illbatches;

# Copyright PTFS Europe 2022
#
# 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 3 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, see <http://www.gnu.org/licenses>.

use Modern::Perl;
use Koha::Database;
use Koha::Illbatch;
use base qw(Koha::Objects);

=head1 NAME

Koha::Illbatches - Koha Illbatches Object class

=head2 Internal methods

=head3 _type

    my $type = Koha::Illbatches->_type;

Return this object's type

=cut

sub _type {
    return 'Illbatch';
}

=head3 object_class

    my $class = Koha::Illbatches->object_class;

Return this object's class name

=cut

sub object_class {
    return 'Koha::Illbatch';
}

=head1 AUTHOR

Andrew Isherwood <andrew.isherwood@ptfs-europe.com>

=cut

1;




package Koha::REST::V1::Illbatches;

# 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 3 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, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Mojo::Base 'Mojolicious::Controller';

use Koha::Illbatches;
use Koha::IllbatchStatuses;
use Koha::Illrequests;

use Try::Tiny qw( catch try );

=head1 NAME

Koha::REST::V1::Illbatches

=head2 Operations

=head3 list

Return a list of available ILL batches

=cut

sub list {
    my $c = shift->openapi->valid_input;

    #FIXME: This should be $c->objects-search
    my @batches = Koha::Illbatches->search()->as_list;

    #FIXME: Below should be coming from $c->objects accessors
    # Get all patrons associated with all our batches
    # in one go
    my $patrons = {};
    foreach my $batch(@batches) {
        my $patron_id = $batch->borrowernumber;
        $patrons->{$patron_id} = 1
    };
    my @patron_ids = keys %{$patrons};
    my $patron_results = Koha::Patrons->search({
        borrowernumber => { -in => \@patron_ids }
    });

    # Get all branches associated with all our batches
    # in one go
    my $branches = {};
    foreach my $batch(@batches) {
        my $branch_id = $batch->branchcode;
        $branches->{$branch_id} = 1
    };
    my @branchcodes = keys %{$branches};
    my $branch_results = Koha::Libraries->search({
        branchcode => { -in => \@branchcodes }
    });

    # Get all batch statuses associated with all our batches
    # in one go
    my $statuses = {};
    foreach my $batch(@batches) {
        my $code = $batch->statuscode;
        $statuses->{$code} = 1
    };
    my @statuscodes = keys %{$statuses};
    my $status_results = Koha::IllbatchStatuses->search({
        code => { -in => \@statuscodes }
    });

    # Populate the response
    my @to_return = ();
    foreach my $it_batch(@batches) {
        my $patron = $patron_results->find({ borrowernumber => $it_batch->borrowernumber});
        my $branch = $branch_results->find({ branchcode => $it_batch->branchcode });
        my $status = $status_results->find({ code => $it_batch->statuscode });
        push @to_return, {
            %{$it_batch->unblessed},
            patron         => $patron,
            branch         => $branch,
            status         => $status,
            requests_count => $it_batch->requests_count
        };
    }

    return $c->render( status => 200, openapi => \@to_return );
}

=head3 get

Get one batch

=cut

sub get {
    my $c = shift->openapi->valid_input;

    my $batchid = $c->validation->param('illbatch_id');

    my $batch = Koha::Illbatches->find($batchid);

    if (not defined $batch) {
        return $c->render(
            status => 404,
            openapi => { error => "ILL batch not found" }
        );
    }

    return $c->render(
        status => 200,
        openapi => {
            %{$batch->unblessed},
            patron         => $batch->patron->unblessed,
            branch         => $batch->branch->unblessed,
            status         => $batch->status->unblessed,
            requests_count => $batch->requests_count
        }
    );
}

=head3 add

Add a new batch

=cut

sub add {
    my $c = shift->openapi->valid_input or return;

    my $body = $c->validation->param('body');

    # We receive cardnumber, so we need to look up the corresponding
    # borrowernumber
    my $patron = Koha::Patrons->find({ cardnumber => $body->{cardnumber} });

    if ( not defined $patron ) {
        return $c->render(
            status  => 404,
            openapi => { error => "Patron with cardnumber " . $body->{cardnumber} . " not found" }
        );
    }

    delete $body->{cardnumber};
    $body->{borrowernumber} = $patron->borrowernumber;

    return try {
        my $batch = Koha::Illbatch->new( $body );
        $batch->create_and_log;
        $c->res->headers->location( $c->req->url->to_string . '/' . $batch->id );

        my $ret = {
            %{$batch->unblessed},
            patron           => $batch->patron->unblessed,
            branch           => $batch->branch->unblessed,
            status           => $batch->status->unblessed,
            requests_count   => 0
        };

        return $c->render(
            status  => 201,
            openapi => $ret
        );
    }
    catch {
        if ( blessed $_ ) {
            if ( $_->isa('Koha::Exceptions::Object::DuplicateID') ) {
                return $c->render(
                    status  => 409,
                    openapi => { error => "A batch named " . $body->{name} . " already exists" }
                );
            }
        }
        $c->unhandled_exception($_);
    };
}

=head3 update

Update a batch

=cut

sub update {
    my $c = shift->openapi->valid_input or return;

    my $batch = Koha::Illbatches->find( $c->validation->param('illbatch_id') );

    if ( not defined $batch ) {
        return $c->render(
            status  => 404,
            openapi => { error => "ILL batch not found" }
        );
    }

    my $params = $c->req->json;
    delete $params->{cardnumber};

    return try {
        $batch->update_and_log( $params );

        my $ret = {
            %{$batch->unblessed},
            patron         => $batch->patron->unblessed,
            branch         => $batch->branch->unblessed,
            status         => $batch->status->unblessed,
            requests_count => $batch->requests_count
        };

        return $c->render(
            status  => 200,
            openapi => $ret
        );
    }
    catch {
        $c->unhandled_exception($_);
    };
}

=head3 delete

Delete a batch

=cut

sub delete {

    my $c = shift->openapi->valid_input or return;

    my $batch = Koha::Illbatches->find( $c->validation->param( 'illbatch_id' ) );

    if ( not defined $batch ) {
        return $c->render( status => 404, openapi => { error => "ILL batch not found" } );
    }

    return try {
        $batch->delete_and_log;
        return $c->render( status => 204, openapi => '');
    }
    catch {
        $c->unhandled_exception($_);
    };
}

1;

Lines 825-830 modules: Link Here

(-)a/admin/columns_settings.yml (+2 lines)
825	columns:	825	columns:
826	-	826	-
827	columnname: ill_request_id	827	columnname: ill_request_id
		828	-
		829	columnname: batch
828	-	830	-
829	columnname: metadata_author	831	columnname: metadata_author
830	-	832	-




---
type: object
properties:
  id:
    type: string
    description: Internal ILL batch identifier
  name:
    type: string
    description: Name of the ILL batch
  backend:
    type: string
    description: Backend name
  cardnumber:
    type: string
    description: Card number of the patron of the ILL batch
  borrowernumber:
    type: string
    description: Borrower number of the patron of the ILL batch
  branchcode:
    type: string
    description: Branch code of the branch of the ILL batch
  patron:
    type:
      - object
      - "null"
    description: The patron associated with the batch
  branch:
    type:
      - object
      - "null"
    description: The branch associated with the batch
  statuscode:
    type: string
    description: Code of the status of the ILL batch
  status:
    type:
      - object
      - "null"
    description: The status associated with the batch
  requests_count:
    type: string
    description: The number of requests in this batch
additionalProperties: false
required:
  - name
  - backend
  - branchcode
  - statuscode

Line 0 Link Here

(-)a/api/v1/swagger/definitions/illbatches.yaml (+5 lines)
	1	---
	2	type: array
	3	items:
	4	$ref: "illbatch.yaml"
	5	additionalProperties: false




---
/illbatches:
  get:
    x-mojo-to: Illbatches#list
    operationId: listIllbatches
    tags:
      - illbatches
    summary: List ILL batches
    parameters: []
    produces:
      - application/json
    responses:
      "200":
        description: A list of ILL batches
        schema:
          $ref: "../swagger.yaml#/definitions/illbatches"
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: ILL batches not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        ill: "1"
  post:
    x-mojo-to: Illbatches#add
    operationId: addIllbatch
    tags:
      - illbatches
    summary: Add ILL batch
    parameters:
      - name: body
        in: body
        description: A JSON object containing informations about the new batch
        required: true
        schema:
          $ref: "../swagger.yaml#/definitions/illbatch"
    produces:
      - application/json
    responses:
      "201":
        description: Batch added
        schema:
          $ref: "../swagger.yaml#/definitions/illbatch"
      "400":
        description: Bad request
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: Patron with given cardnumber not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "409":
        description: Conflict in creating resource
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        ill: "1"
"/illbatches/{illbatch_id}":
  get:
    x-mojo-to: Illbatches#get
    operationId: getIllbatches
    tags:
      - illbatches
    summary: Get ILL batch
    parameters:
      - name: illbatch_id
        in: path
        description: ILL batch id/name/contents
        required: true
        type: string
    produces:
      - application/json
    responses:
      "200":
        description: An ILL batch
        schema:
          $ref: "../swagger.yaml#/definitions/illbatch"
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: ILL batch not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        ill: "1"
  put:
    x-mojo-to: Illbatches#update
    operationId: updateIllBatch
    tags:
      - illbatches
    summary: Update batch
    parameters:
      - $ref: "../swagger.yaml#/parameters/illbatch_id_pp"
      - name: body
        in: body
        description: A JSON object containing information on the batch
        required: true
        schema:
          $ref: "../swagger.yaml#/definitions/illbatch"
    consumes:
      - application/json
    produces:
      - application/json
    responses:
      "200":
        description: An ILL batch
        schema:
          $ref: "../swagger.yaml#/definitions/illbatch"
      "400":
        description: Bad request
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: ILL batch not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        ill: "1"
  delete:
    x-mojo-to: Illbatches#delete
    operationId: deleteBatch
    tags:
      - illbatches
    summary: Delete ILL batch
    parameters:
      - $ref: "../swagger.yaml#/parameters/illbatch_id_pp"
    produces:
      - application/json
    responses:
      "204":
        description: ILL batch deleted
        schema:
          type: string
      "401":
        description: Authentication required
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "403":
        description: Access forbidden
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "404":
        description: ILL batch not found
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "500":
        description: |
          Internal server error. Possible `error_code` attribute values:

          * `internal_server_error`
        schema:
          $ref: "../swagger.yaml#/definitions/error"
      "503":
        description: Under maintenance
        schema:
          $ref: "../swagger.yaml#/definitions/error"
    x-koha-authorization:
      permissions:
        ill: "1"




use Koha::AuthorisedValues;
use Koha::Illcomment;
use Koha::Illrequests;
use Koha::Illbatches;
use Koha::Illrequest::Workflow::Availability;
use Koha::Illrequest::Workflow::TypeDisclaimer;
use Koha::Libraries;
use Koha::Token;
use Koha::Plugins;

use Try::Tiny qw( catch try );
use URI::Escape qw( uri_escape_utf8 );

my $backends_available = ( scalar @{$backends} > 0 );
$template->param(
    backends_available => $backends_available,
    has_branch         => $has_branch,
    have_batch         => have_batch_backends($backends)
);

if ( $backends_available ) {
    # Establish what metadata enrichment plugins we have available
    my $enrichment_services = get_metadata_enrichment();
    if (scalar @{$enrichment_services} > 0) {
        $template->param(
            metadata_enrichment_services => encode_json($enrichment_services)
        );
    }
    # Establish whether we have any availability services that can provide availability
    # for the batch identifier types we support
    my $batch_availability_services = get_ill_availability($enrichment_services);
    if (scalar @{$batch_availability_services} > 0) {
        $template->param(
            batch_availability_services => encode_json($batch_availability_services)
        );
    }

    if ( $op eq 'illview' ) {
        # View the details of an ILL
        my $request = Koha::Illrequests->find($params->{illrequest_id});

            }

            $template->param(
                whole     => $backend_result,
                request   => $request
            );
            handle_commit_maybe($backend_result, $request);
        }

        # We simulate the API for backend requests for uniformity.
        # So, init:
        my $request = Koha::Illrequests->find($params->{illrequest_id});
        my $batches = Koha::Illbatches->search(undef, {
            order_by => { -asc => 'name' }
        });
        if ( !$params->{stage} ) {
            my $backend_result = {
                error   => 0,

            };
            $template->param(
                whole          => $backend_result,
                request        => $request,
                batches        => $batches
            );
        } else {
            # Commit:
            # Save the changes
            $request->borrowernumber($params->{borrowernumber});
            $request->biblio_id($params->{biblio_id});
            $request->batch_id($params->{batch_id});
            $request->branchcode($params->{branchcode});
            $request->price_paid($params->{price_paid});
            $request->notesopac($params->{notesopac});

    } elsif ( $op eq 'illlist') {

        # If we receive a pre-filter, make it available to the template
        my $possible_filters = ['borrowernumber', 'batch_id'];
        my $active_filters = {};
        foreach my $filter(@{$possible_filters}) {
            if ($params->{$filter}) {

        $template->param(
            prefilters => join("&", @tpl_arr)
        );

        if ($active_filters->{batch_id}) {
            my $batch_id = $active_filters->{batch_id};
            if ($batch_id) {
                my $batch = Koha::Illbatches->find($batch_id);
                $template->param(
                    batch => $batch
                );
            }
        }

    } elsif ( $op eq "save_comment" ) {
        die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
           session_id => scalar $cgi->cookie('CGISESSID'),

            scalar $params->{illrequest_id} . $append
        );
        exit;
    } elsif ( $op eq "batch_list" ) {
        # Do not remove, it prevents us falling through to the 'else'
    } elsif ( $op eq "batch_create" ) {
        # Do not remove, it prevents us falling through to the 'else'
    } else {
        my $request = Koha::Illrequests->find($params->{illrequest_id});
        my $backend_result = $request->custom_capability($op, $params);

    print $cgi->redirect('/cgi-bin/koha/ill/ill-requests.pl');
    exit;
}

# Do any of the available backends provide batch requesting
sub have_batch_backends {
    my ( $backends ) = @_;

    my @have_batch = ();

    foreach my $backend(@{$backends}) {
        my $can_batch = can_batch($backend);
        if ($can_batch) {
            push @have_batch, $backend;
        }
    }
    return \@have_batch;
}

# Does a given backend provide batch requests
# FIXME: This should be moved to Koha::Illbackend
sub can_batch {
    my ( $backend ) = @_;
    my $request = Koha::Illrequest->new->load_backend( $backend );
    return $request->_backend_capability( 'provides_batch_requests' );
}

# Get available metadata enrichment plugins
sub get_metadata_enrichment {
    my @candidates = Koha::Plugins->new()->GetPlugins({
        method => 'provides_api'
    });
    my @services = ();
    foreach my $plugin(@candidates) {
        my $supported = $plugin->provides_api();
        if ($supported->{type} eq 'search') {
            push @services, $supported;
        }
    }
    return \@services;
}

# Get ILL availability plugins that can help us with the batch identifier types
# we support
sub get_ill_availability {
    my ( $services ) = @_;

    my $id_types = {};
    foreach my $service(@{$services}) {
        foreach my $id_supported(keys %{$service->{identifiers_supported}}) {
            $id_types->{$id_supported} = 1;
        }
    }

    my $availability = Koha::Illrequest::Workflow::Availability->new($id_types);
    return $availability->get_services({
        ui_context => 'staff'
    });
}




}

#interlibraryloans {

    .ill-toolbar {
        display: flex;
    }

    #ill-batch {
        flex-grow: 1;
        display: flex;
        justify-content: flex-end;
        gap: 5px;
    }

    #ill-batch-requests {
        .action-buttons {
            display: flex;
            gap: 5px;
            justify-content: center;
        }
    }

    #ill-batch-modal {
        .modal-footer {
            display: flex;
            & > * {
                flex: 1;
            }
            #lhs {
                text-align: left;
            }
        }
        #create-progress {
            margin-top: 17px;
        }
        .fetch-failed {
            background-color: rgba(255,0,0,0.1);
            & > * {
                background-color: inherit;
            }
        }
        .progress {
            margin-bottom: 0;
            margin-top: 17px;
        }
        #create-requests {
            display: flex;
            justify-content: flex-end;
        }
        .action-column {
            text-align: center;
            & > * {
                margin-left: 5px;
            }
            & > *:first-child {
                margin-left: 0;
            }
        }
        .metadata-row:not(:first-child) {
            margin-top: 0.5em;
        }
        .metadata-label {
            font-weight: 600;
        }
        .more-less {
            text-align: right;
            margin: 2px 0;
        }

    }

    #batch-form {
        legend {
            margin-bottom: 2em;
        }
        textarea {
            width: 100%;
            min-height: 100px;
            padding: 5px;
            resize: vertical;
        }
        #new-batch-form {
            display: flex;
            gap: 20px;
        }
        li#process-button {
            display: flex;
            justify-content: flex-end;
        }
        #textarea-metadata {
            padding: 0 15px;
            display: flex;
            justify-content: space-between;
        }
        #textarea-errors {
            display: flex;
            flex-direction: column;
            gap: 10px;
            padding: 20px 15px 10px
        }
        .batch-modal-actions {
            text-align: center;
        }
        fieldset {
            border: 2px solid #b9d8d9;
        }
    }

    #dataPreviewLabel {
        margin: .3em 0;
    }




<!-- ill-batch-table-strings.inc -->
<script>
    var ill_batch_add = _("Add new batch");
    var ill_batch_update = _("Update batch");
    var ill_batch_none = _("None");
    var ill_batch_retrieving_metadata = _("Retrieving metadata");
    var ill_batch_api_fail = _("Unable to retrieve batch details");
    var ill_batch_statuses_api_fail = _("Unable to retrieve batch statuses");
    var ill_batch_api_request_fail = _("Unable to create local request");
    var ill_batch_requests_api_fail = _("Unable to retrieve batch requests");
    var ill_batch_unknown = _("Unknown");
    var ill_batch_doi = _("DOI");
    var ill_batch_pmid = _("PubMed ID");
    var ill_populate_waiting = _("Retrieving...");
    var ill_populate_failed = _("Failed to retrieve");
    var ill_button_remove = _("Remove");
    var ill_batch_create_api_fail = _("Unable to create batch request");
    var ill_batch_update_api_fail = _("Unable to updatecreate batch request");
    var ill_batch_item_remove = _("Are you sure you want to remove this item from the batch");
    var ill_batch_create_cancel_button = _("Close");
    var ill_batch_metadata_more = _("More");
    var ill_batch_metadata_less = _("Less");
    var ill_batch_available_via = _("Available via");
    var ill_batch_metadata = {
        'doi': _("DOI"),
        'pmid': _("PubMed ID"),
        'issn': _("ISSN"),
        'title': _("Title"),
        'year': _("Year"),
        'issue': _("Issue"),
        'pages': _("Pages"),
        'publisher': _("Publisher"),
        'article_title': _("Article title"),
        'article_author': _("Article author"),
        'volume': _("Volume")
    };
</script>
<!-- / ill-batch-table-strings.inc -->




<div id="ill-batch-details" style="display:none"></div>
<div id="ill-batch-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="ill-batch-modal-label" aria-hidden="true">
    <div class="modal-dialog modal-lg">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
                <h3 id="ill-batch-modal-label"></h3>
            </div>
            <div class="modal-body">
                <div id="batch-form">
                    <form id="new-batch-form">
                        <fieldset class="rows">
                            <legend id="legend">Batch details</legend>
                            <ol>
                                <li id="batch_name">
                                    <label class="required" for="name">Batch name:</label>
                                    <input type="text" autocomplete="off" name="name" id="name" type="text"
                                    value="" />
                                </li>
                                <li id="batch_patron">
                                    <label class="required" for="batchcardnumber">Card number, username or surname:</label>
                                    <input type="text" autocomplete="off" name="batchcardnumber" id="batchcardnumber" type="text" value="" />
                                    <span id="patron_link"></span>
                                </li>
                                <li id="batch_branch">
                                    <label class="required" for="branchcode">Library:</label>
                                    <select id="branchcode" name="branchcode">
                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
                                    </select>
                                </li>
                                <li id="batch_statuscode" style="display:none">
                                    <label class="required" for="statuscode">Status:</label>
                                    <select id="statuscode" name="statuscode"></select>
                                </li>
                            </ol>
                        </fieldset>
                        <fieldset id="add_batch_items" class="rows" style="display:none">
                            <legend id="legend">Add batch items</legend>
                            <div id="textarea-metadata">
                                <div id="supported">Supported identifiers: <span id="supported_identifiers"></span></div>
                                <div id="row_count">Row count: <span id="row_count_value"></span></div>
                            </div>
                            <div id="textarea-errors" style="display:none" class="error">
                                <div id="duplicates" style="display:none">The following duplicates were found, these have been de-duplicated: <span id="dupelist"></span></div>
                                <div id="badidentifiers" style="display:none">The following unknown identifiers were found, it was not possible to establish their type: <span id="badids"></span></div>
                            </div>
                            <ol>
                                <li>
                                    <textarea id="identifiers_input" placeholder="Enter identifiers, one per line"></textarea>
                                </li>
                                <li id="process-button">
                                    <button id="process_button" disabled aria-disabled="true" type="button">Process identifiers</button>
                                </li>
                            </ol>
                        </fieldset>
                    </form>
                    <div id="create-progress" class="alert alert-info" role="alert" style="display:none">
                        <span id="progress-label"><strong></strong></span> -
                        Items processed: <span id="processed_count">0</span> out of <span id="processed_total">0</span>.
                        Items failed: <span id="processed_failed">0</span>.
                        <div class="progress">
                            <div id="processed_progress_bar" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;">
                                0%
                            </div>
                        </div>
                    </div>
                    <table id="identifier-table" style="display:none">
                        <thead>
                            <tr id="identifier-table-header">
                                <th scope="col">Identifier type</th>
                                <th scope="col">Identifier value</th>
                                <th scope="col">Metadata</th>
                                <th scope="col">Request ID</th>
                                <th scope="col">Request Status</th>
                                <th scope="col"></th>
                            </tr>
                        </thead>
                        <tbody id="identifier-table-body">
                        </tbody>
                    </table>
                </div>
                <div id="create-requests" style="display:none">
                    <button id="create-requests-button" type="button" class="btn btn-primary" aria-label="Add items to batch">Add items to batch</button>
                </div>
            </div>
            <div class="modal-footer">
                <div id="lhs">
                    <button class="btn btn-default" data-dismiss="modal" aria-hidden="false">Cancel</button>
                </div>
                <div id="rhs">
                    <button id="button_create_batch" class="btn btn-default" aria-hidden="true" disabled>Continue</button>
                    <button id="button_finish" disabled type="button" class="btn btn-default" aria-hidden="true">Finish and view batch</button>
                </div>
            </div>
        </div>
    </div>
</div>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-table-strings.inc (+9 lines)
	1	<!-- ill-batch-table-strings.inc -->
	2	<script>
	3	var ill_batch_borrower_details = _("View borrower details");
	4	var ill_batch_edit = _("Edit");
	5	var ill_batch_delete = _("Delete");
	6	var ill_batch_confirm_delete = _("Are you sure you want to delete this batch? All attached requests will be detached.");
	7	var ill_batch_delete_fail = _("Unable to delete batch");
	8	</script>
	9	<!-- / ill-batch-table-strings.inc -->




[% IF query_type == "batch_list" %]
<div>
    <table id="ill-batch-requests">
        <thead>
            <tr id="ill-batch-header">
                <th scope="col">Batch ID</th>
                <th scope="col">Name</th>
                <th scope="col">Number of requests</th>
                <th scope="col">Status</th>
                <th scope="col">Patron</th>
                <th scope="col">Branch</th>
                <th scope="col"></th>
            </tr>
        </thead>
        <tbody id="ill-batch-body">
        </tbody>
    </table>
</div>
[% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc (+1 lines)
1	<!-- ill-list-table-strings.inc -->	1	<!-- ill-list-table-strings.inc -->
2	<script>	2	<script>
		3	var ill_borrower_details = _("View patron details");
3	var ill_manage = _("Manage request");	4	var ill_manage = _("Manage request");
4	var ill_manage_select_backend_first = _("Select a backend first");	5	var ill_manage_select_backend_first = _("Select a backend first");
5	var ill_all_statuses = _("All statuses");	6	var ill_all_statuses = _("All statuses");

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc (+3 lines)
1	[% IF patron.borrowernumber %]	1	[% IF patron.borrowernumber %]
2	<table id="ill-requests-patron-[% patron.borrowernumber \| html %]">	2	<table id="ill-requests-patron-[% patron.borrowernumber \| html %]">
		3	[% ELSIF batch.id %]
		4	<table id="ill-requests-batch-[% batch.id \| html %]">
3	[% ELSE %]	5	[% ELSE %]
4	<table id="ill-requests">	6	<table id="ill-requests">
5	[% END %]	7	[% END %]
6	<thead>	8	<thead>
7	<tr id="ill_requests_header">	9	<tr id="ill_requests_header">
8	<th scope="col">Request ID</th>	10	<th scope="col">Request ID</th>
		11	<th scope="col">Batch</th>
9	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="author" data-related-search-on="value">Author</th>	12	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="author" data-related-search-on="value">Author</th>
10	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="title" data-related-search-on="value">Title</th>	13	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="title" data-related-search-on="value">Title</th>
11	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="article_title" data-related-search-on="value">Article title</th>	14	<th scope="col" data-datatype="related-object" data-related="extended_attributes" data-related-key="type" data-related-value="article_title" data-related-search-on="value">Article title</th>




[% INCLUDE 'blocking_errors.inc' %]
[% USE Koha %]
[% IF Koha.Preference('ILLModule') && CAN_user_ill %]
    <div id="toolbar" class="btn-toolbar ill-toolbar">
        [% IF backends_available %]
          [% IF backends.size > 1 %]
            <div class="dropdown btn-group">

                <i class="fa fa-list"></i> List requests
            </a>
        [% END %]
        [% IF have_batch.size > 0 && metadata_enrichment_services %]
        <div id="ill-batch">
            <div class="dropdown btn-group">
                <button class="btn btn-default dropdown-toggle" type="button" id="ill-batch-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                    <i class="fa fa-plus"></i> New ILL batch request <span class="caret"></span>
                </button>
                <ul class="dropdown-menu" aria-labelledby="ill-batch-backend-dropdown">
                    [% FOREACH backend IN have_batch %]
                        <li><a href="#" role="button" onclick="window.openBatchModal(null, '[% backend | html %]')">[% backend | html %]</a></li>
                    [% END %]
                </ul>
            </div>
            <a class="btn btn-default" type="button" href="/cgi-bin/koha/ill/ill-requests.pl?method=batch_list" %]">
                <i class="fa fa-tasks"></i> Batch requests</span>
            </a>
        </div>
        [% END %]
    </div>
[% END %]




            <div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a></div>
        [% ELSE %]
                [% INCLUDE 'ill-toolbar.inc' %]
                [% INCLUDE 'ill-batch-modal.inc' %]

                [% IF whole.error %]
                    <h1>Error performing operation</h1>

                                        [% END %]
                                    </select>
                                </li>
                                [% IF batches.count > 0 %]
                                <li class="batch">
                                    <label class="batch_label">Batch:</label>
                                    <select id="batch_id" name="batch_id">
                                        <option value="">
                                        [% FOREACH batch IN batches %]
                                            [% IF batch.id == request.batch_id %]
                                            <option value="[% batch.id | html %]" selected>
                                            [% ELSE %]
                                            <option value="[% batch.id | html %]">
                                            [% END %]
                                                [% batch.name | html %]
                                            </option>
                                        [% END %]
                                    </select>
                                </li>
                                [% END %]
                                <li class="updated">
                                    <label class="updated">Last updated:</label>
                                    [% request.updated | $KohaDates  with_hours => 1 %]

                                        [% END %]
                                    [% END %]
                                </li>
                                [% IF request.batch > 0 %]
                                <li class="batch">
                                    <span class="label batch">Batch:</span>
                                    <a href="/cgi-bin/koha/ill/ill-requests.pl?batch_id=[% request.batch.id | html %]">
                                    [% request.batch.name | html %]
                                    </a>
                                </li>
                                [% END %]
                                <li class="updated">
                                    <span class="label updated">Last updated:</span>
                                    [% request.updated | $KohaDates  with_hours => 1 %]


                [% ELSIF query_type == 'illlist' %]
                    <!-- illlist -->
                    <h1>
                        View ILL requests
                        [% IF batch %]
                        for batch "[% batch.name | html %]"
                        [% END %]
                    </h1>
                    <div id="results" class="page-section">
                        <h2>Details for all requests</h2>
                         [% INCLUDE 'ill-list-table.inc' %]

                            </fieldset>
                        </form>
                    </div>
                [% ELSIF query_type == 'batch_list' || query_type == 'batch_create' %]
                    [% INCLUDE 'ill-batch.inc' %]
                [% ELSE %]
                <!-- Custom Backend Action -->
                [% PROCESS $whole.template %]

    [% INCLUDE 'columns_settings.inc' %]
    [% INCLUDE 'calendar.inc' %]
    [% INCLUDE 'select2.inc' %]
    [% IF metadata_enrichment_services %]
    <script>
        var metadata_enrichment_services = [% metadata_enrichment_services | $raw %];
    </script>
    <script>
        [% IF batch_availability_services %]
        var batch_availability_services = [% batch_availability_services | $raw %];
        [% ELSE %]
        var batch_availability_services = [];
        [% END %]
    </script>
    [% END %]
    <script>
        var prefilters = '[% prefilters | $raw %]';
        // Set column settings

        });
    </script>
    [% INCLUDE 'ill-list-table-strings.inc' %]
    [% INCLUDE 'ill-batch-table-strings.inc' %]
    [% INCLUDE 'ill-batch-modal-strings.inc' %]
    [% Asset.js("js/ill-list-table.js") | $raw %]
    [% Asset.js("js/ill-batch.js") | $raw %]
    [% Asset.js("js/ill-batch-table.js") | $raw %]
    [% Asset.js("js/ill-batch-modal.js") | $raw %]
    [% IF (query_type == 'availability' || query_type == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %]
        [% Asset.js("js/ill-availability.js") | $raw %]
    [% END %]




(function () {
    // Bail if there aren't any metadata enrichment plugins installed
    if (typeof metadata_enrichment_services === 'undefined') {
        console.log('No metadata enrichment plugins found.')
        return;
    }

    window.addEventListener('load', onload);

    // Delay between API requests
    var debounceDelay = 1000;

    // Elements we work frequently with
    var textarea = document.getElementById("identifiers_input");
    var nameInput = document.getElementById("name");
    var cardnumberInput = document.getElementById("batchcardnumber");
    var branchcodeSelect = document.getElementById("branchcode");
    var processButton = document.getElementById("process_button");
    var createButton = document.getElementById("button_create_batch");
    var finishButton = document.getElementById("button_finish");
    var batchItemsDisplay = document.getElementById("add_batch_items");
    var createProgressTotal = document.getElementById("processed_total");
    var createProgressCount = document.getElementById("processed_count");
    var createProgressFailed = document.getElementById("processed_failed");
    var createProgressBar = document.getElementById("processed_progress_bar");
    var identifierTable = document.getElementById('identifier-table');
    var createRequestsButton = document.getElementById('create-requests-button');
    var statusesSelect = document.getElementById('statuscode');
    var cancelButton = document.getElementById('lhs').querySelector('button');
    var cancelButtonOriginalText = cancelButton.innerHTML;

    // We need a data structure keyed on identifier type, which tells us how to parse that
    // identifier type and what services can get its metadata. We receive an array of
    // available services
    var supportedIdentifiers = {};
    metadata_enrichment_services.forEach(function (service) {
        // Iterate the identifiers that this service supports
        Object.keys(service.identifiers_supported).forEach(function (idType) {
            if (!supportedIdentifiers[idType]) {
                supportedIdentifiers[idType] = [];
            }
            supportedIdentifiers[idType].push(service);
        });
    });

    // An object for when we're creating a new batch
    var emptyBatch = {
        name: '',
        backend: null,
        cardnumber: '',
        branchcode: '',
        statuscode: 'NEW'
    };

    // The object that holds the batch we're working with
    // It's a proxy so we can update portions of the UI
    // upon changes
    var batch = new Proxy(
        { data: {} },
        {
            get: function (obj, prop) {
                return obj[prop];
            },
            set: function (obj, prop, value) {
                obj[prop] = value;
                manageBatchItemsDisplay();
                updateBatchInputs();
                disableCardnumberInput();
                displayPatronName();
                updateStatusesSelect();
            }
        }
    );

    // The object that holds the contents of the table
    // It's a proxy so we can make it automatically redraw the
    // table upon changes
    var tableContent = new Proxy(
        { data: [] },
        {
            get: function (obj, prop) {
                return obj[prop];
            },
            set: function (obj, prop, value) {
                obj[prop] = value;
                updateTable();
                updateRowCount();
                updateProcessTotals();
                checkAvailability();
            }
        }
    );

    // The object that holds the contents of the table
    // It's a proxy so we can update portions of the UI
    // upon changes
    var statuses = new Proxy(
        { data: [] },
        {
            get: function (obj, prop) {
                return obj[prop];
            },
            set: function (obj, prop, value) {
                obj[prop] = value;
                updateStatusesSelect();
            }
        }
    );

    var progressTotals = new Proxy(
        {
            data: {}
        },
        {
            get: function (obj, prop) {
                return obj[prop];
            },
            set: function (obj, prop, value) {
                obj[prop] = value;
                showCreateRequestsButton();
            }
        }
    );

    // Keep track of submission API calls that are in progress
    // so we don't duplicate them
    var submissionSent = {};

    // Keep track of availability API calls that are in progress
    // so we don't duplicate them
    var availabilitySent = {};

    // Are we updating an existing batch
    var isUpdate = false;

    // The datatable
    var table;
    var tableEl = document.getElementById('identifier-table');

    // The element that potentially holds the ID of the batch
    // we're working with
    var idEl = document.getElementById('ill-batch-details');
    var batchId = null;
    var backend = null;

    function onload() {
        $('#ill-batch-modal').on('shown.bs.modal', function () {
            init();
            patronAutocomplete();
            batchInputsEventListeners();
            createButtonEventListener();
            createRequestsButtonEventListener();
            moreLessEventListener();
            removeRowEventListener();
        });
        $('#ill-batch-modal').on('hidden.bs.modal', function () {
            // Reset our state when we close the modal
            // TODO: need to also reset progress bar and already processed identifiers
            delete idEl.dataset.batchId;
            delete idEl.dataset.backend;
            batchId = null;
            tableEl.style.display = 'none';
            tableContent.data = [];
            progressTotals.data = {
                total: 0,
                count: 0,
                failed: 0
            };
            textarea.value = '';
            batch.data = {};
            cancelButton.innerHTML = cancelButtonOriginalText;
            // Remove event listeners we created
            removeEventListeners();
        });
    };

    function init() {
        batchId = idEl.dataset.batchId;
        backend = idEl.dataset.backend;
        emptyBatch.backend = backend;
        progressTotals.data = {
            total: 0,
            count: 0,
            failed: 0
        };
        if (batchId) {
            fetchBatch();
            isUpdate = true;
            setModalHeading();
        } else {
            batch.data = emptyBatch;
            setModalHeading();
        }
        fetchStatuses();
        finishButtonEventListener();
        processButtonEventListener();
        identifierTextareaEventListener();
        displaySupportedIdentifiers();
        createButtonEventListener();
        updateRowCount();
    };

    function initPostCreate() {
        disableCreateButton();
        cancelButton.innerHTML = ill_batch_create_cancel_button;
    };

    function setFinishButton() {
        if (batch.data.patron) {
            finishButton.removeAttribute('disabled');
        }
    };

    function setModalHeading() {
        var heading = document.getElementById('ill-batch-modal-label');
        heading.textContent = isUpdate ? ill_batch_update : ill_batch_add;
    }

    // Identify items that have metadata and therefore can have a local request
    // created, and do so
    function requestRequestable() {
        createRequestsButton.setAttribute('disabled', true);
        createRequestsButton.setAttribute('aria-disabled', true);
        setFinishButton();
        var toCheck = tableContent.data;
        toCheck.forEach(function (row) {
            if (
                !row.requestId &&
                Object.keys(row.metadata).length > 0 &&
                !submissionSent[row.value]
            ) {
                submissionSent[row.value] = 1;
                makeLocalSubmission(row.value, row.metadata);
            }
        });
    };

    // Identify items that can have their availability checked, and do it
    function checkAvailability() {
        // Only proceed if we've got services that can check availability
        if (!batch_availability_services || batch_availability_services.length === 0) return;
        var toCheck = tableContent.data;
        toCheck.forEach(function (row) {
            if (
                !row.url &&
                Object.keys(row.metadata).length > 0 &&
                !availabilitySent[row.value]
            ) {
                availabilitySent[row.value] = 1;
                getAvailability(row.value, row.metadata);
            }
        });
    };

    // Check availability services for immediate availability, if found,
    // create a link in the table linking to the item
    function getAvailability(identifier, metadata) {
        // Prep the metadata for passing to the availability plugins
        let availability_object = {};
        if (metadata.issn) availability_object['issn'] = metadata.issn;
        if (metadata.doi) availability_object['doi'] = metadata.doi;
        if (metadata.pubmedid) availability_object['pubmedid'] = metadata.pubmedid;
        var prepped = encodeURIComponent(base64EncodeUnicode(JSON.stringify(availability_object)));
        for (i = 0; i < batch_availability_services.length; i++) {
            var service = batch_availability_services[i];
            window.doApiRequest(
                service.endpoint + prepped
            )
                .then(function (response) {
                    return response.json();
                })
                .then(function (data) {
                    if (data.results.search_results && data.results.search_results.length > 0) {
                        var result = data.results.search_results[0];
                        tableContent.data = tableContent.data.map(function (row) {
                            if (row.value === identifier) {
                                row.url = result.url;
                                row.availabilitySupplier = service.name;
                            }
                            return row;
                        });
                    }
                });
        }
    };

    // Help btoa with > 8 bit strings
    // Shamelessly grabbed from: https://www.base64encoder.io/javascript/
    function base64EncodeUnicode(str) {
        // First we escape the string using encodeURIComponent to get the UTF-8 encoding of the characters,
        // then we convert the percent encodings into raw bytes, and finally feed it to btoa() function.
        utf8Bytes = encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
                return String.fromCharCode('0x' + p1);
        });

        return btoa(utf8Bytes);
    };

    // Create a local submission and update our local state
    // upon success
    function makeLocalSubmission(identifier, metadata) {

        // Prepare extended_attributes in array format for POST
        var extended_attributes = [];
        for (const [key, value] of Object.entries(metadata)) {
            extended_attributes.push({"type":key, "value":value});
        }

        var payload = {
            batch_id: batchId,
            ill_backend_id: batch.data.backend,
            patron_id: batch.data.patron.borrowernumber,
            library_id: batch.data.branchcode,
            extended_attributes: extended_attributes
        };
        window.doCreateSubmission(payload)
            .then(function (response) {
                return response.json();
            })
            .then(function (data) {
                tableContent.data = tableContent.data.map(function (row) {
                    if (row.value === identifier) {
                        row.requestId = data.ill_request_id;
                        row.requestStatus = data.status;
                    }
                    return row;
                });
            })
            .catch(function () {
                window.handleApiError(ill_batch_api_request_fail);
            });
    };

    function updateProcessTotals() {
        var init = {
            total: 0,
            count: 0,
            failed: 0
        };
        progressTotals.data = init;
        var toUpdate = progressTotals.data;
        tableContent.data.forEach(function (row) {
            toUpdate.total++;
            if (Object.keys(row.metadata).length > 0 || row.failed.length > 0) {
                toUpdate.count++;
            }
            if (Object.keys(row.failed).length > 0) {
                toUpdate.failed++;
            }
        });
        createProgressTotal.innerHTML = toUpdate.total;
        createProgressCount.innerHTML = toUpdate.count;
        createProgressFailed.innerHTML = toUpdate.failed;
        var percentDone = Math.ceil((toUpdate.count / toUpdate.total) * 100);
        createProgressBar.setAttribute('aria-valuenow', percentDone);
        createProgressBar.innerHTML = percentDone + '%';
        createProgressBar.style.width = percentDone + '%';
        progressTotals.data = toUpdate;
    };

    function displayPatronName() {
        var span = document.getElementById('patron_link');
        if (batch.data.patron) {
            var link = createPatronLink();
            span.appendChild(link);
        } else {
            if (span.children.length > 0) {
                span.removeChild(span.firstChild);
            }
        }
    };

    function updateStatusesSelect() {
        while (statusesSelect.options.length > 0) {
            statusesSelect.remove(0);
        }
        statuses.data.forEach(function (status) {
            var option = document.createElement('option')
            option.value = status.code;
            option.text = status.name;
            if (batch.data.id && batch.data.statuscode === status.code) {
                option.selected = true;
            }
            statusesSelect.add(option);
        });
        if (isUpdate) {
            statusesSelect.parentElement.style.display = 'block';
        }
    };

    function removeEventListeners() {
        textarea.removeEventListener('paste', processButtonState);
        textarea.removeEventListener('keyup', processButtonState);
        processButton.removeEventListener('click', processIdentifiers);
        nameInput.removeEventListener('keyup', createButtonState);
        cardnumberInput.removeEventListener('keyup', createButtonState);
        branchcodeSelect.removeEventListener('change', createButtonState);
        createButton.removeEventListener('click', createBatch);
        identifierTable.removeEventListener('click', toggleMetadata);
        identifierTable.removeEventListener('click', removeRow);
        createRequestsButton.remove('click', requestRequestable);
    };

    function finishButtonEventListener() {
        finishButton.addEventListener('click', doFinish);
    };

    function identifierTextareaEventListener() {
        textarea.addEventListener('paste', textareaUpdate);
        textarea.addEventListener('keyup', textareaUpdate);
    };

    function processButtonEventListener() {
        processButton.addEventListener('click', processIdentifiers);
    };

    function createRequestsButtonEventListener() {
        createRequestsButton.addEventListener('click', requestRequestable);
    };

    function createButtonEventListener() {
        createButton.addEventListener('click', createBatch);
    };

    function batchInputsEventListeners() {
        nameInput.addEventListener('keyup', createButtonState);
        cardnumberInput.addEventListener('keyup', createButtonState);
        branchcodeSelect.addEventListener('change', createButtonState);
    };

    function moreLessEventListener() {
        identifierTable.addEventListener('click', toggleMetadata);
    };

    function removeRowEventListener() {
        identifierTable.addEventListener('click', removeRow);
    };

    function textareaUpdate() {
        processButtonState();
        updateRowCount();
    };

    function processButtonState() {
        if (textarea.value.length > 0) {
            processButton.removeAttribute('disabled');
            processButton.removeAttribute('aria-disabled');
        } else {
            processButton.setAttribute('disabled', true);
            processButton.setAttribute('aria-disabled', true);
        }
    };

    function disableCardnumberInput() {
        if (batch.data.patron) {
            cardnumberInput.setAttribute('disabled', true);
            cardnumberInput.setAttribute('aria-disabled', true);
        } else {
            cardnumberInput.removeAttribute('disabled');
            cardnumberInput.removeAttribute('aria-disabled');
        }
    };

    function createButtonState() {
        if (
            nameInput.value.length > 0 &&
            cardnumberInput.value.length > 0 &&
            branchcodeSelect.selectedOptions.length === 1
        ) {
            createButton.removeAttribute('disabled');
            createButton.setAttribute('display', 'inline-block');
        } else {
            createButton.setAttribute('disabled', 1);
            createButton.setAttribute('display', 'none');
        }
    };

    function doFinish() {
        updateBatch()
            .then(function () {
                $('#ill-batch-modal').modal({ show: false });
                location.href = '/cgi-bin/koha/ill/ill-requests.pl?batch_id=' + batch.data.id;
            });
    };

    // Get all batch statuses
    function fetchStatuses() {
        window.doApiRequest('/api/v1/illbatchstatuses')
            .then(function (response) {
                return response.json();
            })
            .then(function (jsoned) {
                statuses.data = jsoned;
            })
            .catch(function (e) {
                window.handleApiError(ill_batch_statuses_api_fail);
            });
    };

    // Get the batch
    function fetchBatch() {
        window.doBatchApiRequest("/" + batchId)
            .then(function (response) {
                return response.json();
            })
            .then(function (jsoned) {
                batch.data = {
                    id: jsoned.id,
                    name: jsoned.name,
                    backend: jsoned.backend,
                    cardnumber: jsoned.cardnumber,
                    branchcode: jsoned.branchcode,
                    statuscode: jsoned.statuscode
                }
                return jsoned;
            })
            .then(function (data) {
                batch.data = data;
            })
            .catch(function () {
                window.handleApiError(ill_batch_api_fail);
            });
    };

    function createBatch() {
        var selectedBranchcode = branchcodeSelect.selectedOptions[0].value;
        var selectedStatuscode = statusesSelect.selectedOptions[0].value;
        return doBatchApiRequest('', {
            method: 'POST',
            headers: {
                'Content-type': 'application/json'
            },
            body: JSON.stringify({
                name: nameInput.value,
                backend: backend,
                cardnumber: cardnumberInput.value,
                branchcode: selectedBranchcode,
                statuscode: selectedStatuscode
            })
        })
            .then(function (response) {
                if ( response.ok ) {
                    return response.json();
                }
                return Promise.reject(response);
            })
            .then(function (body) {
                batchId = body.id;
                batch.data = {
                    id: body.id,
                    name: body.name,
                    backend: body.backend,
                    cardnumber: body.patron.cardnumber,
                    branchcode: body.branchcode,
                    statuscode: body.statuscode,
                    patron: body.patron,
                    status: body.status
                };
                initPostCreate();
            })
            .catch(function (response) {
                response.json().then((json) => {
                    if( json.error ) {
                        handleApiError(json.error);
                    } else {
                        handleApiError(ill_batch_create_api_fail);
                    }
                })
            });
    };

    function updateBatch() {
        var selectedBranchcode = branchcodeSelect.selectedOptions[0].value;
        var selectedStatuscode = statusesSelect.selectedOptions[0].value;
        return doBatchApiRequest('/' + batch.data.id, {
            method: 'PUT',
            headers: {
                'Content-type': 'application/json'
            },
            body: JSON.stringify({
                name: nameInput.value,
                backend: batch.data.backend,
                cardnumber: batch.data.patron.cardnumber,
                branchcode: selectedBranchcode,
                statuscode: selectedStatuscode
            })
        })
            .catch(function () {
                handleApiError(ill_batch_update_api_fail);
            });
    };

    function displaySupportedIdentifiers() {
        var names = Object.keys(supportedIdentifiers).map(function (identifier) {
            return window['ill_batch_' + identifier];
        });
        var displayEl = document.getElementById('supported_identifiers');
        displayEl.textContent = names.length > 0 ? names.join(', ') : ill_batch_none;
    }

    function updateRowCount() {
        var textEl = document.getElementById('row_count_value');
        var val = textarea.value.trim();
        var cnt = 0;
        if (val.length > 0) {
            cnt = val.split(/\n/).length;
        }
        textEl.textContent = cnt;
    }

    function showProgress() {
        var el = document.getElementById('create-progress');
        el.style.display = 'block';
    }

    function showCreateRequestsButton() {
        var data = progressTotals.data;
        var el = document.getElementById('create-requests');
        el.style.display = (data.total > 0 && data.count === data.total) ? 'flex' : 'none';
    }

    async function processIdentifiers() {
        var content = textarea.value;
        hideErrors();
        if (content.length === 0) return;

        disableProcessButton();
        var label = document.getElementById('progress-label').firstChild;
        label.innerHTML = ill_batch_retrieving_metadata;
        showProgress();

        // Errors encountered when processing
        var processErrors = {};

        // Prepare the content, including trimming each row
        var contentArr = content.split(/\n/);
        var trimmed = contentArr.map(function (row) {
            return row.trim();
        });

        var parsed = [];

        trimmed.forEach(function (identifier) {
            var match = identifyIdentifier(identifier);
            // If this identifier is not identifiable or
            // looks like more than one type, we can't be sure
            // what it is
            if (match.length != 1) {
                parsed.push({
                    type: 'unknown',
                    value: identifier
                });
            } else {
                parsed.push(match[0]);
            }
        });

        var unknownIdentifiers = parsed
            .filter(function (parse) {
                if (parse.type == 'unknown') {
                    return parse;
                }
            })
            .map(function (filtered) {
                return filtered.value;
            });

        if (unknownIdentifiers.length > 0) {
            processErrors.badidentifiers = {
                element: 'badids',
                values: unknownIdentifiers.join(', ')
            };
        };

        // Deduping
        var deduped = [];
        var dupes = {};
        parsed.forEach(function (row) {
            var value = row.value;
            var alreadyInDeduped = deduped.filter(function (d) {
                return d.value === value;
            });
            if (alreadyInDeduped.length > 0 && !dupes[value]) {
                dupes[value] = 1;
            } else if (alreadyInDeduped.length === 0) {
                row.metadata = {};
                row.failed = {};
                row.requestId = null;
                deduped.push(row);
            }
        });
        // Update duplicate error if dupes were found
        if (Object.keys(dupes).length > 0) {
            processErrors.duplicates = {
                element: 'dupelist',
                values: Object.keys(dupes).join(', ')
            };
        }

        // Display any errors
        displayErrors(processErrors);

        // Now build and display the table
        if (!table) {
            buildTable();
        }

        // We may be appending new values to an existing table,
        // in which case, ensure we don't create duplicates
        var tabIdentifiers = tableContent.data.map(function (tabId) {
            return tabId.value;
        });
        var notInTable = deduped.filter(function (ded) {
            if (!tabIdentifiers.includes(ded.value)) {
                return ded;
           }
        });
        if (notInTable.length > 0) {
            tableContent.data = tableContent.data.concat(notInTable);
        }

        // Populate metadata for those records that need it
        var newData = tableContent.data;
        for (var i = 0; i < tableContent.data.length; i++) {
            var row = tableContent.data[i];
            // Skip rows that don't need populating
            if (
                Object.keys(tableContent.data[i].metadata).length > 0 ||
                Object.keys(tableContent.data[i].failed).length > 0
            ) continue;
            var identifier = { type: row.type, value: row.value };
            try {
                var populated = await populateMetadata(identifier);
                row.metadata = populated.results.result || {};
            } catch (e) {
                row.failed = ill_populate_failed;
            }
            newData[i] = row;
            tableContent.data = newData;
        }
    }

    function disableProcessButton() {
        processButton.setAttribute('disabled', true);
        processButton.setAttribute('aria-disabled', true);
    }

    function disableCreateButton() {
        createButton.setAttribute('disabled', true);
        createButton.setAttribute('aria-disabled', true);
    }

    async function populateMetadata(identifier) {
        // All services that support this identifier type
        var services = supportedIdentifiers[identifier.type];
        // Check each service and use the first results we get, if any
        for (var i = 0; i < services.length; i++) {
            var service = services[i];
            var endpoint = '/api/v1/contrib/' + service.api_namespace + service.search_endpoint + '?' + identifier.type + '=' + identifier.value;
            var metadata = await getMetadata(endpoint);
            if (metadata.errors.length === 0) {
                var parsed = await parseMetadata(metadata, service);
                if (parsed.errors.length > 0) {
                    throw Error(metadata.errors.map(function (error) {
                        return error.message;
                    }).join(', '));
                }
                return parsed;
            }
        }
    };

    async function getMetadata(endpoint) {
        var response = await debounce(doApiRequest)(endpoint);
        return response.json();
    };

    async function parseMetadata(metadata, service) {
        var endpoint = '/api/v1/contrib/' + service.api_namespace + service.ill_parse_endpoint;
        var response = await doApiRequest(endpoint, {
            method: 'POST',
            headers: {
                'Content-type': 'application/json'
            },
            body: JSON.stringify(metadata)
        });
        return response.json();
    }

    // A render function for identifier type
    function createIdentifierType(data) {
        return window['ill_batch_' + data];
    };

    // Get an item's title
    function getTitle(meta) {
        if (meta.article_title && meta.article_title.length > 0) {
            return 'article_title';
            return {
                prop: 'article_title',
                value: meta.article_title
            };
        } else if (meta.title && meta.title.length > 0) {
            return 'title';
            return {
                prop: 'title',
                value: meta.title
            };
        }
    };

    // Create a metadata row
    function createMetadataRow(data, meta, prop) {
        if (!meta[prop]) return;

        var div = document.createElement('div');
        div.classList.add('metadata-row');
        var label = document.createElement('span');
        label.classList.add('metadata-label');
        label.innerText = ill_batch_metadata[prop] + ': ';

        // Add a link to the availability URL if appropriate
        var value;
        if (!data.url) {
            value = document.createElement('span');
        } else {
            value = document.createElement('a');
            value.setAttribute('href', data.url);
            value.setAttribute('target', '_blank');
            value.setAttribute('title', ill_batch_available_via + ' ' + data.availabilitySupplier);
        }
        value.classList.add('metadata-value');
        value.innerText = meta[prop];
        div.appendChild(label);
        div.appendChild(value);

        return div;
    }

    // A render function for displaying metadata
    function createMetadata(x, y, data) {
        // If the fetch failed
        if (data.failed.length > 0) {
            return data.failed;
        }

        // If we've not yet got any metadata back
        if (Object.keys(data.metadata).length === 0) {
            return ill_populate_waiting;
        }

        var core = ['doi', 'pmid', 'issn', 'title', 'year', 'issue', 'pages', 'publisher', 'article_title', 'article_author', 'volume'];
        var meta = data.metadata;

        var container = document.createElement('div');
        container.classList.add('metadata-container');

        // Create the title row
        var title = getTitle(meta);
        if (title) {
            // Remove the title element from the props
            // we're about to iterate
            core = core.filter(function (i) {
                return i !== title;
            });
            var titleRow = createMetadataRow(data, meta, title);
            container.appendChild(titleRow);
        }

        var remainder = document.createElement('div');
        remainder.classList.add('metadata-remainder');
        remainder.style.display = 'none';
        // Create the remaining rows
        core.sort().forEach(function (prop) {
            var div = createMetadataRow(data, meta, prop);
            if (div) {
                remainder.appendChild(div);
            }
        });
        container.appendChild(remainder);

        // Add a more/less toggle
        var firstField = container.firstChild;
        var moreLess = document.createElement('div');
        moreLess.classList.add('more-less');
        var moreLessLink = document.createElement('a');
        moreLessLink.setAttribute('href', '#');
        moreLessLink.classList.add('more-less-link');
        moreLessLink.innerText = ' [' + ill_batch_metadata_more + ']';
        moreLess.appendChild(moreLessLink);
        firstField.appendChild(moreLess);

        return container.outerHTML;
    };

    function removeRow(ev) {
        if (ev.target.className.includes('remove-row')) {
            if (!confirm(ill_batch_item_remove)) return;
            // Find the parent row
            var ancestor = ev.target.closest('tr');
            var identifier = ancestor.querySelector('.identifier').innerText;
            tableContent.data = tableContent.data.filter(function (row) {
                return row.value !== identifier;
            });
        }
    }

    function toggleMetadata(ev) {
        if (ev.target.className === 'more-less-link') {
            // Find the element we need to show
            var ancestor = ev.target.closest('.metadata-container');
            var meta = ancestor.querySelector('.metadata-remainder');

            // Display or hide based on its current state
            var display = window.getComputedStyle(meta).display;

            meta.style.display = display === 'block' ? 'none' : 'block';

            // Update the More / Less text
            ev.target.innerText = ' [ ' + (display === 'none' ? ill_batch_metadata_less : ill_batch_metadata_more) + ' ]';
        }
    }

    // A render function for the link to a request ID
    function createRequestId(x, y, data) {
        return data.requestId || '-';
    }

    function createRequestStatus(x, y, data) {
        return data.requestStatus || '-';
    }

    function buildTable(identifiers) {
        table = KohaTable('identifier-table', {
            processing: true,
            deferRender: true,
            ordering: false,
            paging: false,
            searching: false,
            autoWidth: false,
            columns: [
                {
                    data: 'type',
                    width: '13%',
                    render: createIdentifierType
                },
                {
                    data: 'value',
                    width: '25%',
                    className: 'identifier'
                },
                {
                    data: 'metadata',
                    render: createMetadata
                },
                {
                    data: 'requestId',
                    width: '6.5%',
                    render: createRequestId
                },
                {
                    data: 'requestStatus',
                    width: '6.5%',
                    render: createRequestStatus
                },
                {
                    width: '18%',
                    render: createActions,
                    className: 'action-column'
                }
            ],
            createdRow: function (row, data) {
                if (data.failed.length > 0) {
                    row.classList.add('fetch-failed');
                }
            }
        });
    }

    function createActions(x, y, data) {
        return '<button type="button" aria-label='+ ill_button_remove + (data.requestId ? ' disabled aria-disabled="true"' : '') + ' class="btn btn-xs btn-danger remove-row">' + ill_button_remove + '</button>';
    }

    // Redraw the table
    function updateTable() {
        if (!table) return;
        tableEl.style.display = tableContent.data.length > 0 ? 'table' : 'none';
        tableEl.style.width = '100%';
        table.api()
            .clear()
            .rows.add(tableContent.data)
            .draw();
    };

    function identifyIdentifier(identifier) {
        var matches = [];

        // Iterate our available services to see if any can identify this identifier
        Object.keys(supportedIdentifiers).forEach(function (identifierType) {
            // Since all the services supporting this identifier type should use the same
            // regex to identify it, we can just use the first
            var service = supportedIdentifiers[identifierType][0];
            var regex = new RegExp(service.identifiers_supported[identifierType].regex);
            var match = identifier.match(regex);
            if (match && match.groups && match.groups.identifier) {
                matches.push({
                    type: identifierType,
                    value: match.groups.identifier
                });
            }
        });
        return matches;
    }

    function displayErrors(errors) {
        var keys = Object.keys(errors);
        if (keys.length > 0) {
            keys.forEach(function (key) {
                var el = document.getElementById(errors[key].element);
                el.textContent = errors[key].values;
                el.style.display = 'inline';
                var container = document.getElementById(key);
                container.style.display = 'block';
            });
            var el = document.getElementById('textarea-errors');
            el.style.display = 'flex';
        }
    }

    function hideErrors() {
        var dupelist = document.getElementById('dupelist');
        var badids = document.getElementById('badids');
        dupelist.textContent = '';
        dupelist.parentElement.style.display = 'none';
        badids.textContent = '';
        badids.parentElement.style.display = 'none';
        var tae = document.getElementById('textarea-errors');
        tae.style.display = 'none';
    }

    function manageBatchItemsDisplay() {
        batchItemsDisplay.style.display = batch.data.id ? 'block' : 'none'
    };

    function updateBatchInputs() {
        nameInput.value = batch.data.name || '';
        cardnumberInput.value = batch.data.cardnumber || '';
        branchcodeSelect.value = batch.data.branchcode || '';
    }

    function debounce(func) {
        var timeout;
        return function (...args) {
            return new Promise(function (resolve) {
                if (timeout) {
                    clearTimeout(timeout);
                }
                timeout = setTimeout(function () {
                    return resolve(func(...args));
                }, debounceDelay);
            });
        }
    }

    function patronAutocomplete() {
        patron_autocomplete(
            $('#batch-form #batchcardnumber'),
            {
              'on-select-callback': function( event, ui ) {
                $("#batch-form #batchcardnumber").val( ui.item.cardnumber );
                return false;
              }
            }
          );
    };

    function createPatronLink() {
        if (!batch.data.patron) return;
        var patron = batch.data.patron;
        var a = document.createElement('a');
        var href = '/cgi-bin/koha/members/moremember.pl?borrowernumber=' + patron.borrowernumber;
        var text = patron.surname + ' (' + patron.cardnumber + ')';
        a.setAttribute('title', ill_borrower_details);
        a.setAttribute('href', href);
        a.textContent = text;
        return a;
    };

})();




(function () {
    var table;
    var batchesProxy;

    window.addEventListener('load', onload);

    function onload() {
        // Only proceed if appropriate
        if (!document.getElementById('ill-batch-requests')) return;

        // A proxy that will give us some element of reactivity to
        // changes in our list of batches
        batchesProxy = new Proxy(
            { data: [] },
            {
                get: function (obj, prop) {
                    return obj[prop];
                },
                set: function (obj, prop, value) {
                    obj[prop] = value;
                    updateTable();
                }
            }
        );

        // Initialise the Datatable, binding it to our proxy object
        table = initTable();

        // Do the initial data population
        window.doBatchApiRequest()
            .then(function (response) {
                return response.json();
            })
            .then(function (data) {
                batchesProxy.data = data;
            });

        // Clean up any event listeners we added
        window.addEventListener('beforeunload', removeEventListeners);
    };

    // Initialise the Datatable
    // FIXME: This should be a kohaTable not KohaTable
    var initTable = function () {
        return KohaTable("ill-batch-requests", {
            data: batchesProxy.data,
            columns: [
                {
                    data: 'id',
                    width: '10%'
                },
                {
                    data: 'name',
                    render: createName,
                    width: '30%'
                },
                {
                    data: 'requests_count',
                    width: '10%'
                },
                {
                    data: 'status',
                    render: createStatus,
                    width: '10%'
                },
                {
                    data: 'patron',
                    render: createPatronLink,
                    width: '10%'
                },
                {
                    data: 'branch',
                    render: createBranch,
                    width: '20%'
                },
                {
                    render: createActions,
                    width: '10%',
                    orderable: false
                }
            ],
            processing: true,
            deferRender: true,
            drawCallback: addEventListeners
        });
    }

    // A render function for branch name
    var createBranch = function (data) {
        return data.branchname;
    };

    // A render function for batch name
    var createName = function (x, y, data) {
        var a = document.createElement('a');
        a.setAttribute('href', '/cgi-bin/koha/ill/ill-requests.pl?batch_id=' + data.id);
        a.setAttribute('title', data.name);
        a.textContent = data.name;
        return a.outerHTML;
    };

    // A render function for batch status
    var createStatus = function (x, y, data) {
        return data.status.name;
    };

    // A render function for our patron link
    var createPatronLink = function (data) {
        var link = document.createElement('a');
        link.setAttribute('title', ill_batch_borrower_details);
        link.setAttribute('href', '/cgi-bin/koha/members/moremember.pl?borrowernumber=' + data.borrowernumber);
        var displayText = [data.firstname, data.surname].join(' ') + ' ( ' + data.cardnumber + ' )';
        link.appendChild(document.createTextNode(displayText));

        return link.outerHTML;
    };

    // A render function for our row action buttons
    var createActions = function (data, type, row) {
        var div = document.createElement('div');
        div.setAttribute('class', 'action-buttons');

        var editButton = document.createElement('button');
        editButton.setAttribute('type', 'button');
        editButton.setAttribute('class', 'editButton btn btn-xs btn-default');
        editButton.setAttribute('data-batch-id', row.id);
        editButton.appendChild(document.createTextNode(ill_batch_edit));

        var deleteButton = document.createElement('button');
        deleteButton.setAttribute('type', 'button');
        deleteButton.setAttribute('class', 'deleteButton btn btn-xs btn-danger');
        deleteButton.setAttribute('data-batch-id', row.id);
        deleteButton.appendChild(document.createTextNode(ill_batch_delete));

        div.appendChild(editButton);
        div.appendChild(deleteButton);

        return div.outerHTML;
    };

    // Add event listeners to our row action buttons
    var addEventListeners = function () {
        var del = document.querySelectorAll('.deleteButton');
        del.forEach(function (el) {
            el.addEventListener('click', handleDeleteClick);
        });

        var edit = document.querySelectorAll('.editButton');
        edit.forEach(function (elEdit) {
            elEdit.addEventListener('click', handleEditClick);
        });
    };

    // Remove all added event listeners
    var removeEventListeners = function () {
        var del = document.querySelectorAll('.deleteButton');
        del.forEach(function (el) {
            el.removeEventListener('click', handleDeleteClick);
        });
        window.removeEventListener('load', onload);
        window.removeEventListener('beforeunload', removeEventListeners);
    };

    // Handle "Delete" clicks
    var handleDeleteClick = function(e) {
        var el = e.srcElement;
        if (confirm(ill_batch_confirm_delete)) {
            deleteBatch(el);
        }
    };

    // Handle "Edit" clicks
    var handleEditClick = function(e) {
        var el = e.srcElement;
        var id = el.dataset.batchId;
        window.openBatchModal(id);
    };

    // Delete a batch
    // - Make the API call
    // - Handle errors
    // - Update our proxy data
    var deleteBatch = function (el) {
        var id = el.dataset.batchId;
        doBatchApiRequest(
            '/' + id,
            { method: 'DELETE' }
        )
        .then(function (response) {
            if (!response.ok) {
                window.handleApiError(ill_batch_delete_fail);
            } else {
                removeBatch(el.dataset.batchId);
            }
        })
        .catch(function (response) {
            window.handleApiError(ill_batch_delete_fail);
        })
    };

    // Remove a batch from our proxy data
    var removeBatch = function(id) {
        batchesProxy.data = batchesProxy.data.filter(function (batch) {
            return batch.id != id;
        });
    };

    // Redraw the table
    var updateTable = function () {
        table.api()
            .clear()
            .rows.add(batchesProxy.data)
            .draw();
    };

})();




(function () {
    // Enable the modal to be opened from anywhere
    // If we're working with an existing batch, set the ID so the
    // modal can access it
    window.openBatchModal = function (id, backend) {
        var idEl = document.getElementById('ill-batch-details');
        idEl.dataset.backend = backend;
        if (id) {
            idEl.dataset.batchId = id;
        }
        $('#ill-batch-modal').modal({ show: true });
    };

    // Make a batch API call, returning the resulting promise
    window.doBatchApiRequest = function (url, options) {
        var batchListApi = '/api/v1/illbatches';
        var fullUrl = batchListApi + (url ? url : '');
        return doApiRequest(fullUrl, options);
    };

    // Make a "create local ILL submission" call
    window.doCreateSubmission = function (body, options) {
        options = Object.assign(
            options || {},
            {
                headers: {
                    'Content-Type': 'application/json'
                },
                method: 'POST',
                body: JSON.stringify(body)
            }
        );
        return doApiRequest(
            '/api/v1/ill/requests',
            options
        )
    }

    // Make an API call, returning the resulting promise
    window.doApiRequest = function (url, options) {
        return fetch(url, options);
    };

    // Display an API error
    window.handleApiError = function (error) {
        alert(error);
    };

})();

Lines 51-57 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js (-4 / +24 lines)
51	return '';	51	return '';
52	}	52	}
53		53
54	// At the moment, the only prefilter possible is borrowernumber	54	// Possible prefilters: borrowernumber, batch_id
55	// see ill/ill-requests.pl and members/ill-requests.pl	55	// see ill/ill-requests.pl and members/ill-requests.pl
56	let additional_prefilters = {};	56	let additional_prefilters = {};
57	if(prefilters){	57	if(prefilters){
Lines 63-68 $(document).ready(function() { Link Here
63	}	63	}
64		64
65	let borrower_prefilter = additional_prefilters['borrowernumber'] \|\| null;	65	let borrower_prefilter = additional_prefilters['borrowernumber'] \|\| null;
		66	let batch_id_prefilter = additional_prefilters['batch_id'] \|\| null;
66		67
67	let additional_filters = {	68	let additional_filters = {
68	"me.backend": function(){	69	"me.backend": function(){
Lines 78-83 $(document).ready(function() { Link Here
78	"me.borrowernumber": function(){	79	"me.borrowernumber": function(){
79	return borrower_prefilter ? { "=": borrower_prefilter } : "";	80	return borrower_prefilter ? { "=": borrower_prefilter } : "";
80	},	81	},
		82	"me.batch_id": function(){
		83	return batch_id_prefilter ? { "=": batch_id_prefilter } : "";
		84	},
81	"-or": function(){	85	"-or": function(){
82	let patron = $("#illfilter_patron").val();	86	let patron = $("#illfilter_patron").val();
83	let status = $("#illfilter_status").val();	87	let status = $("#illfilter_status").val();
Lines 119-125 $(document).ready(function() { Link Here
119	return filters;	123	return filters;
120	},	124	},
121	"me.placed": function(){	125	"me.placed": function(){
122	if ( Object.keys(additional_prefilters).length ) return "";	126	if (Object.keys(additional_prefilters).length && borrower_prefilter) return "";
123	let placed_start = $('#illfilter_dateplaced_start').get(0)._flatpickr.selectedDates[0];	127	let placed_start = $('#illfilter_dateplaced_start').get(0)._flatpickr.selectedDates[0];
124	let placed_end = $('#illfilter_dateplaced_end').get(0)._flatpickr.selectedDates[0];	128	let placed_end = $('#illfilter_dateplaced_end').get(0)._flatpickr.selectedDates[0];
125	if (!placed_start && !placed_end) return "";	129	if (!placed_start && !placed_end) return "";
Lines 129-135 $(document).ready(function() { Link Here
129	}	133	}
130	},	134	},
131	"me.updated": function(){	135	"me.updated": function(){
132	if (Object.keys(additional_prefilters).length) return "";	136	if (Object.keys(additional_prefilters).length && borrower_prefilter) return "";
133	let updated_start = $('#illfilter_datemodified_start').get(0)._flatpickr.selectedDates[0];	137	let updated_start = $('#illfilter_datemodified_start').get(0)._flatpickr.selectedDates[0];
134	let updated_end = $('#illfilter_datemodified_end').get(0)._flatpickr.selectedDates[0];	138	let updated_end = $('#illfilter_datemodified_end').get(0)._flatpickr.selectedDates[0];
135	if (!updated_start && !updated_end) return "";	139	if (!updated_start && !updated_end) return "";
Lines 175-182 $(document).ready(function() { Link Here
175	};	179	};
176		180
177	let table_id = "#ill-requests";	181	let table_id = "#ill-requests";
		182
178	if (borrower_prefilter) {	183	if (borrower_prefilter) {
179	table_id += "-patron-" + borrower_prefilter;	184	table_id += "-patron-" + borrower_prefilter;
		185	} else if ( batch_id_prefilter ){
		186	table_id += "-batch-" + batch_id_prefilter;
180	}	187	}
181		188
182	var ill_requests_table = $(table_id).kohaTable({	189	var ill_requests_table = $(table_id).kohaTable({
Lines 188-193 $(document).ready(function() { Link Here
188	'biblio',	195	'biblio',
189	'comments+count',	196	'comments+count',
190	'extended_attributes',	197	'extended_attributes',
		198	'batch',
191	'library',	199	'library',
192	'id_prefix',	200	'id_prefix',
193	'patron'	201	'patron'
Lines 206-211 $(document).ready(function() { Link Here
206	'">' + escape_str(row.id_prefix) + escape_str(data) + '</a>';	214	'">' + escape_str(row.id_prefix) + escape_str(data) + '</a>';
207	}	215	}
208	},	216	},
		217	{
		218	"data": "batch.name", // batch
		219	"orderable": false,
		220	"render": function(data, type, row, meta) {
		221	return row.batch ?
		222	'<a href="/cgi-bin/koha/ill/ill-requests.pl?batch_id=' +
		223	row.batch_id +
		224	'">' +
		225	row.batch.name +
		226	'</a>'
		227	: "";
		228	}
		229	},
209	{	230	{
210	"data": "", // author	231	"data": "", // author
211	"orderable": false,	232	"orderable": false,
212	-

Return to bug 30719

Lines 3736-3741 input.renew { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+106 lines)
3736	}	3736	}
3737		3737
3738	#interlibraryloans {	3738	#interlibraryloans {
		3739
		3740	.ill-toolbar {
		3741	display: flex;
		3742	}
		3743
		3744	#ill-batch {
		3745	flex-grow: 1;
		3746	display: flex;
		3747	justify-content: flex-end;
		3748	gap: 5px;
		3749	}
		3750
		3751	#ill-batch-requests {
		3752	.action-buttons {
		3753	display: flex;
		3754	gap: 5px;
		3755	justify-content: center;
		3756	}
		3757	}
		3758
		3759	#ill-batch-modal {
		3760	.modal-footer {
		3761	display: flex;
		3762	& > * {
		3763	flex: 1;
		3764	}
		3765	#lhs {
		3766	text-align: left;
		3767	}
		3768	}
		3769	#create-progress {
		3770	margin-top: 17px;
		3771	}
		3772	.fetch-failed {
		3773	background-color: rgba(255,0,0,0.1);
		3774	& > * {
		3775	background-color: inherit;
		3776	}
		3777	}
		3778	.progress {
		3779	margin-bottom: 0;
		3780	margin-top: 17px;
		3781	}
		3782	#create-requests {
		3783	display: flex;
		3784	justify-content: flex-end;
		3785	}
		3786	.action-column {
		3787	text-align: center;
		3788	& > * {
		3789	margin-left: 5px;
		3790	}
		3791	& > *:first-child {
		3792	margin-left: 0;
		3793	}
		3794	}
		3795	.metadata-row:not(:first-child) {
		3796	margin-top: 0.5em;
		3797	}
		3798	.metadata-label {
		3799	font-weight: 600;
		3800	}
		3801	.more-less {
		3802	text-align: right;
3803	margin: 2px 0;
3804	}
3805
3806	}
3807
3808	#batch-form {
3809	legend {
3810	margin-bottom: 2em;
3811	}
3812	textarea {
3813	width: 100%;
3814	min-height: 100px;
3815	padding: 5px;
3816	resize: vertical;
3817	}
3818	#new-batch-form {
3819	display: flex;
3820	gap: 20px;
3821	}
3822	li#process-button {
3823	display: flex;
3824	justify-content: flex-end;
3825	}
3826	#textarea-metadata {
3827	padding: 0 15px;
3828	display: flex;
3829	justify-content: space-between;
3830	}
3831	#textarea-errors {
3832	display: flex;
3833	flex-direction: column;
3834	gap: 10px;
3835	padding: 20px 15px 10px
3836	}
3837	.batch-modal-actions {
3838	text-align: center;
3839	}
3840	fieldset {
3841	border: 2px solid #b9d8d9;
3842	}
3843	}
3844
3739	#dataPreviewLabel {	3845	#dataPreviewLabel {
3740	margin: .3em 0;	3846	margin: .3em 0;
3741	}	3847	}

Line 0 Link Here

(-)a/Koha/Illbatch.pm (+196 lines)
		1	package Koha::Illbatch;
		2
		3	# Copyright PTFS Europe 2022
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21	use Koha::Database;
		22	use Koha::Illrequest::Logger;
		23	use Koha::IllbatchStatus;
		24	use JSON qw( to_json );
		25	use base qw(Koha::Object);
		26
		27	=head1 NAME
		28
		29	Koha::Illbatch - Koha Illbatch Object class
		30
		31	=head2 Class methods
		32
		33	=head3 status
		34
		35	my $status = Koha::Illbatch->status;
		36
		37	Return the status object associated with this batch
		38
		39	=cut
		40
		41	sub status {
		42	my ( $self ) = @_;
		43	return Koha::IllbatchStatus->_new_from_dbic(
		44	scalar $self->_result->statuscode
		45	);
		46	}
		47
		48	=head3 patron
		49
		50	my $patron = Koha::Illbatch->patron;
		51
		52	Return the patron object associated with this batch
		53
		54	=cut
		55
		56	sub patron {
		57	my ( $self ) = @_;
		58	return Koha::Patron->_new_from_dbic(
		59	scalar $self->_result->borrowernumber
		60	);
		61	}
		62
		63	=head3 branch
		64
65	my $branch = Koha::Illbatch->branch;
66
67	Return the branch object associated with this batch
68
69	=cut
70
71	sub branch {
72	my ( $self ) = @_;
73	return Koha::Library->_new_from_dbic(
74	scalar $self->_result->branchcode
75	);
76	}
77
78	=head3 requests_count
79
80	my $requests_count = Koha::Illbatch->requests_count;
81
82	Return the number of requests associated with this batch
83
84	=cut
85
86	sub requests_count {
87	my ( $self ) = @_;
88	return Koha::Illrequests->search({
89	batch_id => $self->id
90	})->count;
91	}
92
93	=head3 create_and_log
94
95	$batch->create_and_log;
96
97	Log batch creation following storage
98
99	=cut
100
101	sub create_and_log {
102	my ( $self ) = @_;
103
104	$self->store;
105
106	my $logger = Koha::Illrequest::Logger->new;
107
108	$logger->log_something({
109	modulename => 'ILL',
110	actionname => 'batch_create',
111	objectnumber => $self->id,
112	infos => to_json({})
113	});
114	}
115
116	=head3 update_and_log
117
118	$batch->update_and_log;
119
120	Log batch update following storage
121
122	=cut
123
124	sub update_and_log {
125	my ( $self, $params ) = @_;
126
127	my $before = {
128	name => $self->name,
129	branchcode => $self->branchcode
130	};
131
132	$self->set( $params );
133	my $update = $self->store;
134
135	my $after = {
136	name => $self->name,
137	branchcode => $self->branchcode
138	};
139
140	my $logger = Koha::Illrequest::Logger->new;
141
142	$logger->log_something({
143	modulename => 'ILL',
144	actionname => 'batch_update',
145	objectnumber => $self->id,
146	infos => to_json({
147	before => $before,
148	after => $after
149	})
150	});
151	}
152
153	=head3 delete_and_log
154
155	$batch->delete_and_log;
156
157	Log batch delete
158
159	=cut
160
161	sub delete_and_log {
162	my ( $self ) = @_;
163
164	my $logger = Koha::Illrequest::Logger->new;
165
166	$logger->log_something({
167	modulename => 'ILL',
168	actionname => 'batch_delete',
169	objectnumber => $self->id,
170	infos => to_json({})
171	});
172
173	$self->delete;
174	}
175
176	=head2 Internal methods
177
178	=head3 _type
179
180	my $type = Koha::Illbatch->_type;
181
182	Return this object's type
183
184	=cut
185
186	sub _type {
187	return 'Illbatch';
188	}
189
190	=head1 AUTHOR
191
192	Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
193
194	=cut
195
196	1;

Line 0 Link Here

(-)a/Koha/Illbatches.pm (+61 lines)
	1	package Koha::Illbatches;
	2
	3	# Copyright PTFS Europe 2022
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19
	20	use Modern::Perl;
	21	use Koha::Database;
	22	use Koha::Illbatch;
	23	use base qw(Koha::Objects);
	24
	25	=head1 NAME
	26
	27	Koha::Illbatches - Koha Illbatches Object class
	28
	29	=head2 Internal methods
	30
	31	=head3 _type
	32
	33	my $type = Koha::Illbatches->_type;
	34
	35	Return this object's type
	36
	37	=cut
	38
	39	sub _type {
	40	return 'Illbatch';
	41	}
	42
	43	=head3 object_class
	44
	45	my $class = Koha::Illbatches->object_class;
	46
	47	Return this object's class name
	48
	49	=cut
	50
	51	sub object_class {
	52	return 'Koha::Illbatch';
	53	}
	54
	55	=head1 AUTHOR
	56
	57	Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
	58
	59	=cut
	60
	61	1;

Line 0 Link Here

(-)a/Koha/REST/V1/Illbatches.pm (+256 lines)
		1	package Koha::REST::V1::Illbatches;
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it
		6	# under the terms of the GNU General Public License as published by
		7	# the Free Software Foundation; either version 3 of the License, or
		8	# (at your option) any later version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but
		11	# WITHOUT ANY WARRANTY; without even the implied warranty of
		12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		13	# GNU General Public License for more details.
		14	#
		15	# You should have received a copy of the GNU General Public License
		16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		17
		18	use Modern::Perl;
		19
		20	use Mojo::Base 'Mojolicious::Controller';
		21
		22	use Koha::Illbatches;
		23	use Koha::IllbatchStatuses;
		24	use Koha::Illrequests;
		25
		26	use Try::Tiny qw( catch try );
		27
		28	=head1 NAME
		29
		30	Koha::REST::V1::Illbatches
		31
		32	=head2 Operations
		33
		34	=head3 list
		35
		36	Return a list of available ILL batches
		37
		38	=cut
		39
		40	sub list {
		41	my $c = shift->openapi->valid_input;
		42
		43	#FIXME: This should be $c->objects-search
		44	my @batches = Koha::Illbatches->search()->as_list;
		45
		46	#FIXME: Below should be coming from $c->objects accessors
		47	# Get all patrons associated with all our batches
		48	# in one go
		49	my $patrons = {};
		50	foreach my $batch(@batches) {
		51	my $patron_id = $batch->borrowernumber;
		52	$patrons->{$patron_id} = 1
		53	};
		54	my @patron_ids = keys %{$patrons};
		55	my $patron_results = Koha::Patrons->search({
		56	borrowernumber => { -in => \@patron_ids }
		57	});
		58
		59	# Get all branches associated with all our batches
		60	# in one go
		61	my $branches = {};
		62	foreach my $batch(@batches) {
		63	my $branch_id = $batch->branchcode;
		64	$branches->{$branch_id} = 1
65	};
66	my @branchcodes = keys %{$branches};
67	my $branch_results = Koha::Libraries->search({
68	branchcode => { -in => \@branchcodes }
69	});
70
71	# Get all batch statuses associated with all our batches
72	# in one go
73	my $statuses = {};
74	foreach my $batch(@batches) {
75	my $code = $batch->statuscode;
76	$statuses->{$code} = 1
77	};
78	my @statuscodes = keys %{$statuses};
79	my $status_results = Koha::IllbatchStatuses->search({
80	code => { -in => \@statuscodes }
81	});
82
83	# Populate the response
84	my @to_return = ();
85	foreach my $it_batch(@batches) {
86	my $patron = $patron_results->find({ borrowernumber => $it_batch->borrowernumber});
87	my $branch = $branch_results->find({ branchcode => $it_batch->branchcode });
88	my $status = $status_results->find({ code => $it_batch->statuscode });
89	push @to_return, {
90	%{$it_batch->unblessed},
91	patron => $patron,
92	branch => $branch,
93	status => $status,
94	requests_count => $it_batch->requests_count
95	};
96	}
97
98	return $c->render( status => 200, openapi => \@to_return );
99	}
100
101	=head3 get
102
103	Get one batch
104
105	=cut
106
107	sub get {
108	my $c = shift->openapi->valid_input;
109
110	my $batchid = $c->validation->param('illbatch_id');
111
112	my $batch = Koha::Illbatches->find($batchid);
113
114	if (not defined $batch) {
115	return $c->render(
116	status => 404,
117	openapi => { error => "ILL batch not found" }
118	);
119	}
120
121	return $c->render(
122	status => 200,
123	openapi => {
124	%{$batch->unblessed},
125	patron => $batch->patron->unblessed,
126	branch => $batch->branch->unblessed,
127	status => $batch->status->unblessed,
128	requests_count => $batch->requests_count
129	}
130	);
131	}
132
133	=head3 add
134
135	Add a new batch
136
137	=cut
138
139	sub add {
140	my $c = shift->openapi->valid_input or return;
141
142	my $body = $c->validation->param('body');
143
144	# We receive cardnumber, so we need to look up the corresponding
145	# borrowernumber
146	my $patron = Koha::Patrons->find({ cardnumber => $body->{cardnumber} });
147
148	if ( not defined $patron ) {
149	return $c->render(
150	status => 404,
151	openapi => { error => "Patron with cardnumber " . $body->{cardnumber} . " not found" }
152	);
153	}
154
155	delete $body->{cardnumber};
156	$body->{borrowernumber} = $patron->borrowernumber;
157
158	return try {
159	my $batch = Koha::Illbatch->new( $body );
160	$batch->create_and_log;
161	$c->res->headers->location( $c->req->url->to_string . '/' . $batch->id );
162
163	my $ret = {
164	%{$batch->unblessed},
165	patron => $batch->patron->unblessed,
166	branch => $batch->branch->unblessed,
167	status => $batch->status->unblessed,
168	requests_count => 0
169	};
170
171	return $c->render(
172	status => 201,
173	openapi => $ret
174	);
175	}
176	catch {
177	if ( blessed $_ ) {
178	if ( $_->isa('Koha::Exceptions::Object::DuplicateID') ) {
179	return $c->render(
180	status => 409,
181	openapi => { error => "A batch named " . $body->{name} . " already exists" }
182	);
183	}
184	}
185	$c->unhandled_exception($_);
186	};
187	}
188
189	=head3 update
190
191	Update a batch
192
193	=cut
194
195	sub update {
196	my $c = shift->openapi->valid_input or return;
197
198	my $batch = Koha::Illbatches->find( $c->validation->param('illbatch_id') );
199
200	if ( not defined $batch ) {
201	return $c->render(
202	status => 404,
203	openapi => { error => "ILL batch not found" }
204	);
205	}
206
207	my $params = $c->req->json;
208	delete $params->{cardnumber};
209
210	return try {
211	$batch->update_and_log( $params );
212
213	my $ret = {
214	%{$batch->unblessed},
215	patron => $batch->patron->unblessed,
216	branch => $batch->branch->unblessed,
217	status => $batch->status->unblessed,
218	requests_count => $batch->requests_count
219	};
220
221	return $c->render(
222	status => 200,
223	openapi => $ret
224	);
225	}
226	catch {
227	$c->unhandled_exception($_);
228	};
229	}
230
231	=head3 delete
232
233	Delete a batch
234
235	=cut
236
237	sub delete {
238
239	my $c = shift->openapi->valid_input or return;
240
241	my $batch = Koha::Illbatches->find( $c->validation->param( 'illbatch_id' ) );
242
243	if ( not defined $batch ) {
244	return $c->render( status => 404, openapi => { error => "ILL batch not found" } );
245	}
246
247	return try {
248	$batch->delete_and_log;
249	return $c->render( status => 204, openapi => '');
250	}
251	catch {
252	$c->unhandled_exception($_);
253	};
254	}
255
256	1;

Line 0 Link Here

(-)a/api/v1/swagger/definitions/illbatch.yaml (+48 lines)
	1	---
	2	type: object
	3	properties:
	4	id:
	5	type: string
	6	description: Internal ILL batch identifier
	7	name:
	8	type: string
	9	description: Name of the ILL batch
	10	backend:
	11	type: string
	12	description: Backend name
	13	cardnumber:
	14	type: string
	15	description: Card number of the patron of the ILL batch
	16	borrowernumber:
	17	type: string
	18	description: Borrower number of the patron of the ILL batch
	19	branchcode:
	20	type: string
	21	description: Branch code of the branch of the ILL batch
	22	patron:
	23	type:
	24	- object
	25	- "null"
	26	description: The patron associated with the batch
	27	branch:
	28	type:
	29	- object
	30	- "null"
	31	description: The branch associated with the batch
	32	statuscode:
	33	type: string
	34	description: Code of the status of the ILL batch
	35	status:
	36	type:
	37	- object
	38	- "null"
	39	description: The status associated with the batch
	40	requests_count:
	41	type: string
	42	description: The number of requests in this batch
	43	additionalProperties: false
	44	required:
	45	- name
	46	- backend
	47	- branchcode
	48	- statuscode

Line 0 Link Here

(-)a/api/v1/swagger/paths/illbatches.yaml (+236 lines)
		1	---
		2	/illbatches:
		3	get:
		4	x-mojo-to: Illbatches#list
		5	operationId: listIllbatches
		6	tags:
		7	- illbatches
		8	summary: List ILL batches
		9	parameters: []
		10	produces:
		11	- application/json
		12	responses:
		13	"200":
		14	description: A list of ILL batches
		15	schema:
		16	$ref: "../swagger.yaml#/definitions/illbatches"
		17	"401":
		18	description: Authentication required
		19	schema:
		20	$ref: "../swagger.yaml#/definitions/error"
		21	"403":
		22	description: Access forbidden
		23	schema:
		24	$ref: "../swagger.yaml#/definitions/error"
		25	"404":
		26	description: ILL batches not found
		27	schema:
		28	$ref: "../swagger.yaml#/definitions/error"
		29	"500":
		30	description: \|
		31	Internal server error. Possible `error_code` attribute values:
		32
		33	* `internal_server_error`
		34	schema:
		35	$ref: "../swagger.yaml#/definitions/error"
		36	"503":
		37	description: Under maintenance
		38	schema:
		39	$ref: "../swagger.yaml#/definitions/error"
		40	x-koha-authorization:
		41	permissions:
		42	ill: "1"
		43	post:
		44	x-mojo-to: Illbatches#add
		45	operationId: addIllbatch
		46	tags:
		47	- illbatches
		48	summary: Add ILL batch
		49	parameters:
		50	- name: body
		51	in: body
		52	description: A JSON object containing informations about the new batch
		53	required: true
		54	schema:
		55	$ref: "../swagger.yaml#/definitions/illbatch"
		56	produces:
		57	- application/json
		58	responses:
		59	"201":
		60	description: Batch added
		61	schema:
		62	$ref: "../swagger.yaml#/definitions/illbatch"
		63	"400":
		64	description: Bad request
65	schema:
66	$ref: "../swagger.yaml#/definitions/error"
67	"401":
68	description: Authentication required
69	schema:
70	$ref: "../swagger.yaml#/definitions/error"
71	"403":
72	description: Access forbidden
73	schema:
74	$ref: "../swagger.yaml#/definitions/error"
75	"404":
76	description: Patron with given cardnumber not found
77	schema:
78	$ref: "../swagger.yaml#/definitions/error"
79	"409":
80	description: Conflict in creating resource
81	schema:
82	$ref: "../swagger.yaml#/definitions/error"
83	"500":
84	description: \|
85	Internal server error. Possible `error_code` attribute values:
86
87	* `internal_server_error`
88	schema:
89	$ref: "../swagger.yaml#/definitions/error"
90	"503":
91	description: Under maintenance
92	schema:
93	$ref: "../swagger.yaml#/definitions/error"
94	x-koha-authorization:
95	permissions:
96	ill: "1"
97	"/illbatches/{illbatch_id}":
98	get:
99	x-mojo-to: Illbatches#get
100	operationId: getIllbatches
101	tags:
102	- illbatches
103	summary: Get ILL batch
104	parameters:
105	- name: illbatch_id
106	in: path
107	description: ILL batch id/name/contents
108	required: true
109	type: string
110	produces:
111	- application/json
112	responses:
113	"200":
114	description: An ILL batch
115	schema:
116	$ref: "../swagger.yaml#/definitions/illbatch"
117	"401":
118	description: Authentication required
119	schema:
120	$ref: "../swagger.yaml#/definitions/error"
121	"403":
122	description: Access forbidden
123	schema:
124	$ref: "../swagger.yaml#/definitions/error"
125	"404":
126	description: ILL batch not found
127	schema:
128	$ref: "../swagger.yaml#/definitions/error"
129	"500":
130	description: \|
131	Internal server error. Possible `error_code` attribute values:
132
133	* `internal_server_error`
134	schema:
135	$ref: "../swagger.yaml#/definitions/error"
136	"503":
137	description: Under maintenance
138	schema:
139	$ref: "../swagger.yaml#/definitions/error"
140	x-koha-authorization:
141	permissions:
142	ill: "1"
143	put:
144	x-mojo-to: Illbatches#update
145	operationId: updateIllBatch
146	tags:
147	- illbatches
148	summary: Update batch
149	parameters:
150	- $ref: "../swagger.yaml#/parameters/illbatch_id_pp"
151	- name: body
152	in: body
153	description: A JSON object containing information on the batch
154	required: true
155	schema:
156	$ref: "../swagger.yaml#/definitions/illbatch"
157	consumes:
158	- application/json
159	produces:
160	- application/json
161	responses:
162	"200":
163	description: An ILL batch
164	schema:
165	$ref: "../swagger.yaml#/definitions/illbatch"
166	"400":
167	description: Bad request
168	schema:
169	$ref: "../swagger.yaml#/definitions/error"
170	"401":
171	description: Authentication required
172	schema:
173	$ref: "../swagger.yaml#/definitions/error"
174	"403":
175	description: Access forbidden
176	schema:
177	$ref: "../swagger.yaml#/definitions/error"
178	"404":
179	description: ILL batch not found
180	schema:
181	$ref: "../swagger.yaml#/definitions/error"
182	"500":
183	description: \|
184	Internal server error. Possible `error_code` attribute values:
185
186	* `internal_server_error`
187	schema:
188	$ref: "../swagger.yaml#/definitions/error"
189	"503":
190	description: Under maintenance
191	schema:
192	$ref: "../swagger.yaml#/definitions/error"
193	x-koha-authorization:
194	permissions:
195	ill: "1"
196	delete:
197	x-mojo-to: Illbatches#delete
198	operationId: deleteBatch
199	tags:
200	- illbatches
201	summary: Delete ILL batch
202	parameters:
203	- $ref: "../swagger.yaml#/parameters/illbatch_id_pp"
204	produces:
205	- application/json
206	responses:
207	"204":
208	description: ILL batch deleted
209	schema:
210	type: string
211	"401":
212	description: Authentication required
213	schema:
214	$ref: "../swagger.yaml#/definitions/error"
215	"403":
216	description: Access forbidden
217	schema:
218	$ref: "../swagger.yaml#/definitions/error"
219	"404":
220	description: ILL batch not found
221	schema:
222	$ref: "../swagger.yaml#/definitions/error"
223	"500":
224	description: \|
225	Internal server error. Possible `error_code` attribute values:
226
227	* `internal_server_error`
228	schema:
229	$ref: "../swagger.yaml#/definitions/error"
230	"503":
231	description: Under maintenance
232	schema:
233	$ref: "../swagger.yaml#/definitions/error"
234	x-koha-authorization:
235	permissions:
236	ill: "1"

Lines 27-36 use Koha::Notice::Templates; Link Here

(-)a/ill/ill-requests.pl (-5 / +100 lines)
27	use Koha::AuthorisedValues;	27	use Koha::AuthorisedValues;
28	use Koha::Illcomment;	28	use Koha::Illcomment;
29	use Koha::Illrequests;	29	use Koha::Illrequests;
		30	use Koha::Illbatches;
30	use Koha::Illrequest::Workflow::Availability;	31	use Koha::Illrequest::Workflow::Availability;
31	use Koha::Illrequest::Workflow::TypeDisclaimer;	32	use Koha::Illrequest::Workflow::TypeDisclaimer;
32	use Koha::Libraries;	33	use Koha::Libraries;
33	use Koha::Token;	34	use Koha::Token;
		35	use Koha::Plugins;
34		36
35	use Try::Tiny qw( catch try );	37	use Try::Tiny qw( catch try );
36	use URI::Escape qw( uri_escape_utf8 );	38	use URI::Escape qw( uri_escape_utf8 );
Lines 66-75 my $has_branch = $cfg->has_branch; Link Here
66	my $backends_available = ( scalar @{$backends} > 0 );	68	my $backends_available = ( scalar @{$backends} > 0 );
67	$template->param(	69	$template->param(
68	backends_available => $backends_available,	70	backends_available => $backends_available,
69	has_branch => $has_branch	71	has_branch => $has_branch,
		72	have_batch => have_batch_backends($backends)
70	);	73	);
71		74
72	if ( $backends_available ) {	75	if ( $backends_available ) {
		76	# Establish what metadata enrichment plugins we have available
		77	my $enrichment_services = get_metadata_enrichment();
		78	if (scalar @{$enrichment_services} > 0) {
		79	$template->param(
		80	metadata_enrichment_services => encode_json($enrichment_services)
		81	);
		82	}
		83	# Establish whether we have any availability services that can provide availability
		84	# for the batch identifier types we support
		85	my $batch_availability_services = get_ill_availability($enrichment_services);
		86	if (scalar @{$batch_availability_services} > 0) {
		87	$template->param(
		88	batch_availability_services => encode_json($batch_availability_services)
		89	);
		90	}
		91
73	if ( $op eq 'illview' ) {	92	if ( $op eq 'illview' ) {
74	# View the details of an ILL	93	# View the details of an ILL
75	my $request = Koha::Illrequests->find($params->{illrequest_id});	94	my $request = Koha::Illrequests->find($params->{illrequest_id});
Lines 138-145 if ( $backends_available ) { Link Here
138	}	157	}
139		158
140	$template->param(	159	$template->param(
141	whole => $backend_result,	160	whole => $backend_result,
142	request => $request	161	request => $request
143	);	162	);
144	handle_commit_maybe($backend_result, $request);	163	handle_commit_maybe($backend_result, $request);
145	}	164	}
Lines 205-210 if ( $backends_available ) { Link Here
205	# We simulate the API for backend requests for uniformity.	224	# We simulate the API for backend requests for uniformity.
206	# So, init:	225	# So, init:
207	my $request = Koha::Illrequests->find($params->{illrequest_id});	226	my $request = Koha::Illrequests->find($params->{illrequest_id});
		227	my $batches = Koha::Illbatches->search(undef, {
		228	order_by => { -asc => 'name' }
		229	});
208	if ( !$params->{stage} ) {	230	if ( !$params->{stage} ) {
209	my $backend_result = {	231	my $backend_result = {
210	error => 0,	232	error => 0,
Lines 217-229 if ( $backends_available ) { Link Here
217	};	239	};
218	$template->param(	240	$template->param(
219	whole => $backend_result,	241	whole => $backend_result,
220	request => $request	242	request => $request,
		243	batches => $batches
221	);	244	);
222	} else {	245	} else {
223	# Commit:	246	# Commit:
224	# Save the changes	247	# Save the changes
225	$request->borrowernumber($params->{borrowernumber});	248	$request->borrowernumber($params->{borrowernumber});
226	$request->biblio_id($params->{biblio_id});	249	$request->biblio_id($params->{biblio_id});
		250	$request->batch_id($params->{batch_id});
227	$request->branchcode($params->{branchcode});	251	$request->branchcode($params->{branchcode});
228	$request->price_paid($params->{price_paid});	252	$request->price_paid($params->{price_paid});
229	$request->notesopac($params->{notesopac});	253	$request->notesopac($params->{notesopac});
Lines 356-362 if ( $backends_available ) { Link Here
356	} elsif ( $op eq 'illlist') {	380	} elsif ( $op eq 'illlist') {
357		381
358	# If we receive a pre-filter, make it available to the template	382	# If we receive a pre-filter, make it available to the template
359	my $possible_filters = ['borrowernumber'];	383	my $possible_filters = ['borrowernumber', 'batch_id'];
360	my $active_filters = {};	384	my $active_filters = {};
361	foreach my $filter(@{$possible_filters}) {	385	foreach my $filter(@{$possible_filters}) {
362	if ($params->{$filter}) {	386	if ($params->{$filter}) {
Lines 375-380 if ( $backends_available ) { Link Here
375	$template->param(	399	$template->param(
376	prefilters => join("&", @tpl_arr)	400	prefilters => join("&", @tpl_arr)
377	);	401	);
		402
		403	if ($active_filters->{batch_id}) {
		404	my $batch_id = $active_filters->{batch_id};
		405	if ($batch_id) {
		406	my $batch = Koha::Illbatches->find($batch_id);
		407	$template->param(
		408	batch => $batch
		409	);
		410	}
		411	}
		412
378	} elsif ( $op eq "save_comment" ) {	413	} elsif ( $op eq "save_comment" ) {
379	die "Wrong CSRF token" unless Koha::Token->new->check_csrf({	414	die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
380	session_id => scalar $cgi->cookie('CGISESSID'),	415	session_id => scalar $cgi->cookie('CGISESSID'),
Lines 409-414 if ( $backends_available ) { Link Here
409	scalar $params->{illrequest_id} . $append	444	scalar $params->{illrequest_id} . $append
410	);	445	);
411	exit;	446	exit;
		447	} elsif ( $op eq "batch_list" ) {
		448	# Do not remove, it prevents us falling through to the 'else'
		449	} elsif ( $op eq "batch_create" ) {
		450	# Do not remove, it prevents us falling through to the 'else'
412	} else {	451	} else {
413	my $request = Koha::Illrequests->find($params->{illrequest_id});	452	my $request = Koha::Illrequests->find($params->{illrequest_id});
414	my $backend_result = $request->custom_capability($op, $params);	453	my $backend_result = $request->custom_capability($op, $params);
Lines 466-468 sub redirect_to_list { Link Here
466	print $cgi->redirect('/cgi-bin/koha/ill/ill-requests.pl');	505	print $cgi->redirect('/cgi-bin/koha/ill/ill-requests.pl');
467	exit;	506	exit;
468	}	507	}
		508
		509	# Do any of the available backends provide batch requesting
		510	sub have_batch_backends {
		511	my ( $backends ) = @_;
		512
		513	my @have_batch = ();
		514
		515	foreach my $backend(@{$backends}) {
		516	my $can_batch = can_batch($backend);
		517	if ($can_batch) {
		518	push @have_batch, $backend;
		519	}
		520	}
		521	return \@have_batch;
		522	}
		523
		524	# Does a given backend provide batch requests
		525	# FIXME: This should be moved to Koha::Illbackend
		526	sub can_batch {
		527	my ( $backend ) = @_;
		528	my $request = Koha::Illrequest->new->load_backend( $backend );
		529	return $request->_backend_capability( 'provides_batch_requests' );
		530	}
		531
		532	# Get available metadata enrichment plugins
		533	sub get_metadata_enrichment {
		534	my @candidates = Koha::Plugins->new()->GetPlugins({
		535	method => 'provides_api'
		536	});
		537	my @services = ();
		538	foreach my $plugin(@candidates) {
		539	my $supported = $plugin->provides_api();
		540	if ($supported->{type} eq 'search') {
		541	push @services, $supported;
		542	}
		543	}
		544	return \@services;
		545	}
		546
		547	# Get ILL availability plugins that can help us with the batch identifier types
		548	# we support
		549	sub get_ill_availability {
		550	my ( $services ) = @_;
		551
		552	my $id_types = {};
		553	foreach my $service(@{$services}) {
		554	foreach my $id_supported(keys %{$service->{identifiers_supported}}) {
		555	$id_types->{$id_supported} = 1;
		556	}
		557	}
		558
		559	my $availability = Koha::Illrequest::Workflow::Availability->new($id_types);
		560	return $availability->get_services({
		561	ui_context => 'staff'
		562	});
		563	}

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc (+97 lines)
		1	<div id="ill-batch-details" style="display:none"></div>
		2	<div id="ill-batch-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="ill-batch-modal-label" aria-hidden="true">
		3	<div class="modal-dialog modal-lg">
		4	<div class="modal-content">
		5	<div class="modal-header">
		6	<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
		7	<h3 id="ill-batch-modal-label"></h3>
		8	</div>
		9	<div class="modal-body">
		10	<div id="batch-form">
		11	<form id="new-batch-form">
		12	<fieldset class="rows">
		13	<legend id="legend">Batch details</legend>
		14	<ol>
		15	<li id="batch_name">
		16	<label class="required" for="name">Batch name:</label>
		17	<input type="text" autocomplete="off" name="name" id="name" type="text"
		18	value="" />
		19	</li>
		20	<li id="batch_patron">
		21	<label class="required" for="batchcardnumber">Card number, username or surname:</label>
		22	<input type="text" autocomplete="off" name="batchcardnumber" id="batchcardnumber" type="text" value="" />
		23	<span id="patron_link"></span>
		24	</li>
		25	<li id="batch_branch">
		26	<label class="required" for="branchcode">Library:</label>
		27	<select id="branchcode" name="branchcode">
		28	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
		29	</select>
		30	</li>
		31	<li id="batch_statuscode" style="display:none">
		32	<label class="required" for="statuscode">Status:</label>
		33	<select id="statuscode" name="statuscode"></select>
		34	</li>
		35	</ol>
		36	</fieldset>
		37	<fieldset id="add_batch_items" class="rows" style="display:none">
		38	<legend id="legend">Add batch items</legend>
		39	<div id="textarea-metadata">
		40	<div id="supported">Supported identifiers: <span id="supported_identifiers"></span></div>
		41	<div id="row_count">Row count: <span id="row_count_value"></span></div>
		42	</div>
		43	<div id="textarea-errors" style="display:none" class="error">
		44	<div id="duplicates" style="display:none">The following duplicates were found, these have been de-duplicated: <span id="dupelist"></span></div>
		45	<div id="badidentifiers" style="display:none">The following unknown identifiers were found, it was not possible to establish their type: <span id="badids"></span></div>
		46	</div>
		47	<ol>
		48	<li>
		49	<textarea id="identifiers_input" placeholder="Enter identifiers, one per line"></textarea>
		50	</li>
		51	<li id="process-button">
		52	<button id="process_button" disabled aria-disabled="true" type="button">Process identifiers</button>
		53	</li>
		54	</ol>
		55	</fieldset>
		56	</form>
		57	<div id="create-progress" class="alert alert-info" role="alert" style="display:none">
		58	<span id="progress-label"><strong></strong></span> -
		59	Items processed: <span id="processed_count">0</span> out of <span id="processed_total">0</span>.
		60	Items failed: <span id="processed_failed">0</span>.
		61	<div class="progress">
		62	<div id="processed_progress_bar" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;">
		63	0%
		64	</div>
65	</div>
66	</div>
67	<table id="identifier-table" style="display:none">
68	<thead>
69	<tr id="identifier-table-header">
70	<th scope="col">Identifier type</th>
71	<th scope="col">Identifier value</th>
72	<th scope="col">Metadata</th>
73	<th scope="col">Request ID</th>
74	<th scope="col">Request Status</th>
75	<th scope="col"></th>
76	</tr>
77	</thead>
78	<tbody id="identifier-table-body">
79	</tbody>
80	</table>
81	</div>
82	<div id="create-requests" style="display:none">
83	<button id="create-requests-button" type="button" class="btn btn-primary" aria-label="Add items to batch">Add items to batch</button>
84	</div>
85	</div>
86	<div class="modal-footer">
87	<div id="lhs">
88	<button class="btn btn-default" data-dismiss="modal" aria-hidden="false">Cancel</button>
89	</div>
90	<div id="rhs">
91	<button id="button_create_batch" class="btn btn-default" aria-hidden="true" disabled>Continue</button>
92	<button id="button_finish" disabled type="button" class="btn btn-default" aria-hidden="true">Finish and view batch</button>
93	</div>
94	</div>
95	</div>
96	</div>
97	</div>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch.inc (+19 lines)
	1	[% IF query_type == "batch_list" %]
	2	<div>
	3	<table id="ill-batch-requests">
	4	<thead>
	5	<tr id="ill-batch-header">
	6	<th scope="col">Batch ID</th>
	7	<th scope="col">Name</th>
	8	<th scope="col">Number of requests</th>
	9	<th scope="col">Status</th>
	10	<th scope="col">Patron</th>
	11	<th scope="col">Branch</th>
	12	<th scope="col"></th>
	13	</tr>
	14	</thead>
	15	<tbody id="ill-batch-body">
	16	</tbody>
	17	</table>
	18	</div>
	19	[% END %]

Lines 1-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc (-2 / +19 lines)
1	[% INCLUDE 'blocking_errors.inc' %]	1	[% INCLUDE 'blocking_errors.inc' %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% IF Koha.Preference('ILLModule ') && CAN_user_ill %]	3	[% IF Koha.Preference('ILLModule') && CAN_user_ill %]
4	<div id="toolbar" class="btn-toolbar">	4	<div id="toolbar" class="btn-toolbar ill-toolbar">
5	[% IF backends_available %]	5	[% IF backends_available %]
6	[% IF backends.size > 1 %]	6	[% IF backends.size > 1 %]
7	<div class="dropdown btn-group">	7	<div class="dropdown btn-group">
Lines 33-37 Link Here
33	<i class="fa fa-list"></i> List requests	33	<i class="fa fa-list"></i> List requests
34	</a>	34	</a>
35	[% END %]	35	[% END %]
		36	[% IF have_batch.size > 0 && metadata_enrichment_services %]
		37	<div id="ill-batch">
		38	<div class="dropdown btn-group">
		39	<button class="btn btn-default dropdown-toggle" type="button" id="ill-batch-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
		40	<i class="fa fa-plus"></i> New ILL batch request <span class="caret"></span>
		41	</button>
		42	<ul class="dropdown-menu" aria-labelledby="ill-batch-backend-dropdown">
		43	[% FOREACH backend IN have_batch %]
		44	<li><a href="#" role="button" onclick="window.openBatchModal(null, '[% backend \| html %]')">[% backend \| html %]</a></li>
		45	[% END %]
		46	</ul>
		47	</div>
		48	<a class="btn btn-default" type="button" href="/cgi-bin/koha/ill/ill-requests.pl?method=batch_list" %]">
		49	<i class="fa fa-tasks"></i> Batch requests</span>
		50	</a>
		51	</div>
		52	[% END %]
36	</div>	53	</div>
37	[% END %]	54	[% END %]

Lines 124-129 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-1 / +51 lines)
124	<div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a></div>	124	<div class="dialog message">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl#sysinfo_panel">about page</a></div>
125	[% ELSE %]	125	[% ELSE %]
126	[% INCLUDE 'ill-toolbar.inc' %]	126	[% INCLUDE 'ill-toolbar.inc' %]
		127	[% INCLUDE 'ill-batch-modal.inc' %]
127		128
128	[% IF whole.error %]	129	[% IF whole.error %]
129	<h1>Error performing operation</h1>	130	<h1>Error performing operation</h1>
Lines 437-442 Link Here
437	[% END %]	438	[% END %]
438	</select>	439	</select>
439	</li>	440	</li>
		441	[% IF batches.count > 0 %]
		442	<li class="batch">
		443	<label class="batch_label">Batch:</label>
		444	<select id="batch_id" name="batch_id">
		445	<option value="">
		446	[% FOREACH batch IN batches %]
		447	[% IF batch.id == request.batch_id %]
		448	<option value="[% batch.id \| html %]" selected>
		449	[% ELSE %]
		450	<option value="[% batch.id \| html %]">
		451	[% END %]
		452	[% batch.name \| html %]
		453	</option>
		454	[% END %]
		455	</select>
		456	</li>
		457	[% END %]
440	<li class="updated">	458	<li class="updated">
441	<label class="updated">Last updated:</label>	459	<label class="updated">Last updated:</label>
442	[% request.updated \| $KohaDates with_hours => 1 %]	460	[% request.updated \| $KohaDates with_hours => 1 %]
Lines 648-653 Link Here
648	[% END %]	666	[% END %]
649	[% END %]	667	[% END %]
650	</li>	668	</li>
		669	[% IF request.batch > 0 %]
		670	<li class="batch">
		671	<span class="label batch">Batch:</span>
		672	<a href="/cgi-bin/koha/ill/ill-requests.pl?batch_id=[% request.batch.id \| html %]">
		673	[% request.batch.name \| html %]
		674	</a>
		675	</li>
		676	[% END %]
651	<li class="updated">	677	<li class="updated">
652	<span class="label updated">Last updated:</span>	678	<span class="label updated">Last updated:</span>
653	[% request.updated \| $KohaDates with_hours => 1 %]	679	[% request.updated \| $KohaDates with_hours => 1 %]
Lines 779-785 Link Here
779		805
780	[% ELSIF query_type == 'illlist' %]	806	[% ELSIF query_type == 'illlist' %]
781	<!-- illlist -->	807	<!-- illlist -->
782	<h1>View ILL requests</h1>	808	<h1>
		809	View ILL requests
		810	[% IF batch %]
		811	for batch "[% batch.name \| html %]"
		812	[% END %]
		813	</h1>
783	<div id="results" class="page-section">	814	<div id="results" class="page-section">
784	<h2>Details for all requests</h2>	815	<h2>Details for all requests</h2>
785	[% INCLUDE 'ill-list-table.inc' %]	816	[% INCLUDE 'ill-list-table.inc' %]
Lines 858-863 Link Here
858	</fieldset>	889	</fieldset>
859	</form>	890	</form>
860	</div>	891	</div>
		892	[% ELSIF query_type == 'batch_list' \|\| query_type == 'batch_create' %]
		893	[% INCLUDE 'ill-batch.inc' %]
861	[% ELSE %]	894	[% ELSE %]
862	<!-- Custom Backend Action -->	895	<!-- Custom Backend Action -->
863	[% PROCESS $whole.template %]	896	[% PROCESS $whole.template %]
Lines 877-882 Link Here
877	[% INCLUDE 'columns_settings.inc' %]	910	[% INCLUDE 'columns_settings.inc' %]
878	[% INCLUDE 'calendar.inc' %]	911	[% INCLUDE 'calendar.inc' %]
879	[% INCLUDE 'select2.inc' %]	912	[% INCLUDE 'select2.inc' %]
		913	[% IF metadata_enrichment_services %]
		914	<script>
		915	var metadata_enrichment_services = [% metadata_enrichment_services \| $raw %];
		916	</script>
		917	<script>
		918	[% IF batch_availability_services %]
		919	var batch_availability_services = [% batch_availability_services \| $raw %];
		920	[% ELSE %]
		921	var batch_availability_services = [];
		922	[% END %]
		923	</script>
		924	[% END %]
880	<script>	925	<script>
881	var prefilters = '[% prefilters \| $raw %]';	926	var prefilters = '[% prefilters \| $raw %]';
882	// Set column settings	927	// Set column settings
Lines 901-907 Link Here
901	});	946	});
902	</script>	947	</script>
903	[% INCLUDE 'ill-list-table-strings.inc' %]	948	[% INCLUDE 'ill-list-table-strings.inc' %]
		949	[% INCLUDE 'ill-batch-table-strings.inc' %]
		950	[% INCLUDE 'ill-batch-modal-strings.inc' %]
904	[% Asset.js("js/ill-list-table.js") \| $raw %]	951	[% Asset.js("js/ill-list-table.js") \| $raw %]
		952	[% Asset.js("js/ill-batch.js") \| $raw %]
		953	[% Asset.js("js/ill-batch-table.js") \| $raw %]
		954	[% Asset.js("js/ill-batch-modal.js") \| $raw %]
905	[% IF (query_type == 'availability' \|\| query_type == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %]	955	[% IF (query_type == 'availability' \|\| query_type == 'generic_confirm') && Koha.Preference('ILLCheckAvailability') %]
906	[% Asset.js("js/ill-availability.js") \| $raw %]	956	[% Asset.js("js/ill-availability.js") \| $raw %]
907	[% END %]	957	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-table.js (+216 lines)
		1	(function () {
		2	var table;
		3	var batchesProxy;
		4
		5	window.addEventListener('load', onload);
		6
		7	function onload() {
		8	// Only proceed if appropriate
		9	if (!document.getElementById('ill-batch-requests')) return;
		10
		11	// A proxy that will give us some element of reactivity to
		12	// changes in our list of batches
		13	batchesProxy = new Proxy(
		14	{ data: [] },
		15	{
		16	get: function (obj, prop) {
		17	return obj[prop];
		18	},
		19	set: function (obj, prop, value) {
		20	obj[prop] = value;
		21	updateTable();
		22	}
		23	}
		24	);
		25
		26	// Initialise the Datatable, binding it to our proxy object
		27	table = initTable();
		28
		29	// Do the initial data population
		30	window.doBatchApiRequest()
		31	.then(function (response) {
		32	return response.json();
		33	})
		34	.then(function (data) {
		35	batchesProxy.data = data;
		36	});
		37
		38	// Clean up any event listeners we added
		39	window.addEventListener('beforeunload', removeEventListeners);
		40	};
		41
		42	// Initialise the Datatable
		43	// FIXME: This should be a kohaTable not KohaTable
		44	var initTable = function () {
		45	return KohaTable("ill-batch-requests", {
		46	data: batchesProxy.data,
		47	columns: [
		48	{
		49	data: 'id',
		50	width: '10%'
		51	},
		52	{
		53	data: 'name',
		54	render: createName,
		55	width: '30%'
		56	},
		57	{
		58	data: 'requests_count',
		59	width: '10%'
		60	},
		61	{
		62	data: 'status',
		63	render: createStatus,
		64	width: '10%'
65	},
66	{
67	data: 'patron',
68	render: createPatronLink,
69	width: '10%'
70	},
71	{
72	data: 'branch',
73	render: createBranch,
74	width: '20%'
75	},
76	{
77	render: createActions,
78	width: '10%',
79	orderable: false
80	}
81	],
82	processing: true,
83	deferRender: true,
84	drawCallback: addEventListeners
85	});
86	}
87
88	// A render function for branch name
89	var createBranch = function (data) {
90	return data.branchname;
91	};
92
93	// A render function for batch name
94	var createName = function (x, y, data) {
95	var a = document.createElement('a');
96	a.setAttribute('href', '/cgi-bin/koha/ill/ill-requests.pl?batch_id=' + data.id);
97	a.setAttribute('title', data.name);
98	a.textContent = data.name;
99	return a.outerHTML;
100	};
101
102	// A render function for batch status
103	var createStatus = function (x, y, data) {
104	return data.status.name;
105	};
106
107	// A render function for our patron link
108	var createPatronLink = function (data) {
109	var link = document.createElement('a');
110	link.setAttribute('title', ill_batch_borrower_details);
111	link.setAttribute('href', '/cgi-bin/koha/members/moremember.pl?borrowernumber=' + data.borrowernumber);
112	var displayText = [data.firstname, data.surname].join(' ') + ' ( ' + data.cardnumber + ' )';
113	link.appendChild(document.createTextNode(displayText));
114
115	return link.outerHTML;
116	};
117
118	// A render function for our row action buttons
119	var createActions = function (data, type, row) {
120	var div = document.createElement('div');
121	div.setAttribute('class', 'action-buttons');
122
123	var editButton = document.createElement('button');
124	editButton.setAttribute('type', 'button');
125	editButton.setAttribute('class', 'editButton btn btn-xs btn-default');
126	editButton.setAttribute('data-batch-id', row.id);
127	editButton.appendChild(document.createTextNode(ill_batch_edit));
128
129	var deleteButton = document.createElement('button');
130	deleteButton.setAttribute('type', 'button');
131	deleteButton.setAttribute('class', 'deleteButton btn btn-xs btn-danger');
132	deleteButton.setAttribute('data-batch-id', row.id);
133	deleteButton.appendChild(document.createTextNode(ill_batch_delete));
134
135	div.appendChild(editButton);
136	div.appendChild(deleteButton);
137
138	return div.outerHTML;
139	};
140
141	// Add event listeners to our row action buttons
142	var addEventListeners = function () {
143	var del = document.querySelectorAll('.deleteButton');
144	del.forEach(function (el) {
145	el.addEventListener('click', handleDeleteClick);
146	});
147
148	var edit = document.querySelectorAll('.editButton');
149	edit.forEach(function (elEdit) {
150	elEdit.addEventListener('click', handleEditClick);
151	});
152	};
153
154	// Remove all added event listeners
155	var removeEventListeners = function () {
156	var del = document.querySelectorAll('.deleteButton');
157	del.forEach(function (el) {
158	el.removeEventListener('click', handleDeleteClick);
159	});
160	window.removeEventListener('load', onload);
161	window.removeEventListener('beforeunload', removeEventListeners);
162	};
163
164	// Handle "Delete" clicks
165	var handleDeleteClick = function(e) {
166	var el = e.srcElement;
167	if (confirm(ill_batch_confirm_delete)) {
168	deleteBatch(el);
169	}
170	};
171
172	// Handle "Edit" clicks
173	var handleEditClick = function(e) {
174	var el = e.srcElement;
175	var id = el.dataset.batchId;
176	window.openBatchModal(id);
177	};
178
179	// Delete a batch
180	// - Make the API call
181	// - Handle errors
182	// - Update our proxy data
183	var deleteBatch = function (el) {
184	var id = el.dataset.batchId;
185	doBatchApiRequest(
186	'/' + id,
187	{ method: 'DELETE' }
188	)
189	.then(function (response) {
190	if (!response.ok) {
191	window.handleApiError(ill_batch_delete_fail);
192	} else {
193	removeBatch(el.dataset.batchId);
194	}
195	})
196	.catch(function (response) {
197	window.handleApiError(ill_batch_delete_fail);
198	})
199	};
200
201	// Remove a batch from our proxy data
202	var removeBatch = function(id) {
203	batchesProxy.data = batchesProxy.data.filter(function (batch) {
204	return batch.id != id;
205	});
206	};
207
208	// Redraw the table
209	var updateTable = function () {
210	table.api()
211	.clear()
212	.rows.add(batchesProxy.data)
213	.draw();
214	};
215
216	})();

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/ill-batch.js (+49 lines)
	1	(function () {
	2	// Enable the modal to be opened from anywhere
	3	// If we're working with an existing batch, set the ID so the
	4	// modal can access it
	5	window.openBatchModal = function (id, backend) {
	6	var idEl = document.getElementById('ill-batch-details');
	7	idEl.dataset.backend = backend;
	8	if (id) {
	9	idEl.dataset.batchId = id;
	10	}
	11	$('#ill-batch-modal').modal({ show: true });
	12	};
	13
	14	// Make a batch API call, returning the resulting promise
	15	window.doBatchApiRequest = function (url, options) {
	16	var batchListApi = '/api/v1/illbatches';
	17	var fullUrl = batchListApi + (url ? url : '');
	18	return doApiRequest(fullUrl, options);
	19	};
	20
	21	// Make a "create local ILL submission" call
	22	window.doCreateSubmission = function (body, options) {
	23	options = Object.assign(
	24	options \|\| {},
	25	{
	26	headers: {
	27	'Content-Type': 'application/json'
	28	},
	29	method: 'POST',
	30	body: JSON.stringify(body)
	31	}
	32	);
	33	return doApiRequest(
	34	'/api/v1/ill/requests',
	35	options
	36	)
	37	}
	38
	39	// Make an API call, returning the resulting promise
	40	window.doApiRequest = function (url, options) {
	41	return fetch(url, options);
	42	};
	43
	44	// Display an API error
	45	window.handleApiError = function (error) {
	46	alert(error);
	47	};
	48
	49	})();