Bugzilla – Attachment 81666 Details for
Bug 19532
Recalls for Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19532: UseRecalls syspref
Bug-19532-UseRecalls-syspref.patch (text/plain), 20.16 KB, created by
Martin Renvoize (ashimema)
on 2018-10-31 07:22:46 UTC
(
hide
)
Description:
Bug 19532: UseRecalls syspref
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-10-31 07:22:46 UTC
Size:
20.16 KB
patch
obsolete
>From d3b1a05f5641bcb6595ac13e78f4fec706cbd243 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Mon, 20 Nov 2017 02:12:08 +0000 >Subject: [PATCH] Bug 19532: UseRecalls syspref > >This patch adds a syspref to control the usability of the recalls >feature > >Test the following: > >Staff side >/includes/circ-menu.inc >/includes/circ-nav.inc >/includes/members-menu.inc >/admin/preferences/circulation.pref >/circ/circulation-home.tt >/circ/circulation.tt >/circ/recalls_overdue.tt >/circ/recalls_queue.tt >/circ/recalls_waiting.tt >/members/moremember.tt >/members/recallshistory.tt > >OPAC >/includes/usermenu.inc >/opac-recall.tt >/opac-recalls.tt >/opac-user.tt >/members/recallshistory.pl >/opac/opac-detail.pl > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > .../bug_19532_-_add_Recalls_syspref.sql | 1 + > installer/data/mysql/sysprefs.sql | 1 + > .../prog/en/includes/circ-menu.inc | 6 ++-- > .../prog/en/includes/circ-nav.inc | 8 +++-- > .../admin/preferences/circulation.pref | 17 +++++++--- > .../prog/en/modules/circ/circulation.tt | 4 +-- > .../prog/en/modules/circ/recalls_overdue.tt | 4 +++ > .../prog/en/modules/circ/recalls_queue.tt | 32 ++++++++----------- > .../prog/en/modules/circ/recalls_waiting.tt | 5 ++- > .../prog/en/modules/members/moremember.tt | 5 ++- > .../prog/en/modules/members/recallshistory.tt | 10 ++++-- > .../bootstrap/en/includes/usermenu.inc | 12 ++++--- > .../bootstrap/en/modules/opac-recall.tt | 4 +++ > .../bootstrap/en/modules/opac-recalls.tt | 4 +++ > .../bootstrap/en/modules/opac-user.tt | 4 +-- > members/recallshistory.pl | 24 ++++++++++++-- > 16 files changed, 97 insertions(+), 44 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql > >diff --git a/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql b/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql >new file mode 100644 >index 0000000000..43813957de >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_19532_-_add_Recalls_syspref.sql >@@ -0,0 +1 @@ >+INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UseRecalls','1',NULL,'Enable or disable recalls','YesNo'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 5ab4c0ecd5..bb65bb856a 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -611,6 +611,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('UseICU','0','1','Tell Koha if ICU indexing is in use for Zebra or not.','YesNo'), > ('UseKohaPlugins','0','','Enable or disable the ability to use Koha Plugins.','YesNo'), > ('UseQueryParser','0',NULL,'If enabled, try to use QueryParser for queries.','YesNo'), >+('UseRecalls', '1', NULL, 'Enable or disable recalls', 'YesNo'), > ('UseTransportCostMatrix','0','','Use Transport Cost Matrix when filling holds','YesNo'), > ('UseWYSIWYGinSystemPreferences','0','','Show WYSIWYG editor when editing certain HTML system preferences.','YesNo'), > ('viewISBD','1','','Allow display of ISBD view of bibiographic records','YesNo'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index 356b304d03..0bdb67b7b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -124,6 +124,8 @@ > [% IF Koha.Preference('ILLModule') && CAN_user_ill %] > <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">Interlibrary loans</a></li> > [% END %] >- <li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li> >-</ul></div> >+ [% IF Koha.Preference('UseRecalls') %] >+ <li><a href="/cgi-bin/koha/members/recallshistory.pl">Recalls history</a></li> >+ [% END %] >+ </ul></div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >index 17be2aee81..32c499612e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -39,9 +39,11 @@ > [% IF Koha.Preference('OnSiteCheckouts') %] > <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li> > [% END %] >- <li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li> >- <li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li> >- <li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li> >+ [% IF Koha.Preference('UseRecalls') %] >+ <li><a href="/cgi-bin/koha/circ/recalls_queue.pl">Recalls queue</a></li> >+ <li><a href="/cgi-bin/koha/circ/recalls_overdue.pl">Overdue recalls</a></li> >+ <li><a href="/cgi-bin/koha/circ/recalls_waiting.pl">Recalls awaiting pickup</a></li> >+ [% END %] > </ul> > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 8794461f2b..068e037656 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -159,11 +159,6 @@ Circulation: > - patrons to submit notes about checked out items. > > Checkout Policy: >- - >- - Mark a recall as problematic if it has been waiting to be picked up for >- - pref: RecallsMaxPickUpDelay >- - class: integer >- - days. > - > - pref: AllowTooManyOverride > choices: >@@ -955,6 +950,18 @@ Circulation: > yes: Enable > no: Disable > - "housebound module" >+ Recalls: >+ - >+ - pref: UseRecalls >+ choices: >+ yes: Use >+ no: "Don't use" >+ - recalls >+ - >+ - Mark a recall as problematic if it has been waiting to be picked up for >+ - pref: RecallsMaxPickupDelay >+ - class: integer >+ - days. > Stockrotation module: > - > - pref: StockRotation >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 2a5d5dc55c..6e2f62fc66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -819,7 +819,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% END %] > </li> > >- [% IF recalls.count %] >+ [% IF Koha.Preference('UseRecalls') && recalls.count %] > <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li> > [% END %] > >@@ -934,7 +934,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% END %] > </div> <!-- reservesloop --> > >-[% IF recalls.count %] >+[% IF Koha.Preference('UseRecalls') && recalls.count %] > [% INCLUDE 'recalls.inc' %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt >index 494cfdce1b..76828e5f08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt >@@ -28,6 +28,7 @@ > > <h1>Overdue recalls</h1> > >+ [% IF Koha.Preference('UseRecalls') %] > [% IF recalls.count %] > > <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl"> >@@ -102,6 +103,9 @@ > <div class="dialog message">There are no overdue recalls.</div> > > [% END %] >+ [% ELSE %] >+ <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div> >+ [% END %] > > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt >index 5d28ac11af..b037bbfdf7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt >@@ -27,25 +27,21 @@ > <div class="yui-g"> > > <h1>Recalls queue</h1> >- >- [% IF recalls.count %] >- >- <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl"> >- <input type="hidden" name="op" value="cancel_multiple_recalls"> >- >- <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span> >- >- [% INCLUDE 'recalls-reports.inc' %] >- >- <fieldset class="action"> >- <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button> >- </fieldset> >- </form> >- >+ [% IF Koha.Preference('UseRecalls') %] >+ [% IF recalls.count %] >+ <form method="post" action="/cgi-bin/koha/circ/recalls_queue.pl"> >+ <input type="hidden" name="op" value="cancel_multiple_recalls"> >+ <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span> >+ [% INCLUDE 'recalls-reports.inc' %] >+ <fieldset class="action"> >+ <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button> >+ </fieldset> >+ </form> >+ [% ELSE %] >+ <div class="dialog message">No recalls have been made.</div> >+ [% END %] > [% ELSE %] >- >- <div class="dialog message">No recalls have been made.</div> >- >+ <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div> > [% END %] > > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt >index ddd0bd2f65..6a061bfb55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt >@@ -39,7 +39,7 @@ > <div class="yui-g"> > > <h1>Recalls awaiting pickup</h1> >- >+ [% IF Koha.Preference('UseRecalls') %] > [% IF recalls.size > 0 %] > > <div id="results" class="toptabs"> >@@ -152,6 +152,9 @@ > > [% END %] > >+ [% ELSE %] >+ <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div> >+ [% END %] > </div> > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index e7a155b999..990b8f94ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -661,6 +661,9 @@ > [% END %] > </li> > [% END %] >+ [% IF Koha.Preference('UseRecalls') && recalls.count %] >+ <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li> >+ [% END %] > [% IF Koha.Preference('ArticleRequests') %] > <li> > <a href="#article-requests" id="article-requests-tab"> [% patron.article_requests_current.count | html %] Article requests</a> >@@ -777,7 +780,7 @@ > [% END %] > </div> [% # /div#reserves %] > [% END %] >- [% IF recalls %] >+ [% IF Koha.Preferernce('UseRecalls') && recalls %] > [% INCLUDE 'recalls.inc' %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >index a7ee266d3e..1a2b14aab1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >@@ -1,7 +1,7 @@ > [% USE KohaDates %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Recalls history for [% patron.firstname %] [% patron.surname %]</title> >+<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >@@ -14,7 +14,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › >- Recalls history for [% patron.firstname %] [% patron.surname %] >+ Recalls history for [% INCLUDE 'patron-title.inc' %] > </div> > > <div id="doc3" class="yui-t2"> >@@ -26,7 +26,11 @@ > > <h1>Recalls history</h1> > >- [% INCLUDE 'recalls.inc' %] >+ [% IF Koha.Preference('UseRecalls') %] >+ [% INCLUDE 'recalls.inc' %] >+ [% ELSE %] >+ <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div> >+ [% END %] > > </div> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc >index cb69b39591..c8de28afc6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc >@@ -131,12 +131,14 @@ > <a href="/cgi-bin/koha/opac-illrequests.pl">your interlibrary loan requests</a></li> > [% END %] > >- [% IF ( recallsview ) %] >- <li class="active"> >- [% ELSE %] >- <li> >+ [% IF Koha.Preference('UseRecalls') %] >+ [% IF ( recallsview ) %] >+ <li class="active"> >+ [% ELSE %] >+ <li> >+ [% END %] >+ <a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li> > [% END %] >- <a href="/cgi-bin/koha/opac-recalls.pl">your recalls history</a></li> > </ul> > </div> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >index e5c5805db2..b45d3ec7c8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >@@ -24,6 +24,7 @@ > <div class="span10"> > <div id="discharge" class="maincontainer"> > <h1>Recall an item</h1> >+ [% IF Koha.Preference('UseRecalls') %] > [% IF error %] > <div class="dialog alert"> > [% IF error == 'notloggedin' %] >@@ -52,6 +53,9 @@ > [% END %] > > [% END %] >+ [% ELSE %] >+ Recalls have not been enabled. Please contact your library. >+ [% END %] > </div> <!-- / #discharge --> > </div> <!-- / .span10 --> > </div> <!-- / .row-fluid --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >index cb6e382539..3e206d3497 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >@@ -27,6 +27,7 @@ > > <h2>Recalls history</h2> > >+ [% IF Koha.Preference('UseRecalls') %] > [% IF RECALLS.count %] > <div id="opac-user-recalls"> > <table id="recalls-table" class="table table-bordered table-striped"> >@@ -114,6 +115,9 @@ > </div> > [% END # / # RECALLS.count %] > >+ [% ELSE %] >+ Recalls have not been enabled. Please contact your library. >+ [% END %] > </div> <!-- /#recalls --> > </div> <!-- /.span10 --> > </div> <!-- /.row-fluid --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 855a0ca3fe..fc6cb6e47d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -159,7 +159,7 @@ > [% END %] > > [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a></li>[% END %] >- [% IF ( RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a></li>[% END %] >+ [% IF ( Koha.Preference('UseRecalls') && RECALLS.count ) %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a></li>[% END %] > [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count | html %])</a></li>[% END %] > [% IF ( OverDriveCirculation ) %] > <li><a href="#opac-user-overdrive">OverDrive Account</a></li> >@@ -788,7 +788,7 @@ > </div> <!-- / #opac-user-holds --> > [% END # / #RESERVES.count %] > >- [% IF RECALLS.count %] >+ [% IF Koha.Preference('UseRecalls') && RECALLS.count %] > <div id="opac-user-recalls"> > <table id="recalls-table" class="table table-bordered table-striped"> > <caption>Recalls <span class="count">([% RECALLS.count %])</span></caption> >diff --git a/members/recallshistory.pl b/members/recallshistory.pl >index 3a6bc2f308..4e42529a9a 100755 >--- a/members/recallshistory.pl >+++ b/members/recallshistory.pl >@@ -44,10 +44,30 @@ my $recalls = Koha::Recalls->search({ borrowernumber => $loggedinuser }); > > my $patron = Koha::Patrons->find($loggedinuser); > >+$template->param( picture => 1 ) if $patron->image; >+ > $template->param( > recalls => $recalls, >- patron => $patron, >- recallsview => 1 >+ recallsview => 1, >+ borrowernumber => $loggedinuser, >+ title => $patron->title, >+ initials => $patron->initials, >+ surname => $patron->surname, >+ firstname => $patron->firstname, >+ cardnumber => $patron->cardnumber, >+ categorycode => $patron->categorycode, >+ category_type => $patron->category->category_type, >+ categoryname => $patron->category->description, >+ address => $patron->address, >+ streetnumber => $patron->streetnumber, >+ streettype => $patron->streettype, >+ address2 => $patron->address2, >+ city => $patron->city, >+ zipcode => $patron->zipcode, >+ country => $patron->country, >+ phone => $patron->phone, >+ email => $patron->email, >+ branchcode => $patron->branchcode > ); > > output_html_with_http_headers $input, $cookie, $template->output; >-- >2.19.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19532
:
68569
|
68570
|
68571
|
68572
|
68642
|
68643
|
68644
|
68645
|
68653
|
69100
|
69102
|
69147
|
69148
|
69149
|
69170
|
69172
|
69221
|
69222
|
69223
|
69322
|
69353
|
69354
|
69405
|
69409
|
69410
|
69411
|
69841
|
69872
|
69873
|
69874
|
69875
|
69876
|
69877
|
69878
|
69879
|
69880
|
69881
|
69882
|
69883
|
69884
|
69885
|
69886
|
69887
|
69888
|
69889
|
69890
|
69986
|
70093
|
71409
|
71574
|
71575
|
71576
|
71577
|
71578
|
71579
|
71580
|
71581
|
71582
|
71583
|
71584
|
71585
|
71586
|
71587
|
71588
|
71589
|
71590
|
71591
|
71592
|
72244
|
72311
|
72312
|
72313
|
72314
|
72315
|
72316
|
72317
|
72318
|
72319
|
72320
|
72321
|
72322
|
72323
|
72324
|
72325
|
72326
|
72327
|
72328
|
72329
|
72330
|
72331
|
72332
|
72333
|
72334
|
72335
|
72336
|
72337
|
72338
|
72527
|
76817
|
76818
|
76819
|
76820
|
76821
|
76822
|
76823
|
76824
|
76825
|
76826
|
76827
|
76828
|
76829
|
76830
|
76831
|
76832
|
76833
|
76834
|
76835
|
76836
|
76837
|
76838
|
76839
|
76840
|
76841
|
76842
|
76843
|
76844
|
76845
|
76846
|
76847
|
77177
|
77178
|
77179
|
78755
|
78757
|
78759
|
78761
|
78763
|
78765
|
78766
|
78768
|
78770
|
78772
|
78773
|
78774
|
78775
|
78776
|
78777
|
78778
|
78780
|
78782
|
78785
|
78787
|
78789
|
78790
|
78792
|
78794
|
78797
|
78800
|
78801
|
78802
|
78803
|
78804
|
78805
|
78806
|
78807
|
78808
|
80763
|
80764
|
80765
|
80766
|
80767
|
80768
|
80769
|
80770
|
80771
|
80772
|
80773
|
80774
|
80775
|
80776
|
80777
|
80778
|
80779
|
80780
|
80781
|
80782
|
80783
|
80784
|
80785
|
80786
|
80787
|
80788
|
80789
|
80793
|
80878
|
81204
|
81205
|
81206
|
81207
|
81208
|
81209
|
81210
|
81211
|
81212
|
81213
|
81214
|
81215
|
81216
|
81217
|
81218
|
81219
|
81220
|
81221
|
81222
|
81223
|
81224
|
81225
|
81226
|
81227
|
81228
|
81229
|
81230
|
81231
|
81232
|
81233
|
81234
|
81235
|
81236
|
81237
|
81238
|
81239
|
81240
|
81241
|
81242
|
81243
|
81244
|
81245
|
81246
|
81247
|
81547
|
81548
|
81549
|
81550
|
81551
|
81552
|
81553
|
81554
|
81555
|
81556
|
81557
|
81558
|
81559
|
81560
|
81561
|
81562
|
81563
|
81564
|
81565
|
81566
|
81567
|
81568
|
81569
|
81583
|
81584
|
81585
|
81586
|
81587
|
81588
|
81595
|
81618
|
81652
|
81653
|
81654
|
81655
|
81656
|
81657
|
81658
|
81659
|
81660
|
81661
|
81662
|
81663
|
81664
|
81665
|
81666
|
81667
|
81668
|
81669
|
81670
|
81671
|
81672
|
81673
|
81674
|
81675
|
81676
|
81677
|
81678
|
81679
|
81680
|
81681
|
81682
|
81683
|
103887
|
103888
|
103890
|
103899
|
103900
|
103901
|
103999
|
104000
|
104001
|
104002
|
104005
|
104006
|
104007
|
104066
|
104067
|
104068
|
104069
|
104070
|
104071
|
104246
|
104247
|
104248
|
104249
|
104250
|
104322
|
104323
|
104324
|
104325
|
104326
|
104327
|
104328
|
104329
|
104330
|
104331
|
104332
|
104333
|
104334
|
104335
|
104336
|
104391
|
104392
|
104393
|
104394
|
104395
|
104396
|
104397
|
104398
|
104474
|
104475
|
104476
|
104477
|
104478
|
104479
|
104480
|
104481
|
104545
|
104546
|
104547
|
104548
|
104549
|
104550
|
104551
|
104552
|
104646
|
104647
|
104648
|
104649
|
104650
|
104651
|
104652
|
104653
|
104722
|
104723
|
104724
|
104725
|
104726
|
104727
|
104728
|
104729
|
104806
|
104807
|
104808
|
104809
|
104810
|
104811
|
104812
|
104813
|
104814
|
104815
|
104816
|
104817
|
104818
|
104819
|
104820
|
104821
|
104863
|
104864
|
104865
|
104866
|
104867
|
104868
|
104869
|
104870
|
104902
|
104903
|
104904
|
104905
|
104906
|
104907
|
104908
|
104909
|
104910
|
104913
|
104914
|
104915
|
104916
|
104917
|
104918
|
104919
|
104920
|
104988
|
104989
|
104990
|
104991
|
104992
|
106268
|
106269
|
106371
|
106372
|
106373
|
106374
|
106375
|
106376
|
106377
|
106378
|
106810
|
106811
|
106812
|
106813
|
106814
|
106815
|
106816
|
106817
|
106857
|
107198
|
107199
|
107200
|
107201
|
107202
|
107203
|
107204
|
107205
|
107807
|
107808
|
107809
|
107810
|
107811
|
107812
|
107813
|
107814
|
107918
|
107919
|
107920
|
107921
|
107922
|
107923
|
107924
|
107925
|
108222
|
108223
|
108224
|
108225
|
108226
|
108227
|
108228
|
108229
|
108980
|
108981
|
108982
|
109306
|
109307
|
109308
|
109309
|
109310
|
109311
|
109312
|
109313
|
109314
|
109315
|
109316
|
109317
|
109318
|
109463
|
109464
|
109465
|
109466
|
109467
|
109468
|
109469
|
109775
|
109776
|
109777
|
109778
|
109779
|
109780
|
109781
|
109782
|
109783
|
109784
|
109785
|
111199
|
111200
|
111201
|
111202
|
111203
|
111204
|
111205
|
111206
|
112316
|
112317
|
112321
|
112322
|
112323
|
112324
|
112325
|
112326
|
112346
|
112472
|
112491
|
112540
|
112612
|
112613
|
112614
|
112615
|
112616
|
112617
|
112618
|
112619
|
112620
|
112621
|
112622
|
113195
|
113196
|
113197
|
113198
|
113199
|
113200
|
113201
|
113202
|
113203
|
113204
|
113205
|
113286
|
113287
|
113288
|
113289
|
113290
|
113291
|
113292
|
113293
|
113294
|
113295
|
113296
|
113297
|
113298
|
113335
|
113351
|
113352
|
113353
|
113354
|
113355
|
113356
|
113357
|
113358
|
113359
|
113361
|
113362
|
113363
|
113364
|
113365
|
113430
|
113431
|
113432
|
113433
|
113434
|
113435
|
113436
|
113437
|
113438
|
113439
|
113440
|
113441
|
113442
|
113443
|
113444
|
113445
|
116121
|
116122
|
116123
|
116124
|
116125
|
116126
|
116127
|
116128
|
116129
|
116130
|
116131
|
116132
|
116133
|
116134
|
118267
|
118268
|
118269
|
118270
|
118271
|
118272
|
118273
|
118274
|
118275
|
118276
|
118277
|
118278
|
118279
|
118280
|
122993
|
122994
|
122995
|
122996
|
122997
|
122998
|
122999
|
123000
|
123001
|
123002
|
123003
|
123004
|
123005
|
126244
|
126245
|
126246
|
126247
|
126248
|
126249
|
126250
|
126251
|
126252
|
126253
|
126254
|
126255
|
126256
|
126257
|
126453
|
126454
|
126455
|
126456
|
126457
|
126458
|
126459
|
126460
|
126469
|
126470
|
126565
|
126566
|
126568
|
126569
|
126570
|
126571
|
126572
|
126573
|
126574
|
126575
|
126576
|
126577
|
126578
|
126579
|
126580
|
129305
|
129306
|
129307
|
129308
|
129309
|
129310
|
129311
|
129312
|
129313
|
129314
|
129315
|
129316
|
129317
|
129318
|
129319
|
130641
|
130642
|
130643
|
130644
|
130645
|
130646
|
130647
|
130648
|
130649
|
130650
|
130651
|
130652
|
130653
|
130654
|
130655
|
130656
|
131108
|
131156
|
131157
|
131158
|
131159
|
131160
|
131193
|
131213
|
131257
|
131260
|
131261
|
131262
|
131263
|
131264
|
131265
|
131266
|
131267
|
131268
|
131269
|
131270
|
131271
|
131272
|
131273
|
131274
|
131275
|
131276
|
131277
|
131278
|
131279
|
131280
|
131281
|
131282
|
131330
|
131629
|
131630
|
131631
|
131664
|
131665
|
131666
|
131701
|
132332