From f6e8557ff23412a3a794a53db86f553a12f8a36c Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 12 Feb 2008 14:25:09 +0000 Subject: [PATCH] added basic ability to move picklist entries from one pl to another git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8728 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../oilsweb/oilsweb/controllers/acq/__init__.py | 6 ++- .../oilsweb/oilsweb/controllers/acq/picklist.py | 24 ++++++++++ .../public/oils/media/css/skin/default/acq.css | 4 ++ .../public/oils/media/css/theme/default/acq.css | 1 + .../default/acq/picklist/picklist_summary.html | 2 +- .../templates/oils/default/acq/picklist/view.html | 51 +++++++++++++++------- 6 files changed, 70 insertions(+), 18 deletions(-) diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py index 79d19771d4..4018f0b10b 100644 --- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py +++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py @@ -27,9 +27,13 @@ class AcqContext(SubContext): self.picklist = ContextItem() # picklist object self.picklist_list = ContextItem() # list of picklist objects - self.picklist_id_list = ContextItem(cgi_name='acq.pli') # list of picklist IDs + self.picklist_id_list = ContextItem(cgi_name='acq.plil', multi=True) # list of picklist IDs self.picklist_entry = ContextItem() # picklist_entry object self.picklist_name = ContextItem(cgi_name='acq.pln') + self.picklist_entry_id_list = ContextItem(cgi_name='acq.pleil', multi=True) + self.picklist_action = ContextItem(cgi_name='acq.pla') + self.picklist_source_id = ContextItem(cgi_name='acq.plsi') + self.picklist_dest_id = ContextItem(cgi_name='acq.pldi') self.currency_types = ContextItem() diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py index 1c9364ac22..29d90a9158 100644 --- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py +++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py @@ -15,6 +15,7 @@ class PicklistController(BaseController): pl_manager.retrieve() pl_manager.retrieve_entries(flesh_provider=True, offset=r.ctx.acq.offset, limit=r.ctx.acq.limit) r.ctx.acq.picklist = pl_manager.picklist + r.ctx.acq.picklist_list = pl_manager.retrieve_list() return r.render('acq/picklist/view.html') def create(self, **kwargs): @@ -83,3 +84,26 @@ class PicklistController(BaseController): entry = pl_manager.retrieve_entry(entry_id) pl_manager.delete_entry(entry_id) return redirect_to(controller='acq/picklist', action='view', id=entry.picklist()) + + def update(self): + r = RequestMgr() + ses = osrf.ses.ClientSession(oils.const.OILS_APP_ACQ) + ses.connect() + + if r.ctx.acq.picklist_action == 'move_selected': + for entry_id in r.ctx.acq.picklist_entry_id_list: + + entry = ses.request( + 'open-ils.acq.picklist_entry.retrieve', + r.ctx.core.authtoken, entry_id).recv().content() + entry = oils.event.Event.parse_and_raise(entry) + + entry.picklist(r.ctx.acq.picklist_dest_id) + + status = ses.request( + 'open-ils.acq.picklist_entry.update', + r.ctx.core.authtoken, entry).recv().content() + status = oils.event.Event.parse_and_raise(status) + + ses.disconnect() + return redirect_to(controller='acq/picklist', action='list') diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css index 8f7a31dd6a..266a1bf7ad 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css @@ -37,6 +37,10 @@ .oils-acq-picklist-records-phys_desc-row td { padding-left: 30px; } .oils-acq-picklist-records-phys_desc-row {} +#oils-acq-picklist-paging-block { width: 50%; text-align: left;} +#oils-acq-picklist-actions-block { width: 50%; text-align: right;} +#oils-acq-pikclist-header-subtable { width: 100%; } + #oils-acq-list-header { margin: 10px; width: 98%;} #oils-acq-list-header-label { float: left; } #oils-acq-list-header-create { float: right; } diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css index 3fce8b1272..e5fdc065f7 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css @@ -26,6 +26,7 @@ .oils-acq-picklist-picklist-td { border-style: solid; border-color: #A1A1A1; border-width: 0px 1px 0px 1px; } .oils-acq-picklist-records-service-td { font-size: 85%; } .oils-acq-picklist-entry-delete-link { font-size: 85%; } +#oils-acq-pikclist-header-subtable tr { border: none; } #oils-acq-list-header {border-bottom: 1px solid #6BA160;} #oils-acq-list-header-label { font-weight: bold; font-size: 110%; } diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html index dfe05c4786..be617a2426 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html @@ -3,7 +3,7 @@
<% meta = _("Create date %(date)s") % {"date":c.oils.acq.picklist.create_time()} - meta2 = _("Last update time %(date)s") % {"date":c.oils.acq.picklist.edit_time()} + meta2 = _("Last updated %(date)s") % {"date":c.oils.acq.picklist.edit_time()} %>
${meta}
${meta2}
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html index 6225f5a1f6..a786b32080 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html @@ -8,24 +8,42 @@ <%include file='picklist_summary.html'/> +
+ - @@ -44,7 +62,7 @@ ${entry.provider().name()} % endif - + @@ -61,4 +79,5 @@ % endfor
- <% - c.oils.acq.offset = int(c.oils.acq.offset) - c.oils.acq.limit = int(c.oils.acq.limit) - # set up the paging info - paging = _('Entries %(offset)s - %(limit)s') % { - 'offset': c.oils.acq.offset + 1, - 'limit': c.oils.acq.limit + c.oils.acq.offset - } - %> - ${paging} - % if c.oils.acq.offset > 0: - « - % endif - » + + + + +
+ <% + c.oils.acq.offset = int(c.oils.acq.offset) + c.oils.acq.limit = int(c.oils.acq.limit) + # set up the paging info + paging = _('Entries %(offset)s - %(limit)s') % { + 'offset': c.oils.acq.offset + 1, + 'limit': c.oils.acq.limit + c.oils.acq.offset + } + %> + ${paging} + % if c.oils.acq.offset > 0: + « + % endif + » + + + + +
+
-- 2.11.0