Commit 49de7090 authored by bue's avatar bue
Browse files

@ annot : bugfix naturalkey

parent acc27cd3

app0antibody/models.py

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class AntibodyPrimaryBasicLevel( models.Model ): 
        return( s_out ) 

    class Meta: 

        unique_together = (("antibody_primary_antigen","antibody_primary_host_organism"),)

        ordering = ["antibody_primary_antigen","antibody_primary_host_organism"]

        ordering = ["antibody_primary_antigen_id","antibody_primary_host_organism_id"]

        verbose_name_plural="Primary antibodies basic level"
@@ -65,12 +65,12 @@ class AntibodyPrimaryDetailLevel( models.Model ): 
        s_out = self.antibody_primary_basiclevel.antibody_primary_name.annot_id+'-'+self.antibody_primary_detaillevel_serial

        return( s_out )

    def natural_key( self ):

        return( self.antibody_primary_basiclevel, self.antibody_primary_detaillevel_serial )

        return( self.antibody_primary_basiclevel.pk, self.antibody_primary_detaillevel_serial )

    natural_key.dependencies = ["app0antibody.AntibodyPrimaryBasicLevel"]



    class Meta: 

        unique_together = (("antibody_primary_basiclevel", "antibody_primary_detaillevel_serial"),)

        ordering = ["antibody_primary_basiclevel","antibody_primary_detaillevel_serial"]

        ordering = ["antibody_primary_basiclevel_id","antibody_primary_detaillevel_serial"]

        verbose_name_plural="Primary antibodies detail level"
@@ -88,7 +88,7 @@ class AntibodySecondaryBasicLevel( models.Model ): 
        return( s_out ) 

    class Meta: 

        unique_together = (("antibody_secondary_name","antibody_secondary_target_organism","antibody_secondary_dye","antibody_secondary_host_organism"),)  # antibody_secondary_wavelength, antibody_secondary_color

        ordering = ["antibody_secondary_name","antibody_secondary_target_organism","antibody_secondary_dye","antibody_secondary_host_organism"]

        ordering = ["antibody_secondary_name_id","antibody_secondary_target_organism_id","antibody_secondary_dye_id","antibody_secondary_host_organism_id"]

        verbose_name_plural="Secondary antibodies basic level"
@@ -123,10 +123,10 @@ class AntibodySecondaryDetailLevel( models.Model ): 
        s_out = self.antibody_secondary_basiclevel.antibody_secondary_name.annot_id+'-'+self.antibody_secondary_detaillevel_serial

        return( s_out ) 

    def natural_key( self ):

        return( self.antibody_secondary_basiclevel, self.antibody_secondary_detaillevel_serial )

        return( self.antibody_secondary_basiclevel.pk, self.antibody_secondary_detaillevel_serial )

    natural_key.dependencies = ["app0antibody.AntibodySecondaryBasicLevel"]



    class Meta: 

        unique_together = (("antibody_secondary_basiclevel", "antibody_secondary_detaillevel_serial"),)

        #ordering = ["antibody_secondary_basiclevel","antibody_secondary_detaillevel_serial"]

        ordering = ["antibody_secondary_basiclevel_id","antibody_secondary_detaillevel_serial"]

        verbose_name_plural="Secondary antibodies detail level"

app0compound/models.py

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class CompoundDetailLevel( models.Model ): 
        s_out = self.compound_basiclevel.compound.annot_id+'-'+self.compound_detaillevel_serial

        return( s_out )

    def natural_key( self ):

        return( self.compound_basiclevel, self.compound_detaillevel_serial  )

        return( self.compound_basiclevel.pk, self.compound_detaillevel_serial  )

    natural_key.dependencies = ["app0compound.CompoundBasicLevel"]



    class Meta:

app0factor/models.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class FactorSingle( models.Model ): 
        s_out = self.factor.reagent_type+'|'+self.factor.reagent_name+'-'+self.reagent_aliquot_serial+'|'+self.reagent_concentration_unit.annot_id+'-'+str(self.reagent_concentration_value)

        return( s_out)

    def natural_key( self ): 

        return( self.factor.natural_key()+(self.reagent_aliquot_serial, self.reagent_concentration_unit, self.reagent_concentration_value,) )

        return( self.factor.natural_key()+(self.reagent_aliquot_serial, self.reagent_concentration_unit.pk, self.reagent_concentration_value,) )

    natural_key.dependencies = ["appsabrick.Reagent","apponunit_bioontology.Unit"]



    class Meta:

app0investigation/models.py

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class ZoomInvestigationPublication( models.Model ): 
        s_out = self.investigation.i_identifier+'-'+self.publication.publication_title

        return( s_out )

    def natural_key( self ): 

        return( self.investigation, self.publication )

        return( self.investigation.pk, self.publication.pk )

    natural_key.dependencies = ["app0investigation.Investigation","app0publication.Publication"]



    class Meta:
@@ -64,7 +64,7 @@ class ZoomInvestigationPerson( models.Model ): 
        s_out = self.investigation.i_identifier+'-'+self.person.person_first_name+'_'+self.person.person_mid_initials+'_'+self.person.person_last_name

        return( s_out ) 

    def natural_key( self ): 

        return( self.investigation, self.person.natural_key() )

        return( self.investigation.pk, self.person.pk )

    natural_key.dependencies = ["app0investigation.Investigation","app0person.Person"]



    class Meta:
@@ -85,7 +85,7 @@ class ZoomInvestigationStudy( models.Model ): 
        s_out = self.investigation.i_identifier+"-"+self.study.s_identifier

        return( s_out)

    def natural_key( self ): 

        return( self.investigation, self.study )

        return( self.investigation.pk, self.study.pk )

    natural_key.dependencies = ["app0investigation.Investigation","app0study.Study"]



    class Meta:

app0parameter/models.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class ParameterSingle( models.Model ): 
        s_out = self.parameter.reagent_type+'|'+self.parameter.reagent_name+'-'+self.reagent_aliquot_serial+'|'+self.reagent_concentration_unit.annot_id+'-'+str(self.reagent_concentration_value)

        return( s_out)

    def natural_key( self ):

        return( self.parameter.natural_key()+(self.reagent_aliquot_serial, self.reagent_concentration_unit, self.reagent_concentration_value,) )

        return( self.parameter.natural_key()+(self.reagent_aliquot_serial, self.reagent_concentration_unit.pk, self.reagent_concentration_value,) )

    natural_key.dependencies = ["appsabrick.Reagent","apponunit_bioontology.Unit"]



    class Meta: