projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0fb586b)
added mockup for Physical Item Processing admin-screen
authorgfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Fri, 3 Apr 2009 01:30:56 +0000 (01:30 +0000)
committergfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Fri, 3 Apr 2009 01:30:56 +0000 (01:30 +0000)
Including a simple form for patron-item checkout.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@245 6d9bc8c9-1ec2-4278-b937-99fde70a366f

conifer/TODO patch | blob | history
conifer/static/main.css patch | blob | history
conifer/syrup/urls.py patch | blob | history
conifer/syrup/views.py patch | blob | history
conifer/templates/phys/checkout.xhtml [new file with mode: 0644] patch | blob
conifer/templates/phys/index.xhtml [new file with mode: 0644] patch | blob
conifer/templates/tabbar.xhtml patch | blob | history

diff --git a/conifer/TODO b/conifer/TODO
index 7ed6d55..3d86214 100644 (file)
--- a/conifer/TODO
+++ b/conifer/TODO
@@ -3,5 +3,7 @@
 
   * Update views.search() when this is in place.
 
-* ...
 
+* Import of reserves data from Leddy voyager. Laurentian, others?
+
+* Generating barcodes in emails, printable screens? (3 of 9 enough?)
diff --git a/conifer/static/main.css b/conifer/static/main.css
index 8fb8431..513f84d 100644 (file)
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -73,7 +73,7 @@ a:hover {  text-decoration: underline;  }
 /* actions (e.g. "edit user" link) */
 .action a { font-weight: bold; }
 
-#tabbar { margin: 18 0; padding: 0; width: 700; }
+#tabbar { margin: 18 0; padding: 0; }
 #tabbar li { display: inline; }
 #tabbar li a { padding: 18 18 4 18; background-color: #ddf; color: black; text-decoration: none; }
 #tabbar li a:hover { background-color: #fc8; }
diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index b294286..17cdb53 100644 (file)
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -39,11 +39,16 @@ urlpatterns = patterns('conifer.syrup.views',
     (ITEM_PREFIX + r'edit/$', 'item_edit'),
     (ITEM_PREFIX + r'add/$', 'item_add'), # for adding sub-things
     (ITEM_PREFIX + r'add/cat_search/$', 'item_add_cat_search'),
+
     (r'^admin/$', 'admin_index'),
     (r'^admin/terms/' + GENERIC_REGEX, 'admin_terms'),
     (r'^admin/depts/' + GENERIC_REGEX, 'admin_depts'),
     (r'^admin/news/' + GENERIC_REGEX, 'admin_news'),
     (r'^admin/targets/' + GENERIC_REGEX, 'admin_targets'),
+
+    (r'^phys/$', 'phys_index'),
+    (r'^phys/checkout/$', 'phys_checkout'),
+
     (r'^course/(?P<course_id>\d+)/reseq$', 'course_reseq'),
     (ITEM_PREFIX + r'reseq', 'item_heading_reseq'),
     (ITEM_PREFIX + r'relocate/', 'item_relocate'), # move to new subheading
diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index d293340..dbdb7dc 100644 (file)
--- a/conifer/syrup/views.py
+++ b/conifer/syrup/views.py
@@ -1209,3 +1209,14 @@ def item_relocate(request, course_id, item_id):
             return HttpResponseRedirect(course.course_url())
         
         
+
+#-----------------------------------------------------------------------------
+# Physical item processing
+
+@admin_only                     # fixme, is this the right permission?
+def phys_index(request):
+    return g.render('phys/index.xhtml')
+
+@admin_only                     # fixme, is this the right permission?
+def phys_checkout(request):
+    return g.render('phys/checkout.xhtml')
diff --git a/conifer/templates/phys/checkout.xhtml b/conifer/templates/phys/checkout.xhtml
new file mode 100644 (file)
index 0000000..67b7e56
--- /dev/null
+++ b/conifer/templates/phys/checkout.xhtml
@@ -0,0 +1,35 @@
+<?python
+title = _('Patron Checkout of Item')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+  <script>
+    $(function() { $('#patron').focus(); });
+  </script>
+</head>
+<body>
+  <h1>${title}</h1>
+  <form action="." method="POST">
+    <table>
+      <tr>
+       <th>Patron Barcode</th>
+       <td><input type="text" id="patron" name="patron" style="width: 400;"/></td>
+      </tr>
+      <tr>
+       <th>Item Barcode</th>
+       <td><input type="text" name="item" style="width: 400;"/></td>
+      </tr>
+      <tr>
+       <th/>
+       <td><input type="submit" value="Request Checkout"/></td>
+      </tr>
+    </table>
+      
+  </form>
+
+</body>
+</html>
diff --git a/conifer/templates/phys/index.xhtml b/conifer/templates/phys/index.xhtml
new file mode 100644 (file)
index 0000000..eb696c0
--- /dev/null
+++ b/conifer/templates/phys/index.xhtml
@@ -0,0 +1,25 @@
+<?python
+title = _('Physical Item Processing')
+?>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+<xi:include href="../master.xhtml"/>
+<head>
+  <title>${title}</title>
+</head>
+<body>
+  <h1>${title}</h1>
+  <h2>Patron assistance</h2>
+  <ul>
+    <li><a href="checkout/">Patron Checkout of Item</a></li>
+  </ul>
+
+  <h2>Circulations workflow</h2>
+  <ul>
+    <li><a href="circlist/">Notify Circulation of wanted items</a></li>
+    <li><a href="mark_arrived/">Mark items as Arrived</a></li>
+ </ul>
+
+</body>
+</html>
diff --git a/conifer/templates/tabbar.xhtml b/conifer/templates/tabbar.xhtml
index 2401282..ac0be18 100644 (file)
--- a/conifer/templates/tabbar.xhtml
+++ b/conifer/templates/tabbar.xhtml
@@ -11,15 +11,6 @@
   <li><a href="/syrup/browse/">Browse</a></li>
   <li class="active"><a href="/syrup/course/">My Courses</a></li>
   <li><a href="/syrup/admin/">Admin Options</a></li>
-    <!--
-        !RD had a concept of "joining" which i am
-        suppressing for now, our staff is definitely
-        not keen on the idea and my small focus group
-        think it's way too much too expect for this
-        library function.
-    -->
-  <!-- <li><a href="/syrup/join/">Join a Course</a></li> -->
-  <!-- <li><a href="/syrup">Add a Reserve</a></li> -->
-  <!-- <li><a href="/syrup">Manage Users</a></li> -->
+  <li><a href="/syrup/phys/">Physical Item Processing</a></li>
 </ul>
 </html>
Syrup working repo (MassLNC)