From 4ab51703dd66a8c01bce9b21df831c44f7bf5728 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 26 Oct 2017 21:43:15 +0000 Subject: [PATCH] Bug 19532: Some module fixes Removing files related to OldRecall --- Koha/Old/Recall.pm | 51 -------- Koha/Old/Recalls.pm | 60 ---------- Koha/Schema/Result/OldRecall.pm | 260 ---------------------------------------- Koha/Schema/Result/Recall.pm | 15 ++- 4 files changed, 11 insertions(+), 375 deletions(-) delete mode 100644 Koha/Old/Recall.pm delete mode 100644 Koha/Old/Recalls.pm delete mode 100644 Koha/Schema/Result/OldRecall.pm diff --git a/Koha/Old/Recall.pm b/Koha/Old/Recall.pm deleted file mode 100644 index 38af2e7..0000000 --- a/Koha/Old/Recall.pm +++ /dev/null @@ -1,51 +0,0 @@ -package Koha::Old::Recall; - -# Copyright 2017 Aleisha Amohia -# -# 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, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use Modern::Perl; - -use Koha::Database; - -use base qw( Koha::Object ); - -=head1 NAME - -Koha::Old::Recall - Koha Old Recall Object class - -=head1 API - -=head2 Class Methods - -=cut - -=head3 type - -=cut - -sub type { - return 'OldRecall'; -} - -=head1 AUTHOR - -Aleisha Amohia -Catalyst IT - -=cut - -1; diff --git a/Koha/Old/Recalls.pm b/Koha/Old/Recalls.pm deleted file mode 100644 index 2834c15..0000000 --- a/Koha/Old/Recalls.pm +++ /dev/null @@ -1,60 +0,0 @@ -package Koha::Old::Recalls; - -# Copyright 2017 Aleisha Amohia -# -# 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, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use Modern::Perl; - -use Koha::Database; -use Koha::Old::Recall; - -use base qw( Koha::Objects ); - -=head1 NAME - -Koha::Old::Recalls - Koha Old Recalls Object Set class - -=head1 API - -=head2 Class Methods - -=cut - -=head3 type - -=cut - -sub type { - return 'OldRecall'; -} - -=head3 object_class - -=cut - -sub object_class { - return 'Koha::Old::Recall'; -} - -=head1 AUTHOR - -Aleisha Amohia -Catalyst IT - -=cut - -1; diff --git a/Koha/Schema/Result/OldRecall.pm b/Koha/Schema/Result/OldRecall.pm deleted file mode 100644 index e8de463..0000000 --- a/Koha/Schema/Result/OldRecall.pm +++ /dev/null @@ -1,260 +0,0 @@ -use utf8; -package Koha::Schema::Result::OldRecall; - -# Created by DBIx::Class::Schema::Loader -# DO NOT MODIFY THE FIRST PART OF THIS FILE - -=head1 NAME - -Koha::Schema::Result::OldRecall - -=cut - -use strict; -use warnings; - -use base 'DBIx::Class::Core'; - -=head1 TABLE: C - -=cut - -__PACKAGE__->table("old_recalls"); - -=head1 ACCESSORS - -=head2 recall_id - - data_type: 'integer' - is_auto_increment: 1 - is_nullable: 0 - -=head2 borrowernumber - - data_type: 'integer' - default_value: 0 - is_foreign_key: 1 - is_nullable: 1 - -=head2 recalldate - - data_type: 'date' - datetime_undef_if_invalid: 1 - is_nullable: 1 - -=head2 biblionumber - - data_type: 'integer' - default_value: 0 - is_foreign_key: 1 - is_nullable: 1 - -=head2 branchcode - - data_type: 'varchar' - is_nullable: 1 - size: 10 - -=head2 cancellationdate - - data_type: 'date' - datetime_undef_if_invalid: 1 - is_nullable: 1 - -=head2 recallnotes - - data_type: 'mediumtext' - is_nullable: 1 - -=head2 priority - - data_type: 'smallint' - is_nullable: 1 - -=head2 found - - data_type: 'varchar' - is_nullable: 1 - size: 1 - -=head2 timestamp - - data_type: 'timestamp' - datetime_undef_if_invalid: 1 - default_value: current_timestamp - is_nullable: 0 - -=head2 itemnumber - - data_type: 'integer' - is_foreign_key: 1 - is_nullable: 1 - -=head2 waitingdate - - data_type: 'date' - datetime_undef_if_invalid: 1 - is_nullable: 1 - -=head2 expirationdate - - data_type: 'date' - datetime_undef_if_invalid: 1 - is_nullable: 1 - -=head2 itemtype - - data_type: 'varchar' - is_foreign_key: 1 - is_nullable: 1 - size: 10 - -=cut - -__PACKAGE__->add_columns( - "recall_id", - { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, - "borrowernumber", - { - data_type => "integer", - default_value => 0, - is_foreign_key => 1, - is_nullable => 1, - }, - "recalldate", - { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, - "biblionumber", - { - data_type => "integer", - default_value => 0, - is_foreign_key => 1, - is_nullable => 1, - }, - "branchcode", - { data_type => "varchar", is_nullable => 1, size => 10 }, - "cancellationdate", - { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, - "recallnotes", - { data_type => "mediumtext", is_nullable => 1 }, - "priority", - { data_type => "smallint", is_nullable => 1 }, - "found", - { data_type => "varchar", is_nullable => 1, size => 1 }, - "timestamp", - { - data_type => "timestamp", - datetime_undef_if_invalid => 1, - default_value => \"current_timestamp", - is_nullable => 0, - }, - "itemnumber", - { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, - "waitingdate", - { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, - "expirationdate", - { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, - "itemtype", - { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, -); - -=head1 PRIMARY KEY - -=over 4 - -=item * L - -=back - -=cut - -__PACKAGE__->set_primary_key("recall_id"); - -=head1 RELATIONS - -=head2 biblionumber - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "biblionumber", - "Koha::Schema::Result::Biblio", - { biblionumber => "biblionumber" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "SET NULL", - on_update => "SET NULL", - }, -); - -=head2 borrowernumber - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "borrowernumber", - "Koha::Schema::Result::Borrower", - { borrowernumber => "borrowernumber" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "SET NULL", - on_update => "SET NULL", - }, -); - -=head2 itemnumber - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "itemnumber", - "Koha::Schema::Result::Item", - { itemnumber => "itemnumber" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "SET NULL", - on_update => "SET NULL", - }, -); - -=head2 itemtype - -Type: belongs_to - -Related object: L - -=cut - -__PACKAGE__->belongs_to( - "itemtype", - "Koha::Schema::Result::Itemtype", - { itemtype => "itemtype" }, - { - is_deferrable => 1, - join_type => "LEFT", - on_delete => "SET NULL", - on_update => "SET NULL", - }, -); - - -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-10-25 23:50:29 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:afOsAbeAPcdHR79LfYH9Hg - - -# You can replace this text with custom code or comments, and it will be preserved on regeneration -1; diff --git a/Koha/Schema/Result/Recall.pm b/Koha/Schema/Result/Recall.pm index 361f888..668084a 100644 --- a/Koha/Schema/Result/Recall.pm +++ b/Koha/Schema/Result/Recall.pm @@ -72,7 +72,7 @@ __PACKAGE__->table("recalls"); data_type: 'smallint' is_nullable: 1 -=head2 found +=head2 status data_type: 'varchar' is_nullable: 1 @@ -110,6 +110,11 @@ __PACKAGE__->table("recalls"); is_nullable: 1 size: 10 +=head2 old + + data_type: 'integer' + is_nullable: 1 + =cut __PACKAGE__->add_columns( @@ -139,7 +144,7 @@ __PACKAGE__->add_columns( { data_type => "mediumtext", is_nullable => 1 }, "priority", { data_type => "smallint", is_nullable => 1 }, - "found", + "status", { data_type => "varchar", is_nullable => 1, size => 1 }, "timestamp", { @@ -156,6 +161,8 @@ __PACKAGE__->add_columns( { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 }, "itemtype", { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 }, + "old", + { data_type => "integer", is_nullable => 1 }, ); =head1 PRIMARY KEY @@ -263,8 +270,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-10-25 23:50:29 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0dtkOcX0Cuc8MdpKxhcPUA +# Created by DBIx::Class::Schema::Loader v0.07042 @ 2017-10-26 21:41:54 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xfJWg4QPl54jccP/p991LA # You can replace this text with custom code or comments, and it will be preserved on regeneration -- 2.1.4