Bugzilla – Attachment 76125 Details for
Bug 11897
Stock Rotation for Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11897: (QA follow-up) Implement review feedback.
Bug-11897-QA-follow-up-Implement-review-feedback.patch (text/plain), 21.23 KB, created by
Martin Renvoize (ashimema)
on 2018-06-18 13:56:19 UTC
(
hide
)
Description:
Bug 11897: (QA follow-up) Implement review feedback.
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-06-18 13:56:19 UTC
Size:
21.23 KB
patch
obsolete
>From 29ce22f3757d6e690d42daa0c8b20e1ef12bfb39 Mon Sep 17 00:00:00 2001 >From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com> >Date: Mon, 19 Feb 2018 16:03:42 +0100 >Subject: [PATCH] Bug 11897: (QA follow-up) Implement review feedback. > >- Update Table declarations >- Add permissions checks >- Remove unused code >- Fix language & naming >- Make templates translation friendly >--- > Koha/REST/V1/Stage.pm | 12 ++++ > catalogue/stockrotation.pl | 5 +- > .../mysql/atomicupdate/stockrot_tables.sql | 6 +- > installer/data/mysql/kohastructure.sql | 72 +++++++++---------- > installer/data/mysql/sysprefs.sql | 7 +- > .../prog/en/includes/tools-menu.inc | 17 ----- > .../admin/preferences/circulation.pref | 2 +- > .../en/modules/catalogue/stockrotation.tt | 34 ++++++--- > .../prog/en/modules/tools/stockrotation.tt | 10 +-- > tools/stockrotation.pl | 4 ++ > 10 files changed, 93 insertions(+), 76 deletions(-) > >diff --git a/Koha/REST/V1/Stage.pm b/Koha/REST/V1/Stage.pm >index fa4ca7ad2b..485384a41b 100644 >--- a/Koha/REST/V1/Stage.pm >+++ b/Koha/REST/V1/Stage.pm >@@ -22,6 +22,18 @@ use Mojo::Base 'Mojolicious::Controller'; > use Koha::StockRotationRotas; > use Koha::StockRotationStages; > >+=head1 NAME >+ >+Koha::REST::V1::Stage >+ >+=head2 Operations >+ >+=head3 move >+ >+Move a stage up or down the stockrotation rota. >+ >+=cut >+ > sub move { > my $c = shift->openapi->valid_input or return; > my $input = $c->validation->output; >diff --git a/catalogue/stockrotation.pl b/catalogue/stockrotation.pl >index ff63b8a270..bf38d91625 100755 >--- a/catalogue/stockrotation.pl >+++ b/catalogue/stockrotation.pl >@@ -57,7 +57,10 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user( > query => $input, > type => 'intranet', > authnotrequired => 0, >- flagsrequired => { catalogue => 1 } >+ flagsrequired => { >+ catalogue => 1, >+ stockrotation => 'can_user_stockrotation_can_edit_rotas', >+ }, > } > ); > >diff --git a/installer/data/mysql/atomicupdate/stockrot_tables.sql b/installer/data/mysql/atomicupdate/stockrot_tables.sql >index 8469d20ca7..bde87f1b1a 100644 >--- a/installer/data/mysql/atomicupdate/stockrot_tables.sql >+++ b/installer/data/mysql/atomicupdate/stockrot_tables.sql >@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS stockrotationrotas ( > cyclical tinyint(1) NOT NULL default 0, -- Should items on this rota keep cycling? > active tinyint(1) NOT NULL default 0, -- Is this rota currently active? > PRIMARY KEY (`rota_id`) >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > -- Stock Rotation Stages > >@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS stockrotationstages ( > FOREIGN KEY (`branchcode_id`) > REFERENCES `branches` (`branchcode`) > ON UPDATE CASCADE ON DELETE CASCADE >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > -- Stock Rotation Items > >@@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS stockrotationitems ( > FOREIGN KEY (`stage_id`) > REFERENCES `stockrotationstages` (`stage_id`) > ON UPDATE CASCADE ON DELETE CASCADE >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > -- System preferences > >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index a8f893c99d..af16a22ad3 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -4143,40 +4143,6 @@ CREATE TABLE illrequests ( > ON UPDATE CASCADE ON DELETE CASCADE > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > >--- >--- Table structure for table `stockrotationrotas` >--- >- >-CREATE TABLE IF NOT EXISTS stockrotationrotas ( >- rota_id int(11) auto_increment, -- Stockrotation rota ID >- title varchar(100) NOT NULL, -- Title for this rota >- description text NOT NULL default '', -- Description for this rota >- cyclical tinyint(1) NOT NULL default 0, -- Should items on this rota keep cycling? >- active tinyint(1) NOT NULL default 0, -- Is this rota currently active? >- PRIMARY KEY (`rota_id`) >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >- >--- >--- Table structure for table `stockrotationstages` >--- >- >-CREATE TABLE IF NOT EXISTS stockrotationstages ( >- stage_id int(11) auto_increment, -- Unique stage ID >- position int(11) NOT NULL, -- The position of this stage within its rota >- rota_id int(11) NOT NULL, -- The rota this stage belongs to >- branchcode_id varchar(10) NOT NULL, -- Branch this stage relates to >- duration int(11) NOT NULL default 4, -- The number of days items shoud occupy this stage >- PRIMARY KEY (`stage_id`), >- CONSTRAINT `stockrotationstages_rifk` >- FOREIGN KEY (`rota_id`) >- REFERENCES `stockrotationrotas` (`rota_id`) >- ON UPDATE CASCADE ON DELETE CASCADE, >- CONSTRAINT `stockrotationstages_bifk` >- FOREIGN KEY (`branchcode_id`) >- REFERENCES `branches` (`branchcode`) >- ON UPDATE CASCADE ON DELETE CASCADE >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >- > -- > -- Table structure for table `illrequestattributes` > -- >@@ -4206,7 +4172,7 @@ CREATE TABLE library_groups ( > description MEDIUMTEXT NULL DEFAULT NULL, -- Longer explanation of the group, if necessary > ft_hide_patron_info tinyint(1) NOT NULL DEFAULT 0, -- Turn on the feature "Hide patron's info" for this group > ft_search_groups_opac tinyint(1) NOT NULL DEFAULT 0, -- Use this group for staff side search groups >- ft_search_groups_staff tinyint(1) NOT NULL DEFAULT 0, -- Use this group for opac side search groups >+ ft_search_groups_staff tinyint(1) NOT NULL DEFAULT 0, -- Use this group for opac side search groups > created_on TIMESTAMP NULL, -- Date and time of creation > updated_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- Date and time of last > PRIMARY KEY id ( id ), >@@ -4227,6 +4193,40 @@ CREATE TABLE `oauth_access_tokens` ( > PRIMARY KEY (`access_token`) > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > >+-- >+-- Table structure for table `stockrotationrotas` >+-- >+ >+CREATE TABLE IF NOT EXISTS stockrotationrotas ( >+ rota_id int(11) auto_increment, -- Stockrotation rota ID >+ title varchar(100) NOT NULL, -- Title for this rota >+ description text NOT NULL default '', -- Description for this rota >+ cyclical tinyint(1) NOT NULL default 0, -- Should items on this rota keep cycling? >+ active tinyint(1) NOT NULL default 0, -- Is this rota currently active? >+ PRIMARY KEY (`rota_id`) >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; >+ >+-- >+-- Table structure for table `stockrotationstages` >+-- >+ >+CREATE TABLE IF NOT EXISTS stockrotationstages ( >+ stage_id int(11) auto_increment, -- Unique stage ID >+ position int(11) NOT NULL, -- The position of this stage within its rota >+ rota_id int(11) NOT NULL, -- The rota this stage belongs to >+ branchcode_id varchar(10) NOT NULL, -- Branch this stage relates to >+ duration int(11) NOT NULL default 4, -- The number of days items shoud occupy this stage >+ PRIMARY KEY (`stage_id`), >+ CONSTRAINT `stockrotationstages_rifk` >+ FOREIGN KEY (`rota_id`) >+ REFERENCES `stockrotationrotas` (`rota_id`) >+ ON UPDATE CASCADE ON DELETE CASCADE, >+ CONSTRAINT `stockrotationstages_bifk` >+ FOREIGN KEY (`branchcode_id`) >+ REFERENCES `branches` (`branchcode`) >+ ON UPDATE CASCADE ON DELETE CASCADE >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; >+ > -- > -- Table structure for table `stockrotationitems` > -- >@@ -4245,7 +4245,7 @@ CREATE TABLE IF NOT EXISTS stockrotationitems ( > FOREIGN KEY (`stage_id`) > REFERENCES `stockrotationstages` (`stage_id`) > ON UPDATE CASCADE ON DELETE CASCADE >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > > /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; > /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 9de17ae667..cd3811e020 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -479,6 +479,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('reviewson','1','','If ON, enables patron reviews of bibliographic records in the OPAC','YesNo'), > ('RisExportAdditionalFields', '', NULL , 'Define additional RIS tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'), > ('RoutingListAddReserves','0','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'), >+('RotationPreventTransfers','0',NULL,'If ON, prevent any transfers for items on stock rotation rotas, except for stock rotation transfers','YesNo'), >+('RoutingListAddReserves','1','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'), > ('RoutingListNote','To change this note edit <a href=\"/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped\">RoutingListNote</a> system preference.','70|10','Define a note to be shown on all routing lists','Textarea'), > ('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'), > ('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea'), >@@ -525,6 +527,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the Staff client','Integer'), > ('StaticHoldsQueueWeight','0',NULL,'Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective','Integer'), > ('StatisticsFields','location|itype|ccode', NULL, 'Define Fields (from the items table) used for statistics members','Free'), >+('StockRotation','0',NULL,'If ON, enables the stock rotation module','YesNo'), > ('StoreLastBorrower','0','','If ON, the last borrower to return an item will be stored in items.last_returned_by','YesNo'), > ('SubfieldsToAllowForRestrictedBatchmod','','Define a list of subfields for which edition is authorized when items_batchmod_restricted permission is enabled, separated by spaces. Example: 995\$f 995\$h 995\$j',NULL,'Free'), > ('SubfieldsToAllowForRestrictedEditing','','Define a list of subfields for which edition is authorized when edit_items_restricted permission is enabled, separated by spaces. Example: 995\$f 995\$h 995\$j',NULL,'Free'), >@@ -616,7 +619,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'), > ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), > ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), >-('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), >-('StockRotation','0',NULL,'If ON, enables the stock rotation module','YesNo'), >-('RotationPreventTransfers','0',NULL,'If ON, prevent any transfers for items on stock rotation rotas, except for stock rotation transfers','YesNo') >+('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') > ; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >index ee0034f6cb..5660878970 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -1,22 +1,5 @@ > [% USE Koha %] > >-<script type="text/javascript">//<![CDATA[ >- $(document).ready(function() { >- var path = location.pathname.substring(1); >- if (path.indexOf("labels") >= 0 && path.indexOf("spine") < 0 ) { >- $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').css('font-weight','bold'); >- } else if (path.indexOf("patroncards") >= 0 ) { >- $('#navmenulist a[href$="/cgi-bin/koha/patroncards/home.pl"]').css('font-weight','bold'); >- } else if (path.indexOf("patron_lists") >= 0 ) { >- $('#navmenulist a[href$="/cgi-bin/koha/patron_lists/lists.pl"]').css('font-weight','bold'); >- } else if ((path+location.search).indexOf("batchMod.pl?del=1") >= 0 ) { >- $('#navmenulist a[href$="/cgi-bin/koha/tools/batchMod.pl?del=1"]').css('font-weight','bold'); >- } else { >- $('#navmenulist a[href$="/' + path + '"]').css('font-weight','bold'); >- } >- }); >-//]]> >-</script> > <div id="navmenu"> > <div id="navmenulist"> > <ul> >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 1536f96b83..39aa3989ed 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 >@@ -918,7 +918,7 @@ Circulation: > yes: Enable > no: Disable > - "housebound module" >- Stock Rotation module: >+ Stockrotation module: > - > - pref: StockRotation > choices: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index 8d9b011d87..220a4c7fc4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -4,10 +4,7 @@ > <title>Koha › Catalog › Stock rotation details for [% biblio.title %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'browser-strings.inc' %] >-<!--[if lt IE 9]> >-<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >-<![endif]--> >-<script type="text/javascript" src="[% interface %]/js/browser.js"></script> >+<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >@@ -38,7 +35,7 @@ > <thead> > <tr> > <th>Barcode</th> >- <th>Shelfmark</th> >+ <th>Callnumber</th> > <th>Rota</th> > <th>Rota status</th> > <th>In transit</th> >@@ -59,15 +56,22 @@ > [% IF !item.rota.active %] > <span class="highlighted-row"> > [% END %] >- [% item.rota.active ? 'Active' : 'Inactive' %] >- >+ [% IF item.rota.active %] >+ Active >+ [% ELSE %] >+ Inactive >+ [% END %] > [% IF !item.rota.active %] > </span> > [% END %] > [% END %] > </td> > <td> >- [% item.bib_item.get_transfer ? 'Yes' : 'No' %] >+ [% IF item.bib_item.get_transfer %] >+ Yes >+ [% ELSE %] >+ No >+ [% END %] > </td> > <td> > [% FOREACH this_stage IN item.stages %] >@@ -81,7 +85,13 @@ > » > [% END %] > [% IF item.stages.size > 0 %] >- <span class="stage">[% item.rota.cyclical ? 'START' : 'END' %]</span> >+ <span class="stage"> >+ [% IF item.rota.cyclical %] >+ START >+ [% ELSE %] >+ END >+ [% END %] >+ </span> > [% END %] > </td> > <td class="actions"> >@@ -101,7 +111,11 @@ > <a class="btn btn-default btn-xs" disabled> > [% END %] > <i class="fa fa-fire"></i> >- [% item.stockrotationitem.indemand ? 'Remove "In demand"' : 'Add "In demand"' %] >+ [% IF item.stockrotationitem.indemand %] >+ Remove "In demand" >+ [% ELSE %] >+ Add "In demand" >+ [% END %] > </a> > [% IF !in_transit %] > <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% item.stockrotationitem.stage.stage_id %]&item_id=[% item.bib_item.id %]&biblionumber=[% biblionumber %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index e9cf827fad..7c729dc181 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -4,9 +4,9 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Stock rotation</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/stockrotation.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/stockrotation_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >@@ -201,7 +201,7 @@ > Stages can be re-ordered by using the <i class="drag_handle fa fa-lg fa-bars"></i>handle to drag and drop them to their new position > </div> > <div id="stage_list_headings"> >- <span class="stagename">Branch</span> >+ <span class="stagename">Library</span> > <span class="stageduration">Duration (days)</span> > </div> > <ul id="sortable_stages" data-rota-id="[% rota.rota_id %]"> >@@ -248,7 +248,7 @@ > <fieldset class="rows"> > <ol> > <li> >- <label class="required" for="branch">Branch:</label> >+ <label class="required" for="branch">Library:</label> > <select name="branchcode" id="branch"> > [% FOREACH branch IN branches %] > [% IF branch.branchcode == stage.branchcode_id %] >@@ -350,7 +350,7 @@ > <th>Barcode</th> > <th>Title</th> > <th>Author</th> >- <th>Shelfmark</th> >+ <th>Callnumber</th> > <th class="NoSearch">In transit</th> > <th class="NoSort">Stages & duration in days<br>(current stage highlighted)</th> > <th class="NoSort"> </th> >diff --git a/tools/stockrotation.pl b/tools/stockrotation.pl >index 19f71ddee0..cf46c090cb 100755 >--- a/tools/stockrotation.pl >+++ b/tools/stockrotation.pl >@@ -51,6 +51,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > template_name => 'tools/stockrotation.tt', > query => $input, > type => 'intranet', >+ flagsrequired => { >+ tools => '*', >+ stockrotation => '*', >+ }, > authnotrequired => 0 > } > ); >-- >2.17.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 11897
:
25887
|
58207
|
58208
|
58209
|
58210
|
58211
|
58212
|
58213
|
58214
|
58215
|
58216
|
58217
|
58218
|
58219
|
58280
|
58281
|
58687
|
58692
|
58693
|
58694
|
58695
|
58696
|
60175
|
60715
|
61825
|
61826
|
61827
|
61828
|
61829
|
61830
|
61831
|
61832
|
61833
|
61834
|
61835
|
61836
|
61837
|
61838
|
61839
|
61885
|
62730
|
62750
|
62751
|
62752
|
62753
|
62754
|
62755
|
62756
|
62757
|
62758
|
62759
|
62760
|
62761
|
62762
|
62763
|
62764
|
62765
|
62766
|
62767
|
63063
|
63064
|
63065
|
63066
|
63067
|
63068
|
63069
|
63070
|
63071
|
63072
|
63073
|
63074
|
63075
|
63076
|
63077
|
63078
|
63079
|
63080
|
63114
|
64850
|
64851
|
65715
|
65716
|
65717
|
65718
|
65719
|
65720
|
65721
|
65722
|
65723
|
65724
|
65725
|
65726
|
65727
|
65728
|
65729
|
65730
|
65731
|
65732
|
65733
|
65734
|
65735
|
65736
|
65737
|
65738
|
65739
|
65740
|
65741
|
65742
|
65743
|
65744
|
65745
|
65746
|
65747
|
65748
|
65749
|
65750
|
65751
|
65752
|
65753
|
65754
|
65755
|
65756
|
65757
|
65758
|
66381
|
70496
|
70497
|
70498
|
70499
|
70500
|
70501
|
70502
|
70503
|
70504
|
70505
|
70506
|
70507
|
70508
|
70509
|
70510
|
70511
|
70512
|
70513
|
70514
|
70515
|
70516
|
70517
|
70518
|
70519
|
70520
|
70521
|
70522
|
70523
|
70524
|
72124
|
72125
|
72126
|
72127
|
72128
|
74003
|
74004
|
74005
|
74006
|
74007
|
74008
|
74010
|
74011
|
74012
|
74013
|
74014
|
74015
|
74016
|
74017
|
74197
|
74198
|
74199
|
74200
|
74201
|
74202
|
74203
|
74204
|
74205
|
74206
|
74319
|
74320
|
74360
|
74459
|
74460
|
74461
|
74462
|
74463
|
74464
|
74465
|
74466
|
74467
|
74468
|
74469
|
74470
|
75409
|
75410
|
75411
|
75412
|
75413
|
75414
|
75415
|
75416
|
75417
|
75418
|
75419
|
75420
|
76121
|
76122
|
76123
|
76124
|
76125
|
76126
|
76127
|
76128
|
76129
|
76130
|
76131
|
76132
|
76133
|
76134
|
76135
|
76144
|
76706
|
76707
|
76708
|
76709
|
76710
|
77623
|
77624
|
77625
|
77626
|
78387
|
78388
|
78389
|
78390
|
78391
|
78392
|
78393
|
78394
|
78404
|
78405
|
78406
|
78407
|
78408
|
79040
|
79041
|
79042
|
79043
|
79044
|
79738
|
79739
|
79740
|
79741
|
79742
|
79746
|
79747
|
79748
|
79749
|
79750
|
79964
|
79965
|
79966
|
79967
|
79968
|
79969
|
79970
|
79971
|
79972
|
79973
|
79974
|
79975
|
80068
|
80087
|
80088
|
80089
|
80090
|
80091
|
80092
|
80093
|
80094
|
80095
|
80096
|
80097
|
80098
|
80099
|
80100
|
80118
|
80260
|
80261
|
80262
|
80263
|
80264
|
80265
|
80266
|
80267
|
80268
|
80269
|
80270
|
80271
|
80272
|
80273
|
80274
|
80275
|
80289
|
80298
|
80299
|
80300