From: erickson Date: Thu, 9 Jul 2009 21:19:04 +0000 (+0000) Subject: added support for setting usr_summary column on actor stat cats X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e37b8c94ab6a9a123368461300696b893a66e8d4;p=evergreen%2Ftadl.git added support for setting usr_summary column on actor stat cats git-svn-id: svn://svn.open-ils.org/ILS/trunk@13559 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js index b67326cec5..88a75f4244 100644 --- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js +++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.js @@ -140,6 +140,11 @@ function scDraw( type, cats ) { hideMe($('sc_none')); unHideMe($('sc_table')); + if(type == 'actor') + unHideMe($('sc_usr_summary_label')); + else + hideMe($('sc_usr_summary_label')); + scCounter = 0; for( var c in cats ) scInsertCat( tbody, cats[c], type ); } @@ -158,8 +163,20 @@ function scInsertCat( tbody, cat, type ) { $n(row, 'sc_edit').onclick = function(){ scEdit(tbody, type, cat); }; $n(row, 'sc_owning_lib').appendChild( text( findOrgUnit(cat.owner()).name() )); - if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) unHideMe($n(row, 'sc_opac_visible')); - else unHideMe($n(row, 'sc_opac_invisible')); + if(isTrue(cat.opac_visible())) + unHideMe($n(row, 'sc_opac_visible')); + else + unHideMe($n(row, 'sc_opac_invisible')); + + if(type == 'actor') { + if(isTrue(cat.usr_summary())) + unHideMe($n(row, 'sc_usr_summary_on')); + else + unHideMe($n(row, 'sc_usr_summary')); + + } else { + hideMe($n(row, 'sc_usr_summary_td')); + } tbody.appendChild(row); scEntryCounter = 0; @@ -303,6 +320,13 @@ function scEdit( tbody, type, cat ) { $n(row, 'sc_edit_name').value = cat.name(); + if(type == 'actor') { + var cb = $n(row, 'sc_edit_usr_summary'); + cb.checked = isTrue(cat.usr_summary()); + } else { + hideMe($n(row, 'sc_edit_usr_summary_td')); + } + var name = $n(row, 'sc_edit_cancel'); name.onclick = function() { tbody.removeChild(row); }; @@ -361,14 +385,20 @@ function scEditGo( type, cat, row, selector ) { var isvisible = false; if( cat.opac_visible() != 0 && cat.opac_visible() != '0' ) isvisible = true; - if( (name == cat.name()) && (visible == isvisible) - && (newlib == cat.owner()) ) { return true; } + var usr_summary = $n(row, 'sc_edit_usr_summary').checked; + + if( (name == cat.name()) && + (visible == isvisible) && + (newlib == cat.owner()) && + (usr_summary == isTrue(cat.usr_summary())) ) + return true; cat.name( name ); cat.owner( newlib ); cat.entries(null); cat.opac_visible(0); if( visible ) cat.opac_visible(1); + cat.usr_summary( (usr_summary) ? 1 : 0 ); var req = new Request( SC_UPDATE.replace(/TYPE/,type), session, cat ); req.send(true); diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml index bfa76d69d1..bd6f419945 100644 --- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml @@ -129,6 +129,7 @@ &staff.server.admin.stat_cat.name.label; &staff.server.admin.stat_cat.owning_library.label; &staff.server.admin.stat_cat.opac_visibility.label; + &staff.server.admin.stat_cat.usr_summary.label; &staff.server.admin.stat_cat.entries.label; &staff.server.admin.stat_cat.add_entry; &staff.server.admin.stat_cat.edit; @@ -144,7 +145,10 @@ &staff.server.admin.stat_cat.on; &staff.server.admin.stat_cat.off; - + + &staff.server.admin.stat_cat.on; + &staff.server.admin.stat_cat.off; + + + +