Lib/Sample Page

maxplanck-ie · Oct 6, 2024 · 6633376 · 6633376
1 parent a42fd8a
commit 6633376
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 22 deletions.
diff --git a/backend/library/migrations/0009_alter_library_removed_concentration_method.py b/backend/library/migrations/0009_alter_library_removed_concentration_method.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.15 on 2024-09-25 00:31
+
+from django.db import migrations, models
+import library_sample_shared.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library_sample_shared', '0011_alter_indexi5_number_alter_indexi5_prefix_and_more'),
+        ('library', '0008_alter_library_removed_equal_representation_nucleotides'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='library',
+            name='removed_concentration_method',
+            field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(library_sample_shared.models.get_removed_concentrationmethod), to='library_sample_shared.concentrationmethod', verbose_name='Concentration Method'),
+        ),
+    ]
diff --git a/backend/library/migrations/max_migration.txt b/backend/library/migrations/max_migration.txt
@@ -1 +1 @@
-0008_alter_library_removed_equal_representation_nucleotides
+0009_alter_library_removed_concentration_method
diff --git a/backend/library_sample_shared/models.py b/backend/library_sample_shared/models.py
@@ -401,6 +401,8 @@ def index_i5_id(self):
     removed_concentration_method = models.ForeignKey(
         ConcentrationMethod,
         verbose_name="Concentration Method",
+        null=True,
+        blank=True,
         on_delete=models.SET(get_removed_concentrationmethod),
     )  # This field is not in use
 

diff --git a/backend/sample/migrations/0013_alter_sample_removed_concentration_method.py b/backend/sample/migrations/0013_alter_sample_removed_concentration_method.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.15 on 2024-09-25 00:31
+
+from django.db import migrations, models
+import library_sample_shared.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library_sample_shared', '0011_alter_indexi5_number_alter_indexi5_prefix_and_more'),
+        ('sample', '0012_alter_sample_removed_equal_representation_nucleotides'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sample',
+            name='removed_concentration_method',
+            field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(library_sample_shared.models.get_removed_concentrationmethod), to='library_sample_shared.concentrationmethod', verbose_name='Concentration Method'),
+        ),
+    ]
diff --git a/backend/sample/migrations/max_migration.txt b/backend/sample/migrations/max_migration.txt
@@ -1 +1 @@
-0012_alter_sample_removed_equal_representation_nucleotides
+0013_alter_sample_removed_concentration_method
diff --git a/backend/static/main-hub/app/view/libraries/Libraries.js b/backend/static/main-hub/app/view/libraries/Libraries.js
@@ -437,6 +437,12 @@ Ext.define("MainHub.view.libraries.Libraries", {
               return meta.record.getPoolPaths();
             }
           },
+          {
+            text: "GMO",
+            tooltip: "Genetically Modified Organism",
+            dataIndex: "gmo",
+            renderer: "gridCellTooltipRenderer"
+          },
           {
             text: "Date",
             dataIndex: "create_time",
@@ -466,28 +472,49 @@ Ext.define("MainHub.view.libraries.Libraries", {
             dataIndex: "concentration"
           },
           {
-            text: "RQN",
-            tooltip: "RNA Quality",
-            dataIndex: "rna_quality",
-            width: 55,
-            renderer: function (value) {
-              return value === 11 ? "Determined by Facility" : value;
-            }
+            text: "Measuring Unit",
+            tooltip: "Measuring Unit",
+            dataIndex: "measuring_unit",
+            renderer: "gridCellTooltipRenderer"
           },
           {
-            text: "bp",
-            tooltip: "Mean Fragment Size",
-            dataIndex: "mean_fragment_size"
+            text: "Measured Value",
+            tooltip: "Measured Value",
+            dataIndex: "measured_value",
+            renderer: "gridCellTooltipRenderer"
           },
           {
-            text: "Index Type",
-            dataIndex: "index_type_name",
+            text: "Starting Amount",
+            tooltip: "Starting Amount",
+            dataIndex: "amount_facility",
+            renderer: "gridCellTooltipRenderer"
+          },          {
+            text: "PCR Cycles",
+            tooltip: "PCR Cycles",
+            dataIndex: "pcr_cycles",
+            renderer: "gridCellTooltipRenderer"
+          },          {
+            text: "ng/μl (Output)",
+            tooltip: "ng/μl (Output)",
+            dataIndex: "concentration_facility",
             renderer: "gridCellTooltipRenderer"
           },
           {
-            text: "Index Reads",
-            tooltip: "# of Index Reads",
-            dataIndex: "index_reads"
+            text: "Measuring Unit (Output)",
+            tooltip: "Measuring Unit (Output)",
+            dataIndex: "measuring_unit_facility",
+            renderer: "gridCellTooltipRenderer"
+          },
+          {
+            text: "Measured Value (Output)",
+            tooltip: "Measured Value (Output)",
+            dataIndex: "measured_value_facility",
+            renderer: "gridCellTooltipRenderer"
+          },
+          {
+            text: "Index Type",
+            dataIndex: "index_type_name",
+            renderer: "gridCellTooltipRenderer"
           },
           {
             text: "I7",
@@ -509,11 +536,6 @@ Ext.define("MainHub.view.libraries.Libraries", {
             tooltip: "Sequencing Depth",
             dataIndex: "sequencing_depth"
           },
-          {
-            text: "Organism",
-            dataIndex: "organism_name",
-            width: 150
-          },
         ]
       }
     }