Skip to content

Commit

Permalink
Conflicting name classes
Browse files Browse the repository at this point in the history
  • Loading branch information
JosePizarro3 committed Jan 9, 2025
1 parent a508e31 commit 42b1069
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions bam_masterdata/datamodel/object_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -10181,7 +10181,8 @@ class Bam(Person):
)


class Freezer(Control):
# Freezer is defined several times in the model
class Freezer1(Control):
defs = ObjectTypeDef(
code="CONTROL.FREEZER",
description="""This Object allows to store temperature data as a control point for a Freezer//Dieses Objekt erlaubt einen Kontrollpunkt für ein Kühlgerät zu erstellen""",
Expand Down Expand Up @@ -10209,7 +10210,8 @@ class Freezer(Control):
)


class Freezer(Instrument):
# Freezer is defined several times in the model
class Freezer2(Instrument):
defs = ObjectTypeDef(
code="INSTRUMENT.FREEZER",
description="""Cooling Device//Kühlgerät""",
Expand Down Expand Up @@ -13090,7 +13092,8 @@ class Robot(WeldingEquipment):


# ! The parent class of StationLayout is not defined (missing ObjectType)
class StationLayout(ObjectType):
# Freezer is defined several times in the model
class StationLayout1(ObjectType):
defs = ObjectTypeDef(
code="WELDING.EQUIPMENT.STATION_LAYOUT",
description="""Layout and configuration of a welding station""",
Expand Down Expand Up @@ -13318,7 +13321,8 @@ class StationLayout(ObjectType):
)


class StationLayout(WeldingEquipment):
# Freezer is defined several times in the model
class StationLayout2(WeldingEquipment):
defs = ObjectTypeDef(
code="INSTRUMENT.WELDING_EQUIPMENT.STATION_LAYOUT",
description="""Layout and configuration of a welding station""",
Expand All @@ -13327,7 +13331,8 @@ class StationLayout(WeldingEquipment):


# ! The parent class of StationLayout is not defined (missing ObjectType)
class StationLayout(ObjectType):
# Freezer is defined several times in the model
class StationLayout3(ObjectType):
defs = ObjectTypeDef(
code="INSTRUMENT.WELDING.EQUIPMENT.STATION_LAYOUT",
description="""Layout and configuration of a welding station""",
Expand Down

1 comment on commit 42b1069

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
bam_masterdata
   logger.py80100% 
bam_masterdata/cli
   cli.py362222 39%
   entities_to_excel.py5433 94%
   entities_to_json.py3655 86%
bam_masterdata/datamodel
   collection_types.py370100% 
   dataset_types.py184184184 0%
   object_types.py15150100% 
   property_types.py8000100% 
   vocabulary_types.py137210100% 
bam_masterdata/metadata
   definitions.py770100% 
   entities.py5433 94%
bam_masterdata/openbis
   get_entities.py525252 0%
   login.py777 0%
bam_masterdata/utils
   utils.py3366 82%
TOTAL1661428298% 

Tests Skipped Failures Errors Time
57 1 💤 0 ❌ 0 🔥 16.612s ⏱️

Please sign in to comment.