[open-ils-commits] r16246 - in trunk/Open-ILS: examples web/js/ui/default/acq/common web/js/ui/default/conify/global/acq web/opac/locale/en-US web/templates/default/acq/common web/templates/default/conify/global/acq xul/staff_client/chrome/content/main (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu Apr 15 17:29:33 EDT 2010
Author: senator
Date: 2010-04-15 17:29:27 -0400 (Thu, 15 Apr 2010)
New Revision: 16246
Added:
trunk/Open-ILS/web/js/ui/default/conify/global/acq/claim_grid.js
trunk/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2
Modified:
trunk/Open-ILS/examples/fm_IDL.xml
trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Log:
Acq: admin interfaces for claims objects, link to claim policy from LI table
Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/examples/fm_IDL.xml 2010-04-15 21:29:27 UTC (rev 16246)
@@ -6156,12 +6156,18 @@
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <create permission="ADMIN_ACQ_CLAIM_TYPE" context_field="org_unit"/>
+ <retrieve permission="ADMIN_ACQ_CLAIM_TYPE ADMIN_ACQ_CLAIM VIEW_CLAIM MANAGE_CLAIM" context_field="org_unit"/>
+ <update permission="ADMIN_ACQ_CLAIM_TYPE" context_field="org_unit"/>
+ <delete permission="ADMIN_ACQ_CLAIM_TYPE" context_field="org_unit"/>
+ </actions>
</permacrud>
</class>
<class id="acqclet" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::claim_event_type" oils_persist:tablename="acq.claim_event_type" reporter:label="Claim Event Type">
<fields oils_persist:primary="id" oils_persist:sequence="acq.claim_event_type_id_seq">
- <field reporter:label="Claim Event Type ID" name="id" reporter:datatype="id"/>
+ <field reporter:label="Claim Event Type ID" name="id" reporter:datatype="id" reporter:selector="code" />
<field reporter:label="Org Unit" name="org_unit" reporter:datatype="org_unit"/>
<field reporter:label="Code" name="code" reporter:datatype="text"/>
<field reporter:label="Description" name="description" reporter:datatype="text"/>
@@ -6171,6 +6177,12 @@
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ <actions>
+ <create permission="ADMIN_ACQ_CLAIM_EVENT_TYPE" context_field="org_unit"/>
+ <retrieve permission="ADMIN_ACQ_CLAIM_EVENT_TYPE ADMIN_ACQ_CLAIM VIEW_CLAIM MANAGE_CLAIM" context_field="org_unit"/>
+ <update permission="ADMIN_ACQ_CLAIM_EVENT_TYPE" context_field="org_unit"/>
+ <delete permission="ADMIN_ACQ_CLAIM_EVENT_TYPE" context_field="org_unit"/>
+ </actions>
</permacrud>
</class>
@@ -6231,7 +6243,7 @@
<field reporter:label="ID" name="id" reporter:datatype="id" reporter:selector="action"/>
<field reporter:label="Claim Policy ID" name="claim_policy" reporter:datatype="link"/>
<field reporter:label="Action Interval" name="action_interval" reporter:datatype="interval"/>
- <field reporter:label="Action" name="action" reporter:datatype="link"/>
+ <field reporter:label="Action (Event Type)" name="action" reporter:datatype="link"/>
</fields>
<links>
<link field="claim_policy" reltype="has_a" key="id" map="" class="acqclp"/>
Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-04-15 21:29:27 UTC (rev 16246)
@@ -220,6 +220,15 @@
this.updateLiNotesCount(li, row);
+ if (li.claim_policy()) {
+ var actViewInvoice = nodeByName("action_view_claim_policy", row);
+ actViewInvoice.disabled = false;
+ actViewInvoice.onclick = function() {
+ location.href = oilsBasePath + "/conify/global/acq/claim_policy/" +
+ li.claim_policy();
+ };
+ }
+
// show which PO this lineitem is a member of
if(li.purchase_order() && !this.isPO) {
var po =
Added: trunk/Open-ILS/web/js/ui/default/conify/global/acq/claim_grid.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/acq/claim_grid.js (rev 0)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/acq/claim_grid.js 2010-04-15 21:29:27 UTC (rev 16246)
@@ -0,0 +1,35 @@
+dojo.require("openils.widget.AutoGrid");
+dojo.require("openils.widget.OrgUnitFilteringSelect");
+
+var owner;
+
+function prepareOwnerSelector(perm) {
+ new openils.User().buildPermOrgSelector(
+ perm,
+ ownerSelect,
+ null,
+ function() {
+ dojo.connect(
+ ownerSelect,
+ "onChange",
+ function() {
+ owner = fieldmapper.aou.findOrgUnit(this.attr("value"));
+ grid.resetStore();
+ populateGrid();
+ }
+ );
+ }
+ );
+}
+
+function populateGrid(id) {
+ var search = typeof(ownerSelect) == "undefined" ? {"id": {"!=": null}} : {
+ "org_unit": fieldmapper.aou.orgNodeTrail(
+ owner || fieldmapper.aou.findOrgUnit(openils.User.user.ws_ou()),
+ true /* asId */
+ )
+ };
+ if (id) search.id = id;
+
+ grid.loadAll(null, search);
+}
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-04-15 21:29:27 UTC (rev 16246)
@@ -696,6 +696,14 @@
<!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.accesskey "F">
<!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.label "Cancel Reasons">
<!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey "C">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_type.label "Claim Types">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_type.accesskey "T">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_event_type.label "Claim Event Types">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_event_type.accesskey "E">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.label "Claim Policies">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.accesskey "P">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.label "Claim Policy Actions">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey "A">
<!ENTITY staff.main.menu.admin.server_admin.booking.label "Booking">
<!ENTITY staff.main.menu.admin.server_admin.booking.accesskey "B">
Modified: trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2 2010-04-15 21:29:27 UTC (rev 16246)
@@ -77,6 +77,7 @@
<td style='width:70%;font-weight:bold;'>
<a attr='title' href='javascript:void(0);'></a>
<span name="worksheet">(<a name="worksheet_link" href="javascript:void(0);">✍</a>)</span>
+ <span name="claim_policy" class="hidden">(Claim Policy: <a name="claim_policy_link" href="javascript:void(0);"></a>)</span>
<span name='pl' class='hidden'>(<a name='pl_link' href='javascript:void(0);'></a>)</span>
<span name='po' class='hidden'>(<a name='po_link' href='javascript:void(0);'>PO</a>)</span>
</td>
@@ -111,6 +112,7 @@
<option name='action_new_invoice' disabled='disabled'>New Invoice</option>
<option name='action_link_invoice' disabled='disabled'>Link to Invoice</option>
<option name='action_view_invoice' disabled='disabled'>View Invoice(s)</option>
+ <option name='action_view_claim_policy' disabled='disabled'>View Claim Policy</option>
</select>
</td>
<td><span name='li_state'></span></td>
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/claim_event_type.tt2 2010-04-15 21:29:27 UTC (rev 16246)
@@ -0,0 +1,41 @@
+[% WRAPPER default/base.tt2 %]
+<script src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script>
+openils.Util.addOnLoad(
+ function() {
+ prepareOwnerSelector("ADMIN_ACQ_CLAIM_EVENT_TYPE");
+ populateGrid();
+ }
+);
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane"
+ layoutAlign="top" class="oils-header-panel">
+ <div>Claim Event Types</div>
+ <div>
+ <button onclick="grid.showCreateDialog()">
+ New Claim Event Type
+ </button>
+ <button onclick="grid.deleteSelected()">Delete Selected</button>
+ </div>
+ </div>
+ <div class="oils-acq-basic-roomy">
+ <span>Show claim event types available to</span>
+ <select
+ dojoType="openils.widget.OrgUnitFilteringSelect"
+ jsId="ownerSelect" searchAttr="shortname"
+ labelAttr="shortname">
+ </select>
+ </div>
+ <table jsId="grid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['code', 'org_unit', 'description']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ defaultCellWidth="20"
+ fmClass="acqclet"
+ showPaginator="true"
+ editOnEnter="true">
+ </table>
+</div>
+[% END %]
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy.tt2 2010-04-15 21:29:27 UTC (rev 16246)
@@ -0,0 +1,39 @@
+[% WRAPPER default/base.tt2 %]
+<script src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script>
+openils.Util.addOnLoad(
+ function() {
+ prepareOwnerSelector("ADMIN_CLAIM_POLICY");
+ populateGrid("[% ctx.page_args.0 %]");
+ }
+);
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane"
+ layoutAlign="top" class="oils-header-panel">
+ <div>Claim Policies</div>
+ <div>
+ <button onclick="grid.showCreateDialog()">New Claim Policy</button>
+ <button onclick="grid.deleteSelected()">Delete Selected</button>
+ </div>
+ </div>
+ <div class="oils-acq-basic-roomy">
+ <span>Show claim policies available to</span>
+ <select
+ dojoType="openils.widget.OrgUnitFilteringSelect"
+ jsId="ownerSelect" searchAttr="shortname"
+ labelAttr="shortname">
+ </select>
+ </div>
+ <table jsId="grid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['name', 'org_unit', 'description']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ defaultCellWidth="20"
+ fmClass="acqclp"
+ showPaginator="true"
+ editOnEnter="true">
+ </table>
+</div>
+[% END %]
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/claim_policy_action.tt2 2010-04-15 21:29:27 UTC (rev 16246)
@@ -0,0 +1,32 @@
+[% WRAPPER default/base.tt2 %]
+<script src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script>
+openils.Util.addOnLoad(
+ function() {
+ /* XXX TODO support URI param for claim_policy search constraint */
+ populateGrid();
+ }
+);
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane"
+ layoutAlign="top" class="oils-header-panel">
+ <div>Claim Policy Actions</div>
+ <div>
+ <button onclick="grid.showCreateDialog()">
+ New Claim Policy Action
+ </button>
+ <button onclick="grid.deleteSelected()">Delete Selected</button>
+ </div>
+ </div>
+ <table jsId="grid"
+ dojoType="openils.widget.AutoGrid"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ defaultCellWidth="20"
+ fmClass="acqclpa"
+ showPaginator="true"
+ editOnEnter="true">
+ </table>
+</div>
+[% END %]
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/claim_type.tt2 2010-04-15 21:29:27 UTC (rev 16246)
@@ -0,0 +1,39 @@
+[% WRAPPER default/base.tt2 %]
+<script src="[% ctx.media_prefix %]/js/ui/default/conify/global/acq/claim_grid.js"></script>
+<script>
+openils.Util.addOnLoad(
+ function() {
+ prepareOwnerSelector("ADMIN_ACQ_CLAIM_TYPE");
+ populateGrid();
+ }
+);
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+ <div dojoType="dijit.layout.ContentPane"
+ layoutAlign="top" class="oils-header-panel">
+ <div>Claim Types</div>
+ <div>
+ <button onclick="grid.showCreateDialog()">New Claim Type</button>
+ <button onclick="grid.deleteSelected()">Delete Selected</button>
+ </div>
+ </div>
+ <div class="oils-acq-basic-roomy">
+ <span>Show claim types available to</span>
+ <select
+ dojoType="openils.widget.OrgUnitFilteringSelect"
+ jsId="ownerSelect" searchAttr="shortname"
+ labelAttr="shortname">
+ </select>
+ </div>
+ <table jsId="grid"
+ dojoType="openils.widget.AutoGrid"
+ fieldOrder="['code', 'org_unit', 'description']"
+ suppressFields="['id']"
+ query="{id: '*'}"
+ defaultCellWidth="20"
+ fmClass="acqclt"
+ showPaginator="true"
+ editOnEnter="true">
+ </table>
+</div>
+[% END %]
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-04-15 21:29:27 UTC (rev 16246)
@@ -667,6 +667,22 @@
['oncommand'],
function() { open_eg_web_page('conify/global/acq/cancel_reason'); }
],
+ 'cmd_server_admin_acq_claim_type' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/acq/claim_type'); }
+ ],
+ 'cmd_server_admin_acq_claim_event_type' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/acq/claim_event_type'); }
+ ],
+ 'cmd_server_admin_acq_claim_policy' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/acq/claim_policy'); }
+ ],
+ 'cmd_server_admin_acq_claim_policy_action' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/acq/claim_policy_action'); }
+ ],
'cmd_server_admin_z39_source' : [
['oncommand'],
function() { open_eg_web_page('conify/global/config/z3950_source'); }
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-04-15 20:10:35 UTC (rev 16245)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-04-15 21:29:27 UTC (rev 16246)
@@ -133,6 +133,10 @@
<command id="cmd_server_admin_acq_cancel_reason"/>
<command id="cmd_server_admin_acq_lineitem_alert"/>
<command id="cmd_server_admin_acq_fund_tag"/>
+ <command id="cmd_server_admin_acq_claim_type"/>
+ <command id="cmd_server_admin_acq_claim_event_type"/>
+ <command id="cmd_server_admin_acq_claim_policy"/>
+ <command id="cmd_server_admin_acq_claim_policy_action"/>
<command id="cmd_server_admin_z39_source"/>
<command id="cmd_server_admin_circ_mod"/>
<command id="cmd_server_admin_org_unit_setting_type"/>
@@ -357,6 +361,11 @@
<menuitem label="&staff.main.menu.admin.server_admin.acq.lineitem_alert.label;" accesskey="&staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey;" command="cmd_server_admin_acq_lineitem_alert"/>
<menuitem label="&staff.main.menu.admin.server_admin.acq.fund_tag.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund_tag.accesskey;" command="cmd_server_admin_acq_fund_tag"/>
<menuitem label="&staff.main.menu.admin.server_admin.acq.cancel_reason.label;" accesskey="&staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey;" command="cmd_server_admin_acq_cancel_reason"/>
+ <menuseparator />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_type.accesskey;" command="cmd_server_admin_acq_claim_type"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_event_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_event_type.accesskey;" command="cmd_server_admin_acq_claim_event_type"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy.accesskey;" command="cmd_server_admin_acq_claim_policy"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy_action.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey;" command="cmd_server_admin_acq_claim_policy_action"/>
</menupopup>
</menu>
<menu id="main.menu.admin.server.booking" label="&staff.main.menu.admin.server_admin.booking.label;" accesskey="&staff.main.menu.admin.server_admin.booking.accesskey;">
More information about the open-ils-commits
mailing list