[open-ils-commits] r16762 - in trunk/Open-ILS: examples web/js/ui/default/acq/search web/opac/locale/en-US web/templates/default/acq/search xul/staff_client/chrome/content/main xul/staff_client/chrome/locale/en-US (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Jun 18 13:13:34 EDT 2010
Author: senator
Date: 2010-06-18 13:13:30 -0400 (Fri, 18 Jun 2010)
New Revision: 16762
Modified:
trunk/Open-ILS/examples/fm_IDL.xml
trunk/Open-ILS/web/js/ui/default/acq/search/unified.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/web/templates/default/acq/search/unified.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
trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
Log:
Acq: more menu reorganization
New entry points to selection list, PO, and invoice interfaces. Also replaced
visible references to "Pick List" with "Selection List" wherever I could think
of, for consistency's sake.
Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/examples/fm_IDL.xml 2010-06-18 17:13:30 UTC (rev 16762)
@@ -5559,9 +5559,9 @@
</permacrud>
</class>
- <class id="acqpl" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::picklist" oils_persist:tablename="acq.picklist" reporter:label="Pick List">
+ <class id="acqpl" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::picklist" oils_persist:tablename="acq.picklist" reporter:label="Selection List">
<fields oils_persist:primary="id" oils_persist:sequence="acq.picklist_id_seq">
- <field reporter:label="Picklist ID" name="id" reporter:datatype="id" reporter:selector='name' />
+ <field reporter:label="Selection List ID" name="id" reporter:datatype="id" reporter:selector='name' />
<field reporter:label="Owner" name="owner" reporter:datatype="link" />
<field reporter:label="Org Unit" name="org_unit" reporter:datatype="org_unit" />
<field reporter:label="Name" name="name" reporter:datatype="text" oils_persist:i18n="true" />
@@ -5760,7 +5760,7 @@
<fields oils_persist:primary="id" oils_persist:sequence="acq.lineitem_id_seq">
<field reporter:label="Lineitem ID" name="id" reporter:datatype="id" />
<field reporter:label="Selecting User" name="selector" reporter:datatype="link" />
- <field reporter:label="Picklist" name="picklist" reporter:datatype="link" />
+ <field reporter:label="Selection List" name="picklist" reporter:datatype="link" />
<field reporter:label="Purchase Order" name="purchase_order" reporter:datatype="link" />
<field reporter:label="Provider" name="provider" reporter:datatype="link" />
<field reporter:label="Creation Time" name="create_time" reporter:datatype="timestamp" />
@@ -5821,7 +5821,7 @@
<field reporter:label="Selector" name="selector" reporter:datatype="link"/>
<field reporter:label="Provider" name="provider" reporter:datatype="link"/>
<field reporter:label="Purchase Order" name="purchase_order" reporter:datatype="link"/>
- <field reporter:label="Picklist" name="picklist" reporter:datatype="link"/>
+ <field reporter:label="Selection List" name="picklist" reporter:datatype="link"/>
<field reporter:label="Expected Receive Time" name="expected_recv_time" reporter:datatype="timestamp"/>
<field reporter:label="Create Time" name="create_time" reporter:datatype="timestamp"/>
<field reporter:label="Edit Time" name="edit_time" reporter:datatype="timestamp"/>
Modified: trunk/Open-ILS/web/js/ui/default/acq/search/unified.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/search/unified.js 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/web/js/ui/default/acq/search/unified.js 2010-06-18 17:13:30 UTC (rev 16762)
@@ -791,20 +791,58 @@
function URIManager() {
var self = this;
+ this.cannedSearches = {
+ "po": {
+ "search_object": {
+ "acqpo": [
+ {"ordering_agency": openils.User.user.ws_ou()},
+ {"state": "on-order"}
+ ]
+ },
+ "result_type": "purchase_order",
+ "conjunction": "and"
+ },
+ "pl": {
+ "search_object": {
+ "acqpl": [
+ {"owner": openils.User.user.usrname()}
+ ]
+ },
+ "result_type": "picklist",
+ "conjunction": "and"
+ },
+ "inv": {
+ "search_object": {
+ "acqinv": [
+ {"complete": "f"},
+ {"receiver": openils.User.user.ws_ou()}
+ ]
+ },
+ "result_type": "invoice",
+ "conjunction": "and"
+ }
+ };
- this.search_object = cgi.param("so");
- if (this.search_object)
- this.search_object = base64Decode(this.search_object);
-
- this.result_type = cgi.param("rt");
- if (this.result_type) {
+ if (this.canned = cgi.param("ca")) { /* assignment */
+ dojo.mixin(this, this.cannedSearches[this.canned]);
dojo.byId("acq-unified-result-type").setValue(this.result_type);
dojo.byId("acq-unified-result-type").onchange();
+ dojo.byId("acq-unified-conjunction").setValue(this.conjunction);
+ } else {
+ this.search_object = cgi.param("so");
+ if (this.search_object)
+ this.search_object = base64Decode(this.search_object);
+
+ this.result_type = cgi.param("rt");
+ if (this.result_type) {
+ dojo.byId("acq-unified-result-type").setValue(this.result_type);
+ dojo.byId("acq-unified-result-type").onchange();
+ }
+
+ this.conjunction = cgi.param("c");
+ if (this.conjunction)
+ dojo.byId("acq-unified-conjunction").setValue(this.conjunction);
}
-
- this.conjunction = cgi.param("c");
- if (this.conjunction)
- dojo.byId("acq-unified-conjunction").setValue(this.conjunction);
}
/* onload */
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-18 17:13:30 UTC (rev 16762)
@@ -820,22 +820,26 @@
<!ENTITY staff.main.menu.acq.accesskey "A">
<!ENTITY staff.main.menu.acq.create_invoice.label "New Invoice">
<!ENTITY staff.main.menu.acq.create_invoice.accesskey "N">
-<!ENTITY staff.main.menu.acq.picklist.label "Selection Lists">
-<!ENTITY staff.main.menu.acq.picklist.accesskey "L">
+
+<!ENTITY staff.main.menu.acq.search.label "Search">
+<!ENTITY staff.main.menu.acq.search.accesskey "S">
+<!ENTITY staff.main.menu.acq.unified_search.label "Acquisitions Search">
+<!ENTITY staff.main.menu.acq.unified_search.accesskey "A">
+<!ENTITY staff.main.menu.acq.view_my_pl.label "My Selection Lists">
+<!ENTITY staff.main.menu.acq.view_my_pl.accesskey "L">
+<!ENTITY staff.main.menu.acq.view_local_po.label "Local Purchase Orders">
+<!ENTITY staff.main.menu.acq.view_local_po.accesskey "P">
+<!ENTITY staff.main.menu.acq.view_local_inv.label "Local Invoices">
+<!ENTITY staff.main.menu.acq.view_local_inv.accesskey "I">
<!ENTITY staff.main.menu.acq.bib_search.label "Title Search">
<!ENTITY staff.main.menu.acq.bib_search.accesskey "T">
+
<!ENTITY staff.main.menu.acq.from_bib.label "Import Catalog Records by ID">
<!ENTITY staff.main.menu.acq.from_bib.accesskey "I">
-<!ENTITY staff.main.menu.acq.unified_search.label "Acquisitions Search">
-<!ENTITY staff.main.menu.acq.unified_search.accesskey "A">
<!ENTITY staff.main.menu.acq.brief_record.label "New Brief Record">
<!ENTITY staff.main.menu.acq.brief_record.accesskey "B">
<!ENTITY staff.main.menu.acq.upload.label "Load Order Record">
<!ENTITY staff.main.menu.acq.upload.accesskey "O">
-<!ENTITY staff.main.menu.acq.po.label "Purchase Orders">
-<!ENTITY staff.main.menu.acq.po.accesskey "P">
-<!ENTITY staff.main.menu.acq.po_events.label "Purchase Order Events">
-<!ENTITY staff.main.menu.acq.po_events.accesskey "E">
<!ENTITY staff.main.menu.acq.user_requests.label "User Requests">
<!ENTITY staff.main.menu.acq.user_requests.accesskey "R">
<!ENTITY staff.main.menu.acq.claim_eligible.label "Claim-Eligible Items">
Modified: trunk/Open-ILS/web/templates/default/acq/search/unified.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/search/unified.tt2 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/web/templates/default/acq/search/unified.tt2 2010-06-18 17:13:30 UTC (rev 16762)
@@ -27,7 +27,7 @@
<option value="lineitem_and_bib">
line items & catalog records
</option>
- <option value="picklist">pick lists</option>
+ <option value="picklist">selection lists</option>
<option value="purchase_order">purchase orders</option>
<option value="invoice">invoices</option>
</select>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-06-18 17:13:30 UTC (rev 16762)
@@ -780,17 +780,17 @@
['oncommand'],
function() { open_eg_web_page('acq/invoice/view?create=1', 'menu.cmd_acq_create_invoice.tab'); }
],
- 'cmd_acq_view_picklist' : [
+ 'cmd_acq_view_my_pl' : [
['oncommand'],
- function() { open_eg_web_page('acq/picklist/list', 'menu.cmd_acq_view_picklist.tab'); }
+ function() { open_eg_web_page('acq/search/unified?ca=pl', 'menu.cmd_acq_unified_search.tab'); }
],
- 'cmd_acq_view_po' : [
+ 'cmd_acq_view_local_po' : [
['oncommand'],
- function() { open_eg_web_page('acq/po/search', 'menu.cmd_acq_view_po.tab'); }
+ function() { open_eg_web_page('acq/search/unified?ca=po', 'menu.cmd_acq_unified_search.tab'); }
],
- 'cmd_acq_view_po_events' : [
+ 'cmd_acq_view_local_inv' : [
['oncommand'],
- function() { open_eg_web_page('acq/po/events', 'menu.cmd_acq_view_po_events.tab'); }
+ function() { open_eg_web_page('acq/search/unified?ca=inv', 'menu.cmd_acq_unified_search.tab'); }
],
'cmd_acq_user_requests' : [
['oncommand'],
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-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-06-18 17:13:30 UTC (rev 16762)
@@ -78,10 +78,10 @@
<command id="cmd_open_vandelay" />
<command id="cmd_acq_create_invoice" />
- <!-- <command id="cmd_acq_view_picklist" /> -->
+ <command id="cmd_acq_view_my_pl" />
+ <command id="cmd_acq_view_local_po" />
+ <command id="cmd_acq_view_local_inv" />
<command id="cmd_acq_upload" />
- <command id="cmd_acq_view_po" />
- <!-- <command id="cmd_acq_view_po_events" /> -->
<command id="cmd_acq_user_requests" />
<command id="cmd_acq_bib_search" />
<command id="cmd_acq_unified_search" />
@@ -268,16 +268,22 @@
<!-- The Acquisitions menu on the main menu -->
<menu id="main.menu.acq" label="&staff.main.menu.acq.label;" accesskey="&staff.main.menu.acq.accesskey;">
<menupopup id="main.menu.acq.popup">
- <menuitem label="&staff.main.menu.acq.unified_search.label;" accesskey="&staff.main.menu.acq.unified_search.accesskey;" command="cmd_acq_unified_search"/>
- <menuitem label="&staff.main.menu.acq.bib_search.label;" accesskey="&staff.main.menu.acq.bib_search.accesskey;" command="cmd_acq_bib_search"/>
+ <menu id="main.menu.acq.search" label="&staff.main.menu.acq.search.label;" accesskey="&staff.main.menu.acq.search.accesskey;">
+ <menupopup id="main.menu.acq.search.popup">
+ <menuitem label="&staff.main.menu.acq.unified_search.label;" accesskey="&staff.main.menu.acq.unified_search.accesskey;" command="cmd_acq_unified_search"/>
+ <menuseparator />
+ <menuitem label="&staff.main.menu.acq.view_my_pl.label;" accesskey="&staff.main.menu.acq.view_my_pl.accesskey;" command="cmd_acq_view_my_pl"/>
+ <menuitem label="&staff.main.menu.acq.view_local_po.label;" accesskey="&staff.main.menu.acq.view_local_po.accesskey;" command="cmd_acq_view_local_po"/>
+ <menuitem label="&staff.main.menu.acq.view_local_inv.label;" accesskey="&staff.main.menu.acq.view_local_inv.accesskey;" command="cmd_acq_view_local_inv"/>
+ <menuseparator />
+ <menuitem label="&staff.main.menu.acq.bib_search.label;" accesskey="&staff.main.menu.acq.bib_search.accesskey;" command="cmd_acq_bib_search"/>
+ </menupopup>
+ </menu>
<menuitem label="&staff.main.menu.acq.from_bib.label;" accesskey="&staff.main.menu.acq.from_bib.accesskey;" command="cmd_acq_from_bib"/>
- <!-- <menuitem label="&staff.main.menu.acq.po.label;" accesskey="&staff.main.menu.acq.po.accesskey;" command="cmd_acq_view_po" /> -->
- <!-- <menuitem label="&staff.main.menu.acq.picklist.label;" accesskey="&staff.main.menu.acq.picklist.accesskey;" command="cmd_acq_view_picklist"/> -->
<menuseparator />
<menuitem label="&staff.main.menu.acq.create_invoice.label;" accesskey="&staff.main.menu.acq.create_invoice.accesskey;" command="cmd_acq_create_invoice"/>
<menuitem label="&staff.main.menu.acq.upload.label;" accesskey="&staff.main.menu.acq.upload.accesskey;" command="cmd_acq_upload"/>
<menuitem label="&staff.main.menu.acq.brief_record.label;" accesskey="&staff.main.menu.acq.brief_record.accesskey;" command="cmd_acq_new_brief_record"/>
- <!-- <menuitem label="&staff.main.menu.acq.po_events.label;" accesskey="&staff.main.menu.acq.po_events.accesskey;" command="cmd_acq_view_po_events" /> -->
<menuitem label="&staff.main.menu.acq.user_requests.label;" accesskey="&staff.main.menu.acq.user_requests.accesskey;" command="cmd_acq_user_requests" />
<menuseparator />
<menuitem label="&staff.main.menu.acq.claim_eligible.label;" accesskey="&staff.main.menu.acq.claim_eligible.accesskey;" command="cmd_acq_claim_eligible" />
Modified: trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2010-06-18 16:55:57 UTC (rev 16761)
+++ trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2010-06-18 17:13:30 UTC (rev 16762)
@@ -225,13 +225,11 @@
menu.cmd_local_admin_cash_reports.tab=Cash Reports
menu.cmd_local_admin_transit_list.tab=Transits
menu.cmd_acq_create_invoice.tab=New Invoice
-menu.cmd_acq_view_picklist.tab=Selection Lists
menu.cmd_acq_bib_search.tab=Title Search
menu.cmd_acq_from_bib.tab=Import Catalog Records
menu.cmd_acq_unified_search.tab=Acquisitions Search
menu.cmd_acq_upload.tab=Load Order Record
menu.cmd_acq_new_brief_record.tab=New Brief Record
-menu.cmd_acq_view_po.tab=Purchase Orders
menu.cmd_acq_view_po_events.tab=Purchase Order Events
menu.cmd_acq_user_requests.tab=User Requests
menu.cmd_acq_claim_eligible.tab=Claim-Eligible Items
More information about the open-ils-commits
mailing list