projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a10b10a)
added preliminary 'Notify circ of wanted items' screen.
authorgfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Thu, 7 May 2009 00:15:54 +0000 (00:15 +0000)
committergfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Thu, 7 May 2009 00:15:54 +0000 (00:15 +0000)
More work to be done on the backend query, as well as on the display
and possible export-format of data for circ.

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

conifer/static/main.css patch | blob | history
conifer/syrup/urls.py patch | blob | history
conifer/syrup/views/items.py patch | blob | history
conifer/templates/phys/circlist_for_term.xhtml [new file with mode: 0644] patch | blob
conifer/templates/phys/circlist_index.xhtml [new file with mode: 0644] patch | blob

diff --git a/conifer/static/main.css b/conifer/static/main.css
index 4cf795d..735db0f 100644 (file)
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -318,6 +318,7 @@ h2.metadata_subhead {font-size: 105%; padding: 0; margin: 18px 0 9px 0;}
     text-align: left; width: 120px;
 }
 .gap { height: 24px; }
+.metadata_table td { max-width: 800px; overflow: hidden; }
 
 /* panels that appear when specific OPTIONs or radio-buttons are selected. */
 .specific { padding: 8px; margin: 0 16px; background-color: #eef; }
diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index cbcf027..db5f854 100644 (file)
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -51,6 +51,7 @@ urlpatterns = patterns('conifer.syrup.views',
     (r'^phys/checkout/$', 'phys_checkout'),
     (r'^phys/mark_arrived/$', 'phys_mark_arrived'),
     (r'^phys/mark_arrived/match/$', 'phys_mark_arrived_match'),
+    (r'^phys/circlist/$', 'phys_circlist'),
 
     (r'^course/(?P<course_id>\d+)/reseq$', 'course_reseq'),
     (ITEM_PREFIX + r'reseq', 'item_heading_reseq'),
diff --git a/conifer/syrup/views/items.py b/conifer/syrup/views/items.py
index 230565f..0533213 100644 (file)
--- a/conifer/syrup/views/items.py
+++ b/conifer/syrup/views/items.py
@@ -481,3 +481,30 @@ def phys_mark_arrived_match(request):
             item.metadata_set.create(name='syrup:barcode', value=barcode)
             item.save()
     return g.render('phys/mark_arrived_outcome.xhtml')
+
+@admin_only
+def phys_circlist(request):
+    term_code = request.GET.get('term')
+    if not term_code:
+        terms = models.Term.objects.order_by('code')
+        return g.render('phys/circlist_index.xhtml', terms=terms)
+
+    term = get_object_or_404(models.Term, code=term_code)
+
+    # gather the list of wanted items for this term.
+    # Fixme, I need a better way.
+
+    cursor = django.db.connection.cursor()
+    q = "select item_id from syrup_metadata where name='syrup:barcode'"
+    cursor.execute(q)
+    bad_ids = set([r[0] for r in cursor.fetchall()])
+    cursor.close()
+
+    wanted = models.Item.objects.filter(
+        item_type='PHYS', course__term=term).select_related('metadata')
+    wanted = [w for w in wanted if w.id not in bad_ids]
+    return g.render('phys/circlist_for_term.xhtml', 
+                    term=term,
+                    wanted=wanted)
+    
+
diff --git a/conifer/templates/phys/circlist_for_term.xhtml b/conifer/templates/phys/circlist_for_term.xhtml
new file mode 100644 (file)
index 0000000..96ea362
--- /dev/null
+++ b/conifer/templates/phys/circlist_for_term.xhtml
@@ -0,0 +1,47 @@
+<?python
+title = _('Wanted items: %s') % term
+from conifer.libsystems.z3950.marcxml import marcxml_dictionary_to_dc as to_dublin
+dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']
+?>
+<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>
+
+<table class="pagetable">
+      <thead>
+       <tr><th>#</th><th>Title</th><th>Author</th><th>Publisher</th><th>PubDate</th></tr>
+      </thead>
+      <tbody py:for="resultnum, res in enumerate(w.marc() for w in wanted)"
+            py:with="dc=to_dublin(res)">
+       <tr>
+         <td>${resultnum+1}.</td>
+         <td>
+           ${dc.get('dc:title', '???')}
+           <a href="javascript:$('#full_${resultnum}').toggle(); void(0);">details</a>
+           <p py:if="res.get('8569')" style="margin: 8px 0; font-size: 90%; color: darkred;">
+             Electronic resource. <a href="${res.get('856u')}">view</a>
+           </p>
+         </td>
+         <td py:for="k in dc_keys[1:]">${dc.get(k) or '&mdash;'}</td>
+       </tr>
+       <tr id="full_${resultnum}" style="display: none;">
+         <td colspan="5" style="padding-left: 36;">
+           <table class="metadata_table">
+             <?python allkeys = res.keys(); allkeys.sort(); ?>
+             <tr py:for="k in allkeys">
+               <th>${k}</th><td>${res[k]}</td>
+             </tr>
+           </table>
+         </td>
+       </tr>
+      </tbody>
+    </table>
+
+</body>
+</html>
diff --git a/conifer/templates/phys/circlist_index.xhtml b/conifer/templates/phys/circlist_index.xhtml
new file mode 100644 (file)
index 0000000..363926a
--- /dev/null
+++ b/conifer/templates/phys/circlist_index.xhtml
@@ -0,0 +1,21 @@
+<?python
+title = _('Notify Circulation of wanted items')
+?>
+<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>
+  <p>Please select a term:</p>
+  <form action="." method="GET">
+    <select name="term">
+      <option py:for="term in terms" value="${term.code}">${term}</option>
+    </select>
+    <input type="submit" value="Continue"/>
+  </form>
+</body>
+</html>
Syrup working repo (MassLNC)