[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 5d169df87671cf34086c9f2ce354f6636b13b580
Evergreen Git
git at git.evergreen-ils.org
Sat Jun 2 22:43:14 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_1 has been updated
via 5d169df87671cf34086c9f2ce354f6636b13b580 (commit)
via 5f27cb82d6584a49d16a995104b1e929814c847c (commit)
from e871a59c1ecc8a2032567fb8f7eeb9164e2342d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d169df87671cf34086c9f2ce354f6636b13b580
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 17:34:06 2012 -0400
Clean up and refine serial note support, part 1
This commit fixes a number of minor problems with serial notes:
1) Serial notes are currently returned in "random" (database)
order. Adding a create_date sort is a sensible default.
2) If you have many notes, they start to display in a squashed and
unreadable fashion. Switching from a groupbox to a styled vbox
provides a simple workaround.
3) It is currently impossible to display newlines in notes. We can
deal with this by changing the display style.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Dan Scott <dan at coffeecode.net>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
index 4fc2160..7bbc264 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
@@ -62,6 +62,11 @@ my %MFHD_TAGS_BY_NAME = ( $MFHD_NAMES[0] => '853',
$MFHD_NAMES[1] => '854',
$MFHD_NAMES[2] => '855');
my $_strp_date = new DateTime::Format::Strptime(pattern => '%F');
+my %FM_NAME_TO_ID = (
+ 'subscription' => 'ssub',
+ 'distribution' => 'sdist',
+ 'item' => 'sitem'
+ );
# helper method for conforming dates to ISO8601
sub _cleanse_dates {
@@ -1940,18 +1945,19 @@ sub fetch_notes {
my $id = $$args{object_id};
my $authtoken = $$args{authtoken};
+ my $order_by = $$args{order_by} || 'create_date';
my( $r, $evt);
if( $$args{pub} ) {
return $U->cstorereq(
'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic',
- { $type => $id, pub => 't' } );
+ { $type => $id, pub => 't' }, {'order_by' => {$FM_NAME_TO_ID{$type}.'n' => $order_by}} );
} else {
# FIXME: restore perm check
# ( $r, $evt ) = $U->checksesperm($authtoken, 'VIEW_COPY_NOTES');
# return $evt if $evt;
return $U->cstorereq(
- 'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic', {$type => $id} );
+ 'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic', {$type => $id}, {'order_by' => {$FM_NAME_TO_ID{$type}.'n' => $order_by}} );
}
return undef;
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 8f7ae26..6fa1f50 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -206,16 +206,16 @@
<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
<stack hidden="true" id="note_template" flex="1">
- <groupbox flex="1" style="background-color: black;"/>
- <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+ <vbox flex="1" style="background-color: black; margin:3px"/>
+ <vbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px; border: 2px groove ThreeDFace; margin:3px;" >
<hbox>
<description name="title" style="font-weight: bold"/>
<spacer flex="1"/>
<description name="create_date" style="font-weight: bold"/>
<description name="pub" style="font-weight: bold"/>
</hbox>
- <description name="value"/>
- </groupbox>
+ <description style="white-space: pre-wrap;" name="value"/>
+ </vbox>
</stack>
<vbox flex="1" class="my_overflow" id="notes_panel">
commit 5f27cb82d6584a49d16a995104b1e929814c847c
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 16:02:49 2012 -0400
Limit excess serial data fetching
Overfetching and duplication of data in the interface is both
inefficient and bug-inducing. This reduces a couple big offenders.
First, in the items tab, we will store distribution and subscription
data separately, rather than duplicating for every row. Second, we
will only redraw rows as needed rather than refresh the whole list so
often. Finally, we no longer need to lookup call numbers separately,
as they are included in the one-time distribution fetch.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Dan Scott <dan at coffeecode.net>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
index f0c1291..4fc2160 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
@@ -341,7 +341,7 @@ sub fleshed_serial_item_retrieve_batch {
"open-ils.cstore.direct.serial.item.search.atomic",
{ id => $ids },
{ flesh => 2,
- flesh_fields => {sitem => [ qw/issuance creator editor stream unit notes/ ], sstr => ["distribution"], sunit => ["call_number"], siss => [qw/creator editor subscription/]}
+ flesh_fields => {sitem => [ qw/issuance creator editor stream unit notes/ ], sunit => ["call_number"], siss => [qw/creator editor subscription/]}
});
}
@@ -2429,7 +2429,7 @@ sub fleshed_serial_distribution_retrieve_batch {
"open-ils.cstore.direct.serial.distribution.search.atomic",
{ id => $ids },
{ flesh => 1,
- flesh_fields => {sdist => [ qw/ holding_lib receive_call_number receive_unit_template bind_call_number bind_unit_template streams / ]}
+ flesh_fields => {sdist => [ qw/ holding_lib receive_call_number receive_unit_template bind_call_number bind_unit_template streams notes / ]}
});
}
diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.js b/Open-ILS/xul/staff_client/server/serial/manage_items.js
index 81b09b3..5b7270a 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js
@@ -17,8 +17,11 @@ serial.manage_items = function (params) {
serial.manage_items.prototype = {
'list_sitem_map' : {},
+ 'sdist_map' : {},
+ 'ssub_map' : {},
+ 'row_map' : {},
- 'set_sdist_ids' : function () {
+ 'retrieve_ssubs_and_sdists' : function () {
var obj = this;
try {
@@ -37,11 +40,41 @@ serial.manage_items.prototype = {
if (robj != null) {
if (typeof robj.ilsevent != 'undefined') throw(robj);
obj.sdist_ids = robj.length ? robj : [robj];
+ // now get actual sdist and ssub objects
+ robj = obj.network.simple_request(
+ 'FM_SDIST_FLESHED_BATCH_RETRIEVE.authoritative',
+ [ obj.sdist_ids ]
+ );
+ if (robj != null) {
+ if (typeof robj.ilsevent != 'undefined') throw(robj);
+ robj = robj.length ? robj : [robj];
+ for (var i = 0; i < robj.length; i++) {
+ obj.sdist_map[robj[i].id()] = robj[i];
+ }
+ }
+ robj = obj.network.request(
+ 'open-ils.pcrud',
+ 'open-ils.pcrud.id_list.ssub',
+ [ ses(), {"+sdist" : {"id" : obj.sdist_ids}}, {"join":"sdist"} ]
+ );
+ var ssub_ids = robj.length ? robj : [robj];
+ robj = obj.network.simple_request(
+ 'FM_SSUB_FLESHED_BATCH_RETRIEVE.authoritative',
+ [ ssub_ids ]
+ );
+ if (robj != null) {
+ if (typeof robj.ilsevent != 'undefined') throw(robj);
+ robj = robj.length ? robj : [robj];
+ for (var i = 0; i < robj.length; i++) {
+ obj.ssub_map[robj[i].id()] = robj[i];
+ }
+ }
} else {
obj.sdist_ids = [];
}
+
} catch(E) {
- obj.error.standard_unexpected_error_alert('set_sdist_ids failed!',E);
+ obj.error.standard_unexpected_error_alert('retrieve_ssubs_and_sdists failed!',E);
}
},
@@ -93,7 +126,7 @@ serial.manage_items.prototype = {
//if (document.getElementById('serial_item_refresh_button')) document.getElementById('serial_item_refresh_button').focus();
obj.save_settings();
// get latest sdist id list based on library drowdown
- obj.set_sdist_ids();
+ obj.retrieve_ssubs_and_sdists();
obj.refresh_list('main');
obj.refresh_list('workarea');
},
@@ -141,7 +174,7 @@ serial.manage_items.prototype = {
obj.build_menus();
obj.set_sunit($('serial_items_current_sunit').getAttribute('sunit_id'), $('serial_items_current_sunit').getAttribute('sunit_label'), $('serial_items_current_sunit').getAttribute('sdist_id'), $('serial_items_current_sunit').getAttribute('sstr_id'));
- obj.set_sdist_ids();
+ //obj.retrieve_ssubs_and_sdists();
obj.init_lists();
var mode_radio_group = $('serial_manage_items_mode');
@@ -210,7 +243,7 @@ serial.manage_items.prototype = {
spawn_sitem_editor( { 'sitem_ids' : list, 'do_edit' : 1 } );
- obj.refresh_list(obj.selected_list);
+ obj.refresh_rows(list);
} catch(E) {
obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_items.error'),E);
@@ -280,7 +313,7 @@ serial.manage_items.prototype = {
var robj = obj.network.request(
'open-ils.serial',
'open-ils.serial.item.fleshed.batch.update',
- [ ses(), list, true ],
+ [ ses(), list ],
null,
{
'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.override'),
@@ -378,7 +411,7 @@ serial.manage_items.prototype = {
}
var prompt_text;
if (obj.current_sunit_id == -1) {
- prompt_text = 'for '+item.issuance().label()+ ' from Distribution: '+item.stream().distribution().label()+'/'+item.stream().id()+':';
+ prompt_text = 'for '+item.issuance().label()+ ' from Distribution: '+obj.sdist_map[item.stream().distribution()].label()+'/'+item.stream().id()+':';
} else { // must be -2
prompt_text = 'for the new unit:';
}
@@ -410,25 +443,18 @@ serial.manage_items.prototype = {
barcodes[item.id()] = barcode;
// now call numbers
- if (typeof call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()] == 'undefined') {
+ if (typeof call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()] == 'undefined') {
var default_cn = 'DEFAULT';
// if they defined a *_call_number, honor it as the default
- var preset_cn_id = item.stream().distribution()[mode + '_call_number']();
- if (preset_cn_id) {
- var preset_default_cn = obj.network.request(
- 'open-ils.pcrud',
- 'open-ils.pcrud.retrieve.acn',
- [ ses(), preset_cn_id ]
- );
- if (preset_default_cn) {
- default_cn = preset_default_cn.label();
- }
+ var preset_cn = obj.sdist_map[item.stream().distribution()][mode + '_call_number']();
+ if (preset_cn) {
+ default_cn = preset_cn.label();
} else {
// for now, let's default to the last created call number if there is one
var acn_list = obj.network.request(
'open-ils.pcrud',
'open-ils.pcrud.search.acn',
- [ ses(), {"record" : obj.docid, "owning_lib" : item.stream().distribution().holding_lib(), "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ]
+ [ ses(), {"record" : obj.docid, "owning_lib" : obj.sdist_map[item.stream().distribution()].holding_lib().id(), "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ]
);
if (acn_list) {
@@ -445,10 +471,10 @@ serial.manage_items.prototype = {
call_number = 'DEFAULT'; //TODO: real default by setting
}
call_numbers[item.id()] = call_number;
- call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()] = call_number;
+ call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()] = call_number;
} else {
// we have already seen this same issuance and distribution combo, so use the same call number
- call_numbers[item.id()] = call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()];
+ call_numbers[item.id()] = call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()];
}
if (obj.current_sunit_id == -2) {
@@ -471,7 +497,7 @@ serial.manage_items.prototype = {
obj.current_sunit_id = robj.new_unit_id;
}
- obj.rebuild_current_sunit(list[0].stream().distribution().label(), list[0].stream().distribution().id(), list[0].stream().id());
+ obj.rebuild_current_sunit(obj.sdist_map[list[0].stream().distribution()].label(), list[0].stream().distribution(), list[0].stream().id());
obj.refresh_list('main');
obj.refresh_list('workarea');
@@ -504,7 +530,7 @@ serial.manage_items.prototype = {
'cmd_items_print' : [ ['command'], function() { obj.items_print(obj.selected_list); } ],
'cmd_items_export' : [ ['command'], function() { obj.items_export(obj.selected_list); } ],
- 'cmd_refresh_list' : [ ['command'], function() { obj.set_sdist_ids(); obj.refresh_list('main'); obj.refresh_list('workarea'); } ]
+ 'cmd_refresh_list' : [ ['command'], function() { obj.retrieve_ssubs_and_sdists(); obj.refresh_list('main'); obj.refresh_list('workarea'); } ]
}
}
);
@@ -666,7 +692,7 @@ serial.manage_items.prototype = {
obj.mode = mode;
}
- obj.set_sdist_ids();
+ obj.retrieve_ssubs_and_sdists();
if (mode == 'receive' || mode == 'advanced_receive') {
$('serial_workarea_mode_label').value = 'Recently Received';
@@ -739,6 +765,7 @@ serial.manage_items.prototype = {
var sitem = robj[0];
obj.list_sitem_map[sitem.id()] = sitem;
row.my.sitem = sitem;
+ row.my.parent_obj = obj;
//params.row_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':copy_id,'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': ( row.my.record ? row.my.record.id() : null ) }) );
params.row_node.setAttribute( 'retrieve_id', js2JSON({'sitem_id':sitem.id()}) );
dump('dumping... ' + js2JSON(obj.list_sitem_map[sitem.id()]));
@@ -821,6 +848,28 @@ serial.manage_items.prototype = {
obj.retrieve(list_name);
},
+ // accepts a list of ids or a list of objects
+ 'refresh_rows' : function(list) {
+ var obj = this;
+
+ var id_list;
+
+ if (typeof list[0] == 'object') {
+ id_list = util.functional.map_list(
+ list,
+ function(o) {
+ return o.id()
+ }
+ );
+ } else {
+ id_list = list;
+ }
+
+ for (var i = 0; i < id_list.length; i++) {
+ obj.lists[obj.selected_list].refresh_row(obj.row_map[id_list[i]]);
+ }
+ },
+
'retrieve' : function(list_name) {
var obj = this;
var list = obj.lists[list_name];
@@ -859,7 +908,8 @@ serial.manage_items.prototype = {
}
for (i = 0; i < robj.length; i++) {
- list.append( { 'row' : { 'my' : { 'sitem_id' : robj[i] } }, 'to_bottom' : true, 'no_auto_select' : true } );
+ var nparams = list.append( { 'row' : { 'my' : { 'sitem_id' : robj[i] } }, 'to_bottom' : true, 'no_auto_select' : true } );
+ obj.row_map[robj[i]] = nparams;
}
},
@@ -922,15 +972,16 @@ function item_columns(modify,params) {
'primary' : false,
'hidden' : false,
'persist' : 'hidden width ordinal',
- 'render' : function(my) { return my.sitem.stream().distribution().label(); }
- }, {
+ 'render' : function(my) { return my.parent_obj.sdist_map[my.sitem.stream().distribution()].label(); }
+ },
+ {
'id' : 'distribution_ou',
'label' : $('serialStrings').getString('staff.serial.manage_items.holder.label'),
'flex' : 1,
'primary' : false,
'hidden' : false,
'persist' : 'hidden width ordinal',
- 'render' : function(my) { return data.hash.aou[ my.sitem.stream().distribution().holding_lib() ].shortname(); }
+ 'render' : function(my) { return my.parent_obj.sdist_map[my.sitem.stream().distribution()].holding_lib().shortname(); }
},
{
'id' : 'stream_id',
-----------------------------------------------------------------------
Summary of changes:
.../src/perlmods/lib/OpenILS/Application/Serial.pm | 14 ++-
.../xul/staff_client/server/serial/manage_items.js | 107 ++++++++++++++-----
Open-ILS/xul/staff_client/server/serial/notes.xul | 8 +-
3 files changed, 93 insertions(+), 36 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list