Circulation policy: issues

* FIX: closes #125, closes #127 Signed-off-by: Aly Badr <[email protected]>
rero · Oct 25, 2018 · 9956174 · 9956174
1 parent 4fd768f
commit 9956174
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/data/circulation_policies.json b/data/circulation_policies.json
@@ -27,9 +27,6 @@
     "description": "On-site circulation policy.",
     "organisation_pid": "1",
     "allow_checkout": false,
-    "checkout_duration": 0,
-    "allow_requests": false,
-    "number_renewals": 0,
-    "renewal_duration": 0
+    "allow_requests": false
   }
 ]
diff --git a/rero_ils/modules/circ_policies/cli.py b/rero_ils/modules/circ_policies/cli.py
@@ -34,6 +34,7 @@
 from werkzeug.local import LocalProxy
 
 from rero_ils.modules.circ_policies.api import CircPolicy
+from rero_ils.modules.circ_policies.utils import clean_circ_policy_fields
 from rero_ils.modules.errors import OrganisationDoesNotExist, \
     PolicyNameAlreadyExists
 
@@ -53,6 +54,7 @@ def import_circ_policies(infile, verbose):
     data = json.load(infile)
     for circ_policy in data:
         message = ''
+        circ_policy = clean_circ_policy_fields(circ_policy)
         try:
             record = CircPolicy.create(
                 circ_policy, dbcommit=True, reindex=True

diff --git a/rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json b/rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json
@@ -40,7 +40,7 @@
       "type": "string"
     },
     "allow_checkout": {
-      "title": "Allow Checkout flag",
+      "title": "Allow Checkout",
       "description": "Checkouts are allowed or not.",
       "type": "boolean",
       "default": true
@@ -49,10 +49,11 @@
       "title": "Checkout duration in days",
       "description": "The duration of the checkout in days.",
       "type": "integer",
+      "minimum": 1,
       "default": 7
     },
     "allow_requests": {
-      "title": "Allow patron requests flag",
+      "title": "Allow patron requests",
       "description": "Patron requests are allowed or not.",
       "type": "boolean",
       "default": true
@@ -61,13 +62,14 @@
       "title": "Maximum number of renewals",
       "description": "Maximum number of renewals allowed.",
       "type": "integer",
+      "minimum": 0,
       "default": 0
     },
     "renewal_duration": {
       "title": "Renewal duration in days",
       "description": "The duration of the renewal in days.",
       "type": "integer",
-      "default": 7
+      "minimum": 1
     }
   }
 }
diff --git a/rero_ils/modules/circ_policies/templates/rero_ils/detailed_view_circ_policies.html b/rero_ils/modules/circ_policies/templates/rero_ils/detailed_view_circ_policies.html
@@ -54,7 +54,7 @@ <h2> {{_('Circulation Policy')}}: {{ record.name }}</h2>
         {{_('Checkout Duration')}}:
       </div>
       <div class="col-xs-9 col-sm-10">
-        {{ record.checkout_duration }}
+        {{ record.checkout_duration }} {{_('day(s)')}}
       </div>
     </div>
   {% endif %}
@@ -74,7 +74,7 @@ <h2> {{_('Circulation Policy')}}: {{ record.name }}</h2>
         {{_('Renewal Duration')}}:
       </div>
       <div class="col-xs-9 col-sm-10">
-        {{ record.renewal_duration }}
+        {{ record.renewal_duration }} {{_('day(s)')}}
       </div>
     </div>
   {% endif %}