diff options
| author | Smári McCarthy <smari@hilbert.(none)> | 2009-08-29 18:08:36 +0000 |
|---|---|---|
| committer | Smári McCarthy <smari@hilbert.(none)> | 2009-08-29 18:08:36 +0000 |
| commit | 65e65563b077eb04f9f8759fdbfee6af72c58229 (patch) | |
| tree | e36c76e18b753cca85f49e483a1b53afd2ff7980 /server/materials/models.py | |
| parent | 924e576620f3b3ff4a670320e23ad09468308f03 (diff) | |
| download | tangiblebit-65e65563b077eb04f9f8759fdbfee6af72c58229.tar.gz tangiblebit-65e65563b077eb04f9f8759fdbfee6af72c58229.zip | |
Added FAB5 presentation.
Diffstat (limited to 'server/materials/models.py')
| -rw-r--r-- | server/materials/models.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/server/materials/models.py b/server/materials/models.py index 5af19e3..8fde02b 100644 --- a/server/materials/models.py +++ b/server/materials/models.py @@ -6,6 +6,9 @@ from objects.models import * class MaterialCategory(models.Model): name = models.CharField(max_length=100) + def __unicode__(self): + return self.name + class Material(models.Model): # DEFINEME name = models.CharField(max_length=500) @@ -22,7 +25,6 @@ class Material(models.Model): modulus_elasticity = models.FloatField("Modulus of elasticity", blank=True) modulus_youngs = models.FloatField("Young's modulus", blank=True) - hardness_mohs = models.FloatField(blank=True) hardness_brinnel = models.FloatField(blank=True) thermal_inductance = models.FloatField(blank=True) @@ -31,9 +33,13 @@ class Material(models.Model): electrical_inductance = models.FloatField(blank=True) electrical_capacity = models.FloatField(blank=True) + # nuclear profile? radioactivity_profile? # electrical profile? # thermal profile? + + def __unicode__(self): + return self.name class Process(models.Model): @@ -46,6 +52,8 @@ class Process(models.Model): outputobjects = models.ManyToManyField(Object, related_name="%(class)s_outputobj") outputintangibles = models.ManyToManyField(Intangible, related_name="%(class)s_outputintang") + def __unicode__(self): + return self.name # # Registering tables with admin site |