Changeset 9443

Timestamp:

04/23/08 20:38:57 (3 weeks ago)

Author:

erickson

Message:

Merged revisions 9437,9440-9442 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9437 | erickson | 2008-04-22 22:50:31 -0400 (Tue, 22 Apr 2008) | 1 line

fixed what appears to be some copy paste errors. no longer requiring kwargs to be non-null on User create

........

r9440 | miker | 2008-04-23 08:23:10 -0400 (Wed, 23 Apr 2008) | 1 line

adding helper views for overdue, running and pending reports

........

r9441 | erickson | 2008-04-23 11:13:45 -0400 (Wed, 23 Apr 2008) | 4 lines

Removing dead code and their makefile counterparts

........

r9442 | miker | 2008-04-23 13:17:15 -0400 (Wed, 23 Apr 2008) | 1 line

adding translation for description

........

Location:

branches/acq-experiment

Files:

• . (modified) (1 prop)
• Open-ILS/src/Makefile (modified) (2 diffs)
• Open-ILS/src/apachemods/Makefile (modified) (3 diffs)
• Open-ILS/src/apachemods/fieldmapper_lookup-gen.pl (deleted)
• Open-ILS/src/apachemods/fieldmapper_lookup.h (deleted)
• Open-ILS/src/apachemods/json_xml.c (deleted)
• Open-ILS/src/apachemods/json_xml.h (deleted)
• Open-ILS/src/apachemods/mod_xmlbuilder.h (deleted)
• Open-ILS/src/sql/Pg/reporter-schema.sql (modified) (1 diff)
• Open-ILS/web/conify/global/permission/perm_list.html (modified) (1 diff)
• Open-ILS/web/conify/global/permission/perm_list.js (modified) (1 diff)
• Open-ILS/web/js/dojo/openils/User.js (modified) (3 diffs)

branches/acq-experiment/Open-ILS/src/Makefile

@@ -36 +36 @@
         @echo $@
         make -C apachemods mod_xmlent.so
-
-oils_cgi:
-        @echo $@
-        make -C apachemods oils_cgi.so
-
-oils_cgi-install:
-        @echo $@
-        make -C apachemods oils_cgi-install
 
 mod_xmlent-install:
@@ -92 +84 @@
         
 
-libfieldmapper: 
-        make -C apachemods libfieldmapper.so
-
-libfieldmapper-install: 
-        make -C apachemods libfieldmapper-install
-
 c_apps:
         @echo $@

branches/acq-experiment/Open-ILS/src/apachemods/Makefile

@@ -1 @@
-
 LDLIBS  += -lxml2 -lopensrf -lxslt
 
-all:    mod_xmlent.so libfieldmapper.so
+all:    mod_xmlent.so
 
-install: libfieldmapper-install mod_xmlent-install
-
-
-apachetools.o: 
-        cp ../../../OpenSRF/src/gateway/apachetools.o .
-
-json_xml.o:     json_xml.c json_xml.h
-
-fieldmapper_lookup.o:   fieldmapper_lookup.c fieldmapper_lookup.h 
-
-
-fieldmapper_lookup.c:   
-        ./fieldmapper_lookup-gen.pl fieldmapper_lookup.c
-
+install: mod_xmlent-install
 
 mod_xmlent.o:   mod_xmlent.c
@@ -23 +9 @@
         @echo $@
         $(CC) $(LDFLAGS) $(LDLIBS) -shared -W1 mod_xmlent.o -lexpat -o $@
-
-
-# ------------------------------------------------------
-
-libfieldmapper.so:      fieldmapper_lookup.o
-        @echo $@
-        mkdir -p $(TMPDIR)/openils/
-        cp fieldmapper_lookup.h $(TMPDIR)/openils/
-        $(CC) $(LDFLAGS) $(LDLIBS) -shared -W1 fieldmapper_lookup.o -o $@
-        cp libfieldmapper.so $(TMPDIR)/libfieldmapper.so
-
-# ------------------------------------------------------
-
-
-libfieldmapper-install: libfieldmapper.so
-        echo installing libfieldmapper.so
-        mkdir -p $(INCDIR)/
-        @echo "Copying fieldmapper_lookup.h to $(INCDIR)"
-        cp fieldmapper_lookup.h $(INCDIR)/
-        cp libfieldmapper.so $(LIBDIR)/libfieldmapper.so
-
 
 mod_xmlent-install:
@@ -52 +17 @@
         echo $@
         /bin/rm -f *.o *.so 
