Circulation: Policy configuration #124

BadrAly · 2018-10-17T14:48:46Z

NEW: add circulation policy objects

Co-Authored-by: Aly Badr [email protected]
Co-Authored-by: Gianni Pante [email protected]

To test

get the PR branch
./scripts/bootstrap
./scripts/setup
run the tests
Display the list of available circulation policies (cipo), add, delete and edit

iGormilhit

Clean the number of commits that are part of this PR (should be only one, must be a rebase problem).

Some files shouldn't be part of this PR, such as:

all the translations files
the run-tests.sh file
maybe others... 😉

Tests run successfully. 👍

iGormilhit · 2018-10-18T05:00:24Z

data/circulation_policies.json

+  {
+    "$schema": "https://ils.test.rero.ch/schema/circ_policies/circ_policy-v0.0.1.json",
+    "name": "standard",
+    "description": "default standard circulation policy",


Start the description with a capital and end it with a dot.

iGormilhit · 2018-10-18T05:01:56Z

data/circulation_policies.json

+  {
+    "$schema": "https://ils.test.rero.ch/schema/circ_policies/circ_policy-v0.0.1.json",
+    "name": "short",
+    "description": "short circulation policy",


Start the description with a capital and end it with a dot.

iGormilhit · 2018-10-18T05:02:03Z

data/circulation_policies.json

+  {
+    "$schema": "https://ils.test.rero.ch/schema/circ_policies/circ_policy-v0.0.1.json",
+    "name": "on-site",
+    "description": "on-site circulation policy",


Start the description with a capital and end it with a dot.

iGormilhit · 2018-10-18T05:03:29Z

rero_ils/modules/circ_policies/form_options/circ_policies/circ_policy-v0.0.1.json

+      {
+        "key": "name",
+        "validationMessage": {
+          "alreadyTakenMessage": "The circulation policy name is already taken"


Missing dot at the end of the message.

iGormilhit · 2018-10-18T05:04:11Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "title": "CircPolicy",


Why not Circulation policy?

iGormilhit · 2018-10-18T05:04:50Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "title": "CircPolicy",
+  "description": "JSON schema for circ_policies.",


Should be JSON schema for circulation policies.

iGormilhit · 2018-10-18T05:05:27Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+  "properties": {
+    "$schema": {
+      "title": "Schema",
+      "description": "Schema to validate circ_policies records against.",


Change circ_policies to circulation policies.

iGormilhit · 2018-10-18T05:06:13Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+      "minLength": 9
+    },
+    "pid": {
+      "title": "CircPolicy ID",


Change CircPolicy to Circulation policy. And check all the JSON schema with this rule.

iGormilhit · 2018-10-18T05:07:13Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+    },
+    "name": {
+      "title": "CircPolicy name",
+      "description": "The name of the circulation policy",


Missing dot at the end of the message. And check all the description messages.

iGormilhit · 2018-10-18T05:08:54Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+    },
+    "organisation_pid": {
+      "title": "Organisation ID",
+      "description": "The organisation_pid pid of this circulation policy",


The PID of the organisation in which this circulation policy applies. Or something like it.

Garfield-fr · 2018-10-18T05:12:41Z

rero_ils/modules/circ_policies/minters.py

+from ..minters import id_minter
+from .providers import CircPolicyProvider
+
+circ_policies_id_minter = partial(


singular on policies ?

Garfield-fr · 2018-10-18T05:14:04Z

rero_ils/modules/circ_policies/models.py

+class CircPolicyIdentifier(RecordIdentifier):
+    """Sequence generator for CircPolicy identifiers."""
+
+    __tablename__ = 'circ_policies_id'


singular on policies ?

Garfield-fr · 2018-10-18T05:15:06Z

rero_ils/modules/circ_policies/templates/rero_ils/detailed_view_circ_policies.html

+{%- block javascript %}
+{{ super() }}
+{% assets "rero_ils_tooltips_js" %}<script src="{{ ASSET_URL }}"></script>{% endassets %}
+{%- endblock javascript %}


Indent is 2 spaces (file)

Garfield-fr · 2018-10-18T05:15:33Z

rero_ils/modules/circ_policies/views.py

+    """Circ policy name Validate."""
+    response = {
+        'name': None,
+        'organisation_pid': None


Remove this (unused)

Garfield-fr · 2018-10-18T05:16:38Z

rero_ils/config.py

+    ),
+    cipo=dict(
+        pid_type='cipo',
+        pid_minter='circ_policies_id',


singular on policies ?

Garfield-fr · 2018-10-18T05:22:06Z

tests/modules/circ_policies/test_circ_policies_fetchers.py

+from rero_ils.modules.circ_policies.fetchers import \
+    circ_policies_id_fetcher as fetcher
+from rero_ils.modules.circ_policies.minters import \
+    circ_policies_id_minter as minter


Singular on policies ?

Garfield-fr · 2018-10-18T05:22:23Z

tests/modules/circ_policies/test_circ_policies_minters.py

+    data = {}
+    # first record
+    rec_uuid = uuid4()
+    pid1 = minters.circ_policies_id_minter(rec_uuid, data)


Singular on policies ?

Garfield-fr · 2018-10-18T05:22:29Z

tests/modules/circ_policies/test_circ_policies_minters.py

+    # second record
+    data = {}
+    rec_uuid = uuid4()
+    pid2 = minters.circ_policies_id_minter(rec_uuid, data)


Singular on policies ?

Garfield-fr · 2018-10-18T05:27:22Z

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

+    "number_renewals": {
+      "title": "Maximum number of renewals",
+      "description": "Maximum number of renewals allowed",
+      "type": "integer"


default value ?

rero_ils/modules/circ_policies/jsonschemas/circ_policies/circ_policy-v0.0.1.json

* NEW: add circulation policy objects Co-Authored-by: Aly Badr <[email protected]> Co-Authored-by: Gianni Pante <[email protected]>

BadrAly requested review from iGormilhit, Garfield-fr and NicolasLabat October 17, 2018 14:49

BadrAly force-pushed the baa-#702-circulation-policies branch from 6b52a0c to c6c1b41 Compare October 17, 2018 15:04

iGormilhit suggested changes Oct 18, 2018

View reviewed changes

Garfield-fr reviewed Oct 18, 2018

View reviewed changes

BadrAly force-pushed the baa-#702-circulation-policies branch 6 times, most recently from 85c4e85 to 24eb0ff Compare October 18, 2018 08:57

Circulation: Policy configuration

c59640b

* NEW: add circulation policy objects Co-Authored-by: Aly Badr <[email protected]> Co-Authored-by: Gianni Pante <[email protected]>

BadrAly force-pushed the baa-#702-circulation-policies branch from 24eb0ff to c59640b Compare October 18, 2018 09:00

Garfield-fr approved these changes Oct 18, 2018

View reviewed changes

iGormilhit approved these changes Oct 18, 2018

View reviewed changes

iGormilhit merged commit 937a524 into rero:master Oct 18, 2018

BadrAly deleted the baa-#702-circulation-policies branch January 10, 2019 09:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Circulation: Policy configuration #124

Circulation: Policy configuration #124

BadrAly commented Oct 17, 2018

iGormilhit left a comment •

edited

Loading

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

iGormilhit Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Garfield-fr Oct 18, 2018

Circulation: Policy configuration #124

Circulation: Policy configuration #124

Conversation

BadrAly commented Oct 17, 2018

To test

iGormilhit left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iGormilhit left a comment •

edited

Loading