release: v0.1.0a10

Signed-off-by: Johnny Mariéthoz <Johnny.Mariethoz@rero.ch>

deployment/Dockerfile

@@ -21,7 +21,8 @@ COPY MANIFEST.in /reroils/reroils/src/reroils-app/
 COPY requirements.txt /reroils/reroils/src/reroils-app/
 COPY reroils_app /reroils/reroils/src/reroils-app/reroils_app
 COPY deployment/populate.sh /reroils/populate.sh
-COPY deployment/10k_2017_11_10.json /reroils/demo.json
+COPY deployment/bibrecords.json /reroils/bibrecords.json
+COPY deployment/institutions.json /reroils/institutions.json
 
 # # Run container as user `invenio` with UID `1000`, which should match
 # # current host user in most situations:

deployment/institutions.json

@@ -0,0 +1,68 @@
+[
+    {
+        "name": "Network of Science Libraries",
+        "address": "Moffett Blvd, Mountain View.",
+        "libraries": [
+            {
+                "code": "net1-national-doc",
+                "name": "National Documentation Centre",
+                "address": "48, Vas. Constantinou Av.",
+                "email": "national@network.ch",
+                "locations": [
+                    {
+                        "code": "net1-store-base",
+                        "name": "Store Base"
+                    },
+                    {
+                        "code": "net1-main-base",
+                        "name": "main Base"
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "name": "Network of Medicine Libraries",
+        "address": "101 Independence Ave SE.",
+        "libraries": [
+            {
+                "code": "net2-national-doc",
+                "name": "National Documentation Centre 2",
+                "address": "48, Vas. Constantinou Av.",
+                "email": "national2@network.ch",
+                "locations": [
+                    {
+                        "code": "net2-store-base",
+                        "name": "Store Base"
+                    },
+                    {
+                        "code": "net2-main-base",
+                        "name": "main Base"
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "name": "Network of Art Libraries",
+        "address": "Abandoibarra Etorb., 2.",
+        "libraries": [
+            {
+                "code": "net3-national-doc",
+                "name": "National Documentation Centre 3",
+                "address": "48, Vas. Constantinou Av.",
+                "email": "national3@network.ch",
+                "locations": [
+                    {
+                        "code": "net3-store-base",
+                        "name": "Store Base"
+                    },
+                    {
+                        "code": "net3-main-base",
+                        "name": "main Base"
+                    }
+                ]
+            }
+        ]
+    }
+]

deployment/populate.sh

@@ -38,11 +38,17 @@ invenio roles add admin@rero.ch admins
 invenio roles add admin@rero.ch superusers
 invenio roles add librarian@rero.ch cataloguer
 
+# create the institution records
+dojson -i institutions.json schema http://ils.test.rero.ch/schema/institutions/institution-v0.0.1.json | invenio records create --pid-minter institutionid
+
+invenio index reindex --yes-i-know --pid-type instid
+invenio index run
+
 # create the bib records
-dojson -i demo.json reverse schema http://ils.test.rero.ch/schema/records/record-v0.0.1.json | invenio records create --pid-minter bibid
+dojson -i bibrecords.json reverse schema http://ils.test.rero.ch/schema/records/record-v0.0.1.json | invenio records create --pid-minter bibid
 
 #invenio index reindex --yes-i-know --pid-type recid
 #invenio index run
 
 # create items and index bibitems
-invenio fixtures createitems
+invenio fixtures createitems

requirements.txt

@@ -24,7 +24,7 @@
 
 git+https://github.com/inveniosoftware/invenio-circulation.git#egg=invenio-circulation
 
-git+https://github.com/rero/reroils-data.git@v0.1.0a9#egg=reroils-data
-git+https://github.com/rero/reroils-record-editor.git@v0.1.0a9#egg=reroils-record-editor
+git+https://github.com/rero/reroils-data.git@v0.1.0a10#egg=reroils-data
+git+https://github.com/rero/reroils-record-editor.git@v0.1.0a10#egg=reroils-record-editor
 
 flower

reroils_app/config.py

@@ -311,32 +311,32 @@ def _(x):
 
 INDEXER_REPLACE_REFS = False
 
-REROILS_RECORD_EDITOR_OPTIONS = dict(
+REROILS_RECORD_EDITOR_OPTIONS = {
     # crcitm=dict(
     #     api='/api/items',
     #     template='reroils_record_editor/search.html',
     #     results_template='templates/reroils_app/itembriefview.html',
     #     schema='items/item-v0.0.1.json'
     # ),
-    recid=dict(
-        api='/api/records',
+    _('recid'): dict(
+        api='/api/records/',
         template='reroils_record_editor/search.html',
         results_template='templates/reroils_app/briefview.html',
         schema='records/record-v0.0.1.json',
         form_options=('reroils_data.form_options',
                       'records/record-v0.0.1.json'),
         form_options_create_exclude=['bibid']
     ),
-    instid=dict(
-        api='/api/institutions',
+    _('instid'): dict(
+        api='/api/institutions/',
         template='reroils_record_editor/search.html',
         results_template='templates/reroils_app/institutionbriefview.html',
         schema='institutions/institution-v0.0.1.json',
         form_options=('reroils_data.form_options',
                       'institutions/institution-v0.0.1.json'),
         form_options_create_exclude=['institutionid']
     )
-)
+}
 
 REROILS_RECORD_EDITOR_TRANSLATE_JSON_KEYS = [
     'title', 'description', 'placeholder',

reroils_app/templates/reroils_app/help.html

@@ -13,7 +13,7 @@ <h2><i class="fa fa-sign-in"></i> Librarian account</h2>
     </ul>
 
     <h2><i class="fa fa-pencil"></i> Editing records</h2>
-    <p>Once you are identified, a menu is made visible. Through it, you can access the <a href="{{ url_for('reroils_record_editor.new') }}">editor</a>, and start cataloguing a new record.</p>
+    <p>Once you are identified, a menu is made visible. Through it, you can access the <a href="{{ url_for('reroils_record_editor.create_recid') }}">editor</a>, and start cataloguing a new record.</p>
     <p>A <em>very simple</em> import function is available, but only using the ISBN field. Once a correct ISBN-13 is entered into that field, hitting the <span class="btn btn-info btn-xs">{{ _('import') }}</span> button will send a request to the <a href="http://www.bnf.fr/fr/professionnels/recuperation_donnees_bnf_boite_outils/a.service_SRU.html" target="_blank">BnF's SRU service</a>.</p>
     <p>When you display the detailed view of a record, you should see two buttons, one to <span class="btn btn-success btn-xs">{{ _('edit') }}</span> the record, and the second to <span class="btn btn-danger btn-xs">{{ _('delete') }}</span> it.</p>
 
@@ -40,7 +40,7 @@ <h2><i class="fa fa-sign-in"></i> Compte bibliothécaire</h2>
     </ul>
 
     <h2><i class="fa fa-pencil"></i> Modifier les notices</h2>
-    <p>Une fois que vous êtes identifié·e, un menu s'affiche. Il donne accès à l'<a href="{{ url_for('reroils_record_editor.new') }}">éditeur</a> qui permet de cataloguer une nouveau document.</p>
+    <p>Une fois que vous êtes identifié·e, un menu s'affiche. Il donne accès à l'<a href="{{ url_for('reroils_record_editor.create_recid') }}">éditeur</a> qui permet de cataloguer une nouveau document.</p>
     <p>Une fonction d'importation <em>très simple</em> est disponible, limitée au champ de l'ISBN. Lorsqu'un ISBN-13 correct est saisi dans ce champ, le bouton <span class="btn btn-info btn-xs">{{ _('import') }}</span> envoie une requête au <a href="http://www.bnf.fr/fr/professionnels/recuperation_donnees_bnf_boite_outils/a.service_SRU.html" target="_blank">service SRU de la BnF</a>.</p>
     <p>Depuis la vue détaillée d'une notice, deux boutons sont visibles, le premier pour <span class="btn btn-success btn-xs">{{ _('edit') }}</span> la notice, et le deuxième pour la <span class="btn btn-danger btn-xs">{{ _('delete') }}</span>.</p>
 
@@ -70,7 +70,7 @@ <h2><i class="fa fa-sign-in"></i> Bibliothekarkonto</h2>
 
     <h2>
         <i class="fa fa-pencil"></i> Datensatz bearbeiten</h2>
-    <p>Nach dem Einloggen wird ein Menü sichtbar, über welches Sie auf den <a href="{{ url_for('reroils_record_editor.new') }}">Editor</a> zugreifen können und einen neuen Datensatz erfassen können.</p>
+    <p>Nach dem Einloggen wird ein Menü sichtbar, über welches Sie auf den <a href="{{ url_for('reroils_record_editor.create_recid') }}">Editor</a> zugreifen können und einen neuen Datensatz erfassen können.</p>
     <p>Eine <em>sehr einfache</em> Importfunktion steht unter Verwendung des ISBN-Feldes zur Verfügung. Sobald eine korrekte ISBN-13 in das ISBN-Feld eingegeben wurde, wird durch den Klick auf <span class="btn btn-info btn-xs">{{ _('import') }}</span> eine Anfrage an den <a href="http://www.bnf.fr/fr/professionnels/recuperation_donnees_bnf_boite_outils/a.service_SRU.html" target="_blank">SRU-Service der BnF</a> gesendet.</p>
     <p>Bei der Detailanzeige eines Datensatzes sehen Sie zwei Buttons, den einen um den Datensatz zu <span class="btn btn-success btn-xs">{{ ('edit') }}</span> und den anderen um ihn zu <span class="btn btn-danger btn-xs">{{ ('delete') }}</span>.</p>
 
@@ -101,7 +101,7 @@ <h2><i class="fa fa-sign-in"></i> Conto Biblioteca</h2>
     </ul>
 
     <h2><i class="fa fa-pencil"></i> Modificare i record</h2>
-    <p>Una volta effettuato l'accesso, viene visualizzato un menu. Questo dà accesso all'<a href="{{ url_for('reroils_record_editor.new') }}">editor</a> che permette di catalogare un nuovo documento.</p>
+    <p>Una volta effettuato l'accesso, viene visualizzato un menu. Questo dà accesso all'<a href="{{ url_for('reroils_record_editor.create_recid') }}">editor</a> che permette di catalogare un nuovo documento.</p>
     <p>È disponibile una funzione di importazione <em>molto semplice</em>, limitata al campo ISBN. Quando in questo campo viene inserito un ISBN-13 corretto, il pulsante <span class="btn btn-info btn-xs">{{ _('import') }}</span> invia una richiesta <a href="http://www.bnf.fr/fr/professionnels/recuperation_donnees_bnf_boite_outils/a.service_SRU.html" target="_blank">al servizio SRU della BnF</a>.</p>
     <p>Dalla vista dettagliata di un record compaiono due pulsanti, il primo per <span class="btn btn-success btn-xs">{{ _('edit') }}</span> il record e il secondo per <span class="btn btn-danger btn-xs">{{ _('delete') }}</span> il record.</p>
 

reroils_app/translations/de/LC_MESSAGES/messages.po

@@ -4,11 +4,16 @@
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
+# Translators:
+# Johnny Mariéthoz <johnny.mariethoz@rero.ch>, 2017
+# Peter Weber <peter.weber@rero.ch>, 2017
+# Nicolas Prongué <n.prongue@outlook.com>, 2017
+# iGor milhit <igor.milhit@rero.ch>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: reroils-app 0.1.0a9\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2018-03-08 08:27+0100\n"
+"POT-Creation-Date: 2018-03-08 20:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: iGor milhit <igor.milhit@rero.ch>, 2017\n"
 "Language: de\n"
@@ -58,6 +63,14 @@ msgstr "Autor"
 msgid "years"
 msgstr "Jahre"
 
+#: reroils_app/config.py:321
+msgid "recid"
+msgstr "Datensätze"
+
+#: reroils_app/config.py:330
+msgid "instid"
+msgstr "Einrichtungen"
+
 #: reroils_app/manual_translations.txt:1
 msgid "on_loan"
 msgstr "ausgeliehen"
@@ -140,25 +153,25 @@ msgstr "chinesisch"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:32
 msgid "item available"
-msgstr ""
+msgstr "Exemplar verfügbar"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:37
 msgid "items available"
-msgstr ""
+msgstr "Exemplare verfügbar"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:41
 msgid "no item available"
-msgstr ""
+msgstr "no item available"
 
 #: reroils_app/static/templates/reroils_app/count.html:3
 msgid "Found {{$count}} result."
 msgid_plural "Found {{$count}} results."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ein Resultat gefunden."
+msgstr[1] "{{$count}} Resultate gefunden"
 
 #: reroils_app/static/templates/reroils_app/count.html:4
 msgid "No results found."
-msgstr ""
+msgstr "Keine Resultate gefunden"
 
 #: reroils_app/templates/reroils_app/footer.html:4
 msgid "Developed by"
@@ -345,7 +358,7 @@ msgstr "Exportformate"
 
 #: reroils_app/templates/reroils_app/fullview_institution.html:15
 msgid "Institution ID"
-msgstr "EinrichtungsID"
+msgstr "ID der Einrichtung"
 
 #: reroils_app/templates/reroils_app/fullview_institution.html:26
 #: reroils_app/templates/reroils_app/fullview_institution.html:47
@@ -442,9 +455,3 @@ msgstr "Registrieren"
 msgid "Forgot password?"
 msgstr "Passwort vergessen?"
 
-#~ msgid "recid"
-#~ msgstr "Datensätze"
-
-#~ msgid "instid"
-#~ msgstr "Einrichtungen"
-

reroils_app/translations/en/LC_MESSAGES/messages.po

@@ -4,11 +4,15 @@
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
+# Translators:
+# Johnny Mariéthoz <johnny.mariethoz@rero.ch>, 2017
+# Peter Weber <peter.weber@rero.ch>, 2017
+# iGor milhit <igor.milhit@rero.ch>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: reroils-app 0.1.0a9\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2018-03-08 08:27+0100\n"
+"POT-Creation-Date: 2018-03-08 20:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: iGor milhit <igor.milhit@rero.ch>, 2017\n"
 "Language: en\n"
@@ -58,6 +62,14 @@ msgstr ""
 msgid "years"
 msgstr ""
 
+#: reroils_app/config.py:321
+msgid "recid"
+msgstr "Bibliographic records"
+
+#: reroils_app/config.py:330
+msgid "instid"
+msgstr "Institutions"
+
 #: reroils_app/manual_translations.txt:1
 msgid "on_loan"
 msgstr "on loan"
@@ -442,9 +454,3 @@ msgstr ""
 msgid "Forgot password?"
 msgstr ""
 
-#~ msgid "recid"
-#~ msgstr "Bibliographic records"
-
-#~ msgid "instid"
-#~ msgstr "Institutions"
-

reroils_app/translations/fr/LC_MESSAGES/messages.po

@@ -4,11 +4,14 @@
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
+# Translators:
+# Johnny Mariéthoz <johnny.mariethoz@rero.ch>, 2017
+# iGor milhit <igor.milhit@rero.ch>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: reroils-app 0.1.0a9\n"
 "Report-Msgid-Bugs-To: software@rero.ch\n"
-"POT-Creation-Date: 2018-03-08 08:27+0100\n"
+"POT-Creation-Date: 2018-03-08 20:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: iGor milhit <igor.milhit@rero.ch>, 2017\n"
 "Language: fr\n"
@@ -58,6 +61,14 @@ msgstr "auteur"
 msgid "years"
 msgstr "années"
 
+#: reroils_app/config.py:321
+msgid "recid"
+msgstr "Notices bibliographiques"
+
+#: reroils_app/config.py:330
+msgid "instid"
+msgstr "Institutions"
+
 #: reroils_app/manual_translations.txt:1
 msgid "on_loan"
 msgstr "en prêt"
@@ -140,25 +151,25 @@ msgstr "chinois"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:32
 msgid "item available"
-msgstr ""
+msgstr "exemplaire disponible"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:37
 msgid "items available"
-msgstr ""
+msgstr "exemplaires disponibles"
 
 #: reroils_app/static/templates/reroils_app/briefview.html:41
 msgid "no item available"
-msgstr ""
+msgstr "aucun exemplaire disponible"
 
 #: reroils_app/static/templates/reroils_app/count.html:3
 msgid "Found {{$count}} result."
 msgid_plural "Found {{$count}} results."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Un résultat trouvé."
+msgstr[1] "{{$count}} résultats."
 
 #: reroils_app/static/templates/reroils_app/count.html:4
 msgid "No results found."
-msgstr ""
+msgstr "Aucun résultat."
 
 #: reroils_app/templates/reroils_app/footer.html:4
 msgid "Developed by"
@@ -442,9 +453,3 @@ msgstr "S'inscrire"
 msgid "Forgot password?"
 msgstr "Vous avez oublié votre mot de passe?"
 
-#~ msgid "recid"
-#~ msgstr "Notices bibliographiques"
-
-#~ msgid "instid"
-#~ msgstr "Institutions"
-