mark read lengths as obsolete

maxplanck-ie · Dec 5, 2018 · 567a331 · 567a331
1 parent b319a93
commit 567a331
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/library_sample_shared/views.py b/library_sample_shared/views.py
@@ -77,6 +77,11 @@ class ReadLengthViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = ReadLength.objects.filter(obsolete=settings.NON_OBSOLETE)
     serializer_class = ReadLengthSerializer
 
+class ReadLengthInvoicingViewSet(viewsets.ReadOnlyModelViewSet):
+
+    queryset = ReadLength.objects.all()
+    serializer_class = ReadLengthSerializer
+
 
 class ConcentrationMethodViewSet(viewsets.ReadOnlyModelViewSet):
     """ Get the list of concentration methods. """

diff --git a/static/main-hub/app/Application.js b/static/main-hub/app/Application.js
@@ -59,6 +59,7 @@ Ext.define('MainHub.Application', {
     'invoicing.LibraryPreparationCosts',
     'invoicing.SequencingCosts',
     'invoicing.LibraryProtocolsInvoicing',
+    'invoicing.ReadLengthsInvoicing',
     'usage.Records',
     'usage.Organizations',
     'usage.PrincipalInvestigators',

diff --git a/static/main-hub/app/store/invoicing/ReadLengthsInvoicing.js b/static/main-hub/app/store/invoicing/ReadLengthsInvoicing.js
@@ -0,0 +1,27 @@
+Ext.define('MainHub.store.invoicing.ReadLengthsInvoicing', {
+    extend: 'Ext.data.Store',
+    storeId: 'readLengthsInvoicingStore',
+
+    requires: [
+        'MainHub.model.libraries.ReadLength'
+    ],
+
+    model: 'MainHub.model.libraries.ReadLength',
+
+    proxy: {
+        type: 'ajax',
+        url: 'api/read_lengths_invoicing/',
+        timeout: 1000000,
+        pageParam: false,   //to remove param "page"
+        startParam: false,  //to remove param "start"
+        limitParam: false,  //to remove param "limit"
+        noCache: false,     //to remove param "_dc",
+        reader: {
+            type: 'json',
+            rootProperty: 'data',
+            successProperty: 'success'
+        }
+    },
+
+    autoLoad: true
+});
diff --git a/static/main-hub/app/view/invoicing/InvoicingController.js b/static/main-hub/app/view/invoicing/InvoicingController.js
@@ -180,7 +180,7 @@ Ext.define('MainHub.view.invoicing.InvoicingController', {
   },
 
   readLengthRenderer: function (value, meta) {
-    var store = Ext.getStore('readLengthsStore');
+    var store = Ext.getStore('readLengthsInvoicingStore');
     var items = value.map(function (id) {
       var record = store.findRecord('id', id, 0, false, true, true);
       return record.get('name');

diff --git a/wui/api.py b/wui/api.py
@@ -10,7 +10,8 @@
     LibraryTypeViewSet,
     ReadLengthViewSet,
     ConcentrationMethodViewSet,
-    LibraryProtocolInvoicingViewSet
+    LibraryProtocolInvoicingViewSet,
+    ReadLengthInvoicingViewSet
 )
 from library.views import LibrarySampleTree, LibraryViewSet
 from sample.views import NucleicAcidTypeViewSet, SampleViewSet
@@ -47,6 +48,7 @@
 router.register(r'indices', IndexViewSet, base_name='index')
 router.register(r'library_protocols', LibraryProtocolViewSet, base_name='library-protocol')
 router.register(r'library_protocols_invoicing', LibraryProtocolInvoicingViewSet, base_name='library-protocol-invoicing')
+router.register(r'read_lengths_invoicing',ReadLengthInvoicingViewSet, base_name='read-lengths-invoicing')
 router.register(r'library_types', LibraryTypeViewSet, base_name='library-type')
 router.register(r'nucleic_acid_types', NucleicAcidTypeViewSet, base_name='nucleic-acid-type')
 router.register(r'pool_sizes', PoolSizeViewSet, base_name='pool-size')