OWAL rules should be working, but cannot test properly until permissions problem...

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

diff --git a/circ/circ_duration_OWAL.js b/circ/circ_duration_OWAL.js
index f7936c4..3f84940 100644 (file)
--- a/circ/circ_duration_OWAL.js
+++ b/circ/circ_duration_OWAL.js
@@ -28,48 +28,50 @@ log_info(debugStamp + 'patronProfile is ' + patronProfile + ' - modifier ' + cop
 if (isValidPatron(patronProfile)) {\r
     var temp_array = patronProfile.split(" ");\r
     var profileFirst = temp_array[0];\r
-    \r
-    switch(copy.circ_modifier) {\r
-        case 'LAW MONO':\r
-            if (patronProfile == 'Readers' && patron.home_ou.shortname != 'OWAL') {\r
-                // do nothing\r
-            } else {\r
+\r
+    if (patronProfile == 'Readers' && patron.home_ou.shortname != 'OWAL') {\r
+        // use override value - Non-Law Readers can borrow nothing\r
+    } else if (patronProfile == 'Readers' && copy.circ_modifier == 'LAW_MONO') {\r
+        result.durationRule = 'OWAL_' + profileFirst;  // Law Readers can only borrow LAW_MONO items\r
+    } else {\r
+        switch(copy.circ_modifier) {\r
+            case 'LAW MONO':\r
                 result.durationRule = 'OWAL_' + profileFirst;\r
-            }\r
-            break;\r
-        case 'LAW NOCIRC':\r
-            // Faculty exception handled below\r
-            break;\r
-        case 'LAW RES1D':\r
-            result.durationRule = 'OWAL_rsv_oneday';\r
-            result.recurringFinesRule = 'OWAL_hourly';\r
-            break;\r
-        case 'LAW RES3D':\r
-            result.durationRule = 'OWAL_rsv_threeday';\r
-            result.recurringFinesRule = 'OWAL_hourly';\r
-            break;\r
-        case 'LAW RES3H':\r
-            result.durationRule = 'OWAL_rsv_threehour';\r
-            result.recurringFinesRule = 'OWAL_hourly';\r
-            break;\r
-        case 'LAW RES5H':\r
-            result.durationRule = 'OWAL_rsv_fivehour';\r
-            result.recurringFinesRule = 'OWAL_hourly';\r
-            break;\r
-        case 'LAW SERIAL':\r
-            // Faculty exception handled below\r
-            break;\r
+                break;\r
+            case 'LAW NOCIRC':\r
+                // use override value\r
+                break;\r
+            case 'LAW RES1D':\r
+                result.durationRule = 'OWAL_rsv_oneday';\r
+                result.recurringFinesRule = 'OWAL_hourly';\r
+                break;\r
+            case 'LAW RES3D':\r
+                result.durationRule = 'OWAL_rsv_threeday';\r
+                result.recurringFinesRule = 'OWAL_hourly';\r
+                break;\r
+            case 'LAW RES3H':\r
+                result.durationRule = 'OWAL_rsv_threehour';\r
+                result.recurringFinesRule = 'OWAL_hourly';\r
+                break;\r
+            case 'LAW RES5H':\r
+                result.durationRule = 'OWAL_rsv_fivehour';\r
+                result.recurringFinesRule = 'OWAL_hourly';\r
+                break;\r
+            case 'LAW SERIAL':\r
+                // Faculty exceptions handled below\r
+                break;\r
+        }\r
     }\r
-\r
-    //exceptions for Law Faculty\r
-    if (patron.home_ou.shortname == "OWAL" && patronProfile == "Faculty") {\r
-        result.recurringFines.Rule = 'free';\r
-        if (copy.circ_modifier == 'LAW NOCIRC') {\r
-            result.durationRule = 'OWAL_faculty_nocirc';\r
-        } else if (copy.circ_modifier == 'LAW SERIAL') {\r
-            result.durationRule = 'OWAL_faculty_serials';\r
-        } else if (copy.circ_modifier.slice(0, 6) == 'LAW RES') {\r
-            result.durationRule = 'OWAL_rsv_threeday';\r
+    //exceptions for Faculty\r
+    if (patronProfile == "Faculty") {\r
+        if (copy.circ_modifier == 'LAW SERIAL') {\r
+            result.durationRule = 'OWAL_Faculty_serials';       // all Faculty can borrow serials\r
+        }\r
+        if (patron.home_ou.shortname == 'OWAL') {\r
+            result.recurringFinesRule = 'free';                // Law Faculty pay no fines\r
+            if (copy.circ_modifier.slice(0, 6) == 'LAW RES') { \r
+                result.durationRule = 'OWAL_rsv_threeday';      // Law Faculty get all reserve items for three days\r
+            }\r
         }\r
     }\r
 }\r