-        /bin/rm -f fieldmapper_lookup.c
-
-

branches/acq-experiment/Open-ILS/src/sql/Pg/reporter-schema.sql

@@ -214 +214 @@
         AND due_date < now();
 
+CREATE OR REPLACE VIEW reporter.overdue_reports AS
+ SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
+   FROM reporter.schedule s
+   JOIN reporter.report r ON r.id = s.report
+   JOIN actor.usr u ON s.runner = u.id
+   JOIN actor.card c ON c.id = u.card
+  WHERE s.start_time IS NULL AND s.run_time < now();
+
+CREATE OR REPLACE VIEW reporter.pending_reports AS
+ SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
+   FROM reporter.schedule s
+   JOIN reporter.report r ON r.id = s.report
+   JOIN actor.usr u ON s.runner = u.id
+   JOIN actor.card c ON c.id = u.card
+  WHERE s.start_time IS NULL;
+
+CREATE OR REPLACE VIEW reporter.currently_running AS
+ SELECT s.id, c.barcode AS runner_barcode, r.name, s.run_time, s.run_time - now() AS scheduled_wait_time
+   FROM reporter.schedule s
+   JOIN reporter.report r ON r.id = s.report
+   JOIN actor.usr u ON s.runner = u.id
+   JOIN actor.card c ON c.id = u.card
+  WHERE s.start_time IS NOT NULL AND s.complete_time IS NULL;
+
 COMMIT;
 

branches/acq-experiment/Open-ILS/web/conify/global/permission/perm_list.html

@@ -89 +89 @@
                                                         {       cells : [
                                                                         [
-                                                                                { name : "Code",        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit },
-                                                                                { name : "Description", field : "description", width : "auto",  editor : dojox.grid.editors.Editor }
+                                                                                { name : "Code",        field : "code",        width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" },
+                                                                                { name : "Description", field : "description", width : "auto",  editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }
+                                                                        ],
+                                                                        [
+                                                                                { name : "Translation",
+                                                                                  width : "10em",
+                                                                                  height : "2em",
+                                                                                  get : function (row) {
+                                                                                        if (!window.perm_rows) window.perm_rows = [];
+                                                                                        var r = window.perm_data_model.getRow(row);
+                                                                                        if (r) {
+                                                                                                window.perm_rows[row] = new ccs().fromHash(window.perm_data_model.getRow(row));
+                                                                                                setTimeout(
+                                                                                                        'dojo.query(".perm_grid_trans_desc_' + row + '").'+
+                                                                                                                'instantiate(openils.I18N.translationWidget,{field:"description",'+
+                                                                                                                'targetObject:"window.perm_rows['+row+']",unique:"' + row + '"});'+
+                                                                                                                'perm_grid.rowHeightChanged('+row+')',
+                                                                                                        0
+                                                                                                );
+                                                                                                var oldnode = dojo.byId('description_translation_' + row);
+                                                                                                if (oldnode) dijit.byNode(oldnode).destroyRecursive();
+                                                                                                return '<span class="perm_grid_trans_desc_'+row+'"></span>';
+                                                                                        }
+                                                                                        return '';
+                                                                                  }
+                                                                                }
                                                                         ]
                                                                 ]

branches/acq-experiment/Open-ILS/web/conify/global/permission/perm_list.js

@@ -17 +17 @@
 
 dojo.require('fieldmapper.dojoData');
+dojo.require('openils.I18N');
 dojo.require('dojo.parser');
 dojo.require('dojo.string');

branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js

@@ -34 +34 @@
     
         constructor : function ( kwargs ) {
+            kwargs = kwargs || {};
             this.id = kwargs.id;
             this.user = kwargs.user;
@@ -55 +56 @@
                     var user = r.recv().content();
                     _u.user = user;
-                                        if (!openils.User.user) !openils.User.user = _u.user;
+                                        if (!openils.User.user) openils.User.user = _u.user;
                     if(onComplete)
                         onComplete(user);
@@ -110 +111 @@
                     var data = rr.recv().content();
                     _u.authtoken = data.payload.authtoken;
-                                        if (!openils.User.authtoken) !openils.User.authtoken = _u.authtoken;
+                                        if (!openils.User.authtoken) openils.User.authtoken = _u.authtoken;
                     _u.authtime = data.payload.authtime;
-                                        if (!openils.User.authtime) !openils.User.authtime = _u.authtime;
+                                        if (!openils.User.authtime) openils.User.authtime = _u.authtime;
                     _u.getBySession(onComplete);
                 }