Submissions: Static Files

maxplanck-ie · Oct 23, 2024 · 23734ae · 23734ae
1 parent ce52355
commit 23734ae
Show file tree

Hide file tree

Showing 14 changed files with 367 additions and 445 deletions.
diff --git a/backend/static/main-hub/app/components/BaseGridController.js b/backend/static/main-hub/app/components/BaseGridController.js
@@ -312,7 +312,9 @@ Ext.define("MainHub.components.BaseGridController", {
   },
 
   gridCellTooltipRenderer: function (value, meta) {
-    meta.tdAttr = Ext.String.format('data-qtip="{0}"', value);
+    if (value) {
+      meta.tdAttr = 'data-qtip="' + value + '"';
+    } else meta.tdAttr = "data-qtip=Empty";
     return value;
   },
 

diff --git a/backend/static/main-hub/app/model/incominglibraries/IncomingLibraries.js b/backend/static/main-hub/app/model/incominglibraries/IncomingLibraries.js
@@ -34,20 +34,15 @@ Ext.define("MainHub.model.incominglibraries.IncomingLibraries", {
       allowNull: true
     },
     {
-      name: "qpcr_result_facility",
-      type: "float",
-      allowNull: true
+      name: "measuring_unit_facility",
+      type: "string"
     },
     {
-      name: "rna_quality_facility",
+      name: "measured_value_facility",
       type: "float",
       allowNull: true,
       defaultValue: null
     },
-    {
-      name: "comments_facility",
-      type: "string"
-    },
     {
       name: "samples_submitted",
       type: "bool"
@@ -58,4 +53,4 @@ Ext.define("MainHub.model.incominglibraries.IncomingLibraries", {
       allowNull: true
     }
   ]
-});
+});
diff --git a/backend/static/main-hub/app/model/libraries/BatchAdd/Common.js b/backend/static/main-hub/app/model/libraries/BatchAdd/Common.js
@@ -41,6 +41,16 @@ Ext.define("MainHub.model.libraries.BatchAdd.Common", {
       type: "string",
       name: "name"
     },
+    {
+      name: "measuring_unit",
+      type: "string"
+    },
+    {
+      name: "measured_value",
+      type: "float",
+      allowNull: true,
+      defaultValue: null
+    },
     {
       type: "int",
       name: "library_protocol",
@@ -59,25 +69,10 @@ Ext.define("MainHub.model.libraries.BatchAdd.Common", {
       defaultValue: null
     },
     {
+      name: "volume",
       type: "float",
-      name: "concentration",
       defaultValue: null
     },
-    {
-      type: "int",
-      name: "concentration_method",
-      allowNull: true,
-      defaultValue: null
-    },
-    {
-      type: "int",
-      name: "amplification_cycles",
-      defaultValue: null
-    },
-    {
-      type: "bool",
-      name: "equal_representation_nucleotides"
-    },
     {
       type: "int",
       name: "read_length",
@@ -116,13 +111,12 @@ Ext.define("MainHub.model.libraries.BatchAdd.Common", {
         dataIndex: "name"
       }
     ],
+    measuring_unit: "presence",
     library_protocol: "presence",
     library_type: "presence",
-    concentration: "presence",
+    volume: "greaterthanten",
     read_length: "presence",
     sequencing_depth: "greaterthanten",
-    // amplification_cycles: 'presence',
-    // concentration_method: 'presence',
     organism: "presence"
   }
 });
diff --git a/backend/static/main-hub/app/model/libraries/BatchAdd/Library.js b/backend/static/main-hub/app/model/libraries/BatchAdd/Library.js
@@ -52,12 +52,6 @@ Ext.define("MainHub.model.libraries.BatchAdd.Library", {
     {
       type: "string",
       name: "index_i5"
-    },
-    {
-      type: "int",
-      name: "qpcr_result",
-      allowNull: true,
-      defaultValue: null
     }
   ],
 

diff --git a/backend/static/main-hub/app/model/libraries/BatchAdd/Sample.js b/backend/static/main-hub/app/model/libraries/BatchAdd/Sample.js
@@ -33,6 +33,14 @@ Ext.define("MainHub.model.libraries.BatchAdd.Sample", {
       name: "rna_quality",
       allowNull: true,
       defaultValue: null
+    },
+    {
+      name: "biosafety_level",
+      type: "string"
+    },
+    {
+      name: "gmo",
+      type: "bool"
     }
   ],
 

diff --git a/backend/static/main-hub/app/model/libraries/Library.js b/backend/static/main-hub/app/model/libraries/Library.js
@@ -32,11 +32,6 @@ Ext.define("MainHub.model.libraries.Library", {
       name: "library_type_name",
       type: "string"
     },
-    {
-      name: "amplification_cycles",
-      type: "int",
-      allowNull: true
-    },
     {
       name: "organism",
       type: "int"
@@ -67,32 +62,19 @@ Ext.define("MainHub.model.libraries.Library", {
       type: "string"
     },
     {
-      name: "equal_representation_nucleotides",
-      type: "bool",
-      allowNull: true
-    },
-    {
-      name: "concentration",
-      type: "float",
+      name: "mean_fragment_size",
+      type: "int",
       allowNull: true
     },
     {
-      name: "concentration_method",
-      type: "int"
-    },
-    {
-      name: "concentration_method_name",
+      name: "measuring_unit",
       type: "string"
     },
     {
-      name: "mean_fragment_size",
-      type: "int",
-      allowNull: true
-    },
-    {
-      name: "qpcr_result",
+      name: "measured_value",
       type: "float",
-      allowNull: true
+      allowNull: true,
+      defaultValue: null
     },
     {
       name: "read_length",
@@ -119,6 +101,12 @@ Ext.define("MainHub.model.libraries.Library", {
       name: "nucleic_acid_type",
       type: "int"
     },
+    {
+      name: "volume",
+      type: "float",
+      allowNull: true,
+      defaultValue: null
+    },
     {
       name: "rna_quality",
       type: "float",
@@ -129,6 +117,14 @@ Ext.define("MainHub.model.libraries.Library", {
       name: "pool",
       type: "string",
       defaultValue: ""
+    },
+    {
+      name: "biosafety_level",
+      type: "string"
+    },
+    {
+      name: "gmo",
+      type: "bool"
     }
   ]
 });
diff --git a/backend/static/main-hub/app/model/librarypreparation/LibraryPreparation.js b/backend/static/main-hub/app/model/librarypreparation/LibraryPreparation.js
@@ -102,11 +102,6 @@ Ext.define("MainHub.model.librarypreparation.LibraryPreparation", {
       type: "float",
       allowNull: true
     },
-    {
-      name: "qpcr_result",
-      type: "float",
-      allowNull: true
-    },
     {
       name: "dilution_factor",
       type: "int",

diff --git a/backend/static/main-hub/app/view/incominglibraries/IncomingLibrariesController.js b/backend/static/main-hub/app/view/incominglibraries/IncomingLibrariesController.js
@@ -95,13 +95,12 @@ Ext.define("MainHub.view.incominglibraries.IncomingLibrariesController", {
     var store = gridView.grid.getStore();
     var allowedColumns = [
       "dilution_factor",
-      "concentration_facility",
-      "concentration_method_facility",
+      "measuring_unit_facility",
+      "measured_value_facility",
       "sample_volume_facility",
       "amount_facility",
       "size_distribution_facility",
       "comments_facility",
-      "qpcr_result_facility",
       "rna_quality_facility"
     ];
     var ngFormulaDataIndices = [

diff --git a/backend/static/main-hub/app/view/invoicing/InvoicingController.js b/backend/static/main-hub/app/view/invoicing/InvoicingController.js
@@ -117,7 +117,9 @@ Ext.define("MainHub.view.invoicing.InvoicingController", {
   },
 
   gridCellTooltipRenderer: function (value, meta) {
-    meta.tdAttr = Ext.String.format('data-qtip="{0}"', value);
+    if (value) {
+      meta.tdAttr = 'data-qtip="' + value + '"';
+    } else meta.tdAttr = "data-qtip=Empty";
     return value;
   },