Skip to content

Commit

Permalink
Merge e67a1ed into e94584a
Browse files Browse the repository at this point in the history
  • Loading branch information
Aly Badr committed Aug 8, 2019
2 parents e94584a + e67a1ed commit 9c31036
Show file tree
Hide file tree
Showing 32 changed files with 1,395,471 additions and 455,691 deletions.
1 change: 1 addition & 0 deletions Pipfile
9 changes: 8 additions & 1 deletion Pipfile.lock
598,485 changes: 396,822 additions & 201,663 deletions data/10k.json
627,239 changes: 410,879 additions & 216,360 deletions data/10k.xml
100755 → 100644
13,873 changes: 5,869 additions & 8,004 deletions data/300.json
14,498 changes: 5,980 additions & 8,518 deletions data/300.xml
100755 → 100644
574,302 changes: 570,700 additions & 3,602 deletions data/items10k.json
12,560 changes: 0 additions & 12,560 deletions data/items1k.json

This file was deleted.

8,334 changes: 3,719 additions & 4,615 deletions data/items300.json
4 changes: 2 additions & 2 deletions rero_ils/config.py
26 changes: 21 additions & 5 deletions rero_ils/modules/cli.py
2 changes: 1 addition & 1 deletion rero_ils/modules/documents/api.py
344 changes: 290 additions & 54 deletions rero_ils/modules/documents/dojson/contrib/marc21tojson/model.py
147 changes: 105 additions & 42 deletions rero_ils/modules/documents/jsonschemas/documents/document-v0.0.1.json
32 changes: 25 additions & 7 deletions rero_ils/modules/documents/mappings/v6/documents/document.json
49 changes: 49 additions & 0 deletions rero_ils/modules/documents/views.py
42 changes: 25 additions & 17 deletions rero_ils/modules/ebooks/dojson/contrib/marc21/model.py
13 changes: 11 additions & 2 deletions rero_ils/modules/ebooks/receivers.py
27 changes: 16 additions & 11 deletions rero_ils/modules/ebooks/tasks.py
7 changes: 5 additions & 2 deletions rero_ils/modules/loans/cli.py
12 changes: 6 additions & 6 deletions scripts/setup
162 changes: 124 additions & 38 deletions tests/data/data.json
1 change: 1 addition & 0 deletions tests/ui/documents/test_documents_api.py
51 changes: 50 additions & 1 deletion tests/ui/documents/test_documents_filter.py
530 changes: 493 additions & 37 deletions tests/unit/test_documents_dojson.py
62 changes: 36 additions & 26 deletions tests/unit/test_documents_jsonschema.py
21 changes: 14 additions & 7 deletions tests/unit/test_dojson_ebooks.py

0 comments on commit 9c31036

Please sign in to comment.