Removed dimensionality from datasets and fixed dimensionality entry i…

…ssue when adding systems.

materials/fixtures/datasets.json

@@ -17,7 +17,6 @@
       "visible": true,
       "is_figure": false,
       "is_experimental": true,
-      "dimensionality": 3,
       "sample_type": 0,
       "extraction_method": "",
       "representative": true,

materials/forms.py

@@ -360,17 +360,17 @@ class AddDataForm(forms.Form):
         help_text=""
         "Select whether the origin of data is experimental or theoretical.",
     )
-    dimensionality_of_the_inorganic_component = forms.ChoiceField(
-        initial=models.Dataset.DIMENSIONALITIES[0],
-        choices=(models.Dataset.DIMENSIONALITIES),
-        widget=forms.RadioSelect(),
-        help_text=""
-        "Here the term dimensionality refers to the one typically used in the "
-        "context of organic-inorganic perovskites (a certain arrangement of "
-        "organic and inorganic components). This is not the standard "
-        "definition of the dimensionality of a system (single crystal, "
-        'film, ...). See "sample type" for that.',
-    )
+    # dimensionality_of_the_inorganic_component = forms.ChoiceField(
+    #     initial=models.Dataset.DIMENSIONALITIES[0],
+    #     choices=(models.Dataset.DIMENSIONALITIES),
+    #     widget=forms.RadioSelect(),
+    #     help_text=""
+    #     "Here the term dimensionality refers to the one typically used in the "
+    #     "context of organic-inorganic perovskites (a certain arrangement of "
+    #     "organic and inorganic components). This is not the standard "
+    #     "definition of the dimensionality of a system (single crystal, "
+    #     'film, ...). See "sample type" for that.',
+    # )
     sample_type = forms.ChoiceField(
         initial=models.Dataset.SAMPLE_TYPES[0],
         choices=(models.Dataset.SAMPLE_TYPES),

materials/migrations/0134_remove_dataset_dimensionality.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.14 on 2024-11-19 02:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materials', '0133_stoichiometry_elements_system_stoichiometry'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dataset',
+            name='dimensionality',
+        ),
+    ]

materials/models.py

@@ -242,9 +242,9 @@ class Dataset(Base):
     visible = models.BooleanField()
     is_figure = models.BooleanField()
     is_experimental = models.BooleanField()  # theoretical if false
-    dimensionality = models.PositiveSmallIntegerField(
-        choices=DIMENSIONALITIES, default=0
-    )
+    # dimensionality = models.PositiveSmallIntegerField(
+    #     choices=DIMENSIONALITIES, default=0
+    # )
     sample_type = models.PositiveSmallIntegerField(choices=SAMPLE_TYPES)
     extraction_method = models.CharField(max_length=300, blank=True)
     representative = models.BooleanField(default=False)

materials/serializers.py

@@ -166,7 +166,7 @@ class Meta:
             "reference",
             "visible",
             "is_experimental",
-            "dimensionality",
+            # "dimensionality",
             "sample_type",
             "extraction_method",
             "representative",
@@ -196,7 +196,7 @@ class Meta:
             "secondary_unit",
             "reference",
             "is_experimental",
-            "dimensionality",
+            # "dimensionality",
             "sample_type",
             "extraction_method",
         )
@@ -217,7 +217,7 @@ class Meta:
             "secondary_unit",
             "reference",
             "is_experimental",
-            "dimensionality",
+            # "dimensionality",
             "sample_type",
         )
 
@@ -241,7 +241,7 @@ class Meta:
 # SystemSerializer with a custom field for stoichiometry
 class SystemSerializer(serializers.ModelSerializer):
     stoichiometry = serializers.SerializerMethodField()
-    dimensionality = serializers.SerializerMethodField()
+    # dimensionality = serializers.SerializerMethodField()
 
     class Meta:
         model = models.System
@@ -257,9 +257,17 @@ class Meta:
             "derived_to_from",
             "description",
             "dimensionality",
+            "n",
             "stoichiometry",
         )
 
+        def to_representation(self, instance):
+            representation = super().to_representation(instance)
+            representation["dimensionality"] = DIMENSIONALITIES.get(
+                instance.dimensionality, None
+            )
+            return representation
+
     def get_stoichiometry(self, obj):
         # Retrieve the first related System_Stoichiometry instance
         stoichiometry_set = obj.system_stoichiometry_set.first()