mark library preparation, sequencing costs as obsolete

maxplanck-ie · Nov 21, 2018 · 77e6db4 · 77e6db4
1 parent edacf01
commit 77e6db4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/invoicing/models.py b/invoicing/models.py
@@ -41,7 +41,8 @@ def __str__(self):
 
 
 class LibraryPreparationCosts(models.Model):
-    library_protocol = models.OneToOneField(LibraryProtocol)
+    library_protocol = models.ForeignKey(LibraryProtocol,unique=True,limit_choices_to={'obsolete':1})
+    #library_protocol = models.OneToOneField(LibraryProtocol)
     price = models.DecimalField(max_digits=8, decimal_places=2)
 
     class Meta:
@@ -57,7 +58,7 @@ def __str__(self):
 
 
 class SequencingCosts(models.Model):
-    sequencer = models.ForeignKey(Sequencer)
+    sequencer = models.ForeignKey(Sequencer,limit_choices_to={'obsolete':1})
     read_length = models.ForeignKey(ReadLength, verbose_name='Read Length')
     price = models.DecimalField(max_digits=8, decimal_places=2)
 

diff --git a/invoicing/views.py b/invoicing/views.py
@@ -281,7 +281,7 @@ class FixedCostsViewSet(mixins.UpdateModelMixin,
                         viewsets.ReadOnlyModelViewSet):
     """ Get the list of Fixed Costs. """
     permission_classes = [IsAdminUser]
-    queryset = FixedCosts.objects.all()
+    queryset = FixedCosts.objects.filter(sequencer__obsolete = settings.NON_OBSOLETE)
     serializer_class = FixedCostsSerializer
 
 
@@ -290,7 +290,7 @@ class LibraryPreparationCostsViewSet(mixins.UpdateModelMixin,
     """ Get the list of Library Preparation Costs. """
 
     permission_classes = [IsAdminUser]
-    queryset = LibraryPreparationCosts.objects.all()
+    queryset = LibraryPreparationCosts.objects.filter(library_protocol__obsolete=settings.NON_OBSOLETE)
     print(queryset.query)
 
     serializer_class = LibraryPreparationCostsSerializer
@@ -301,5 +301,5 @@ class SequencingCostsViewSet(mixins.UpdateModelMixin,
                              viewsets.ReadOnlyModelViewSet):
     """ Get the list of Sequencing Costs. """
     permission_classes = [IsAdminUser]
-    queryset = SequencingCosts.objects.all()
+    queryset = SequencingCosts.objects.filter(sequencer__obsolete=settings.NON_OBSOLETE)
     serializer_class = SequencingCostsSerializer