added consolidated data model idea

Author: ericmuckley

config.py

@@ -11,6 +11,7 @@ class Config:
     """Base config"""
 
     FLASK_APP = "wsgi.py"
+    JSON_SORT_KEYS = False
     SECRET_KEY = os.environ["SECRET_KEY"]
     JWT_SECRET_KEY = os.environ["SECRET_KEY"]
     STATIC_FOLDER = "static"

src/ingest/routes.py

@@ -16,7 +16,7 @@
 from ..database import db_utils
 from ..database import backend_methods as bm
 
-from ..utils.frontend import ASSET_TYPES
+from ..utils.frontend import ASSET_TYPES, DATA_SCHEMA
 from ..utils.networkgraph import get_network_data, NODESTYLES
 
 from flask import (
@@ -56,6 +56,11 @@ def experimentbuilder():
 
 
 
+@ingest_bp.route("/userdata")
+def userdata():
+    """Endpoint for reading consolidated data for the current user"""
+    return DATA_SCHEMA
+
 
 @ingest_bp.route("/ingestor", methods=["GET", "POST"])
 def ingestor():

src/ingest/static/js/ingestor.js

@@ -1,42 +1,44 @@
-const schema = {
-  'material': {
-    'name': {'type': 'string', 'color': 'rgba(0, 0, 255, 0.1)'},
-    'source': {'type': 'string', 'color': 'rgba(0, 0, 255, 0.1)'},
-    'lot_number': {'type': 'string', 'color': 'rgba(0, 0, 255, 0.1)'},
-    'notes': {'type': 'longstring', 'color': 'rgba(0, 255, 0, 0.1)'},
-    'keywords': {'type': 'list', 'color': 'rgba(0, 0, 255, 0.1)'},
-    'hazards': {'type': 'list', 'color': 'rgba(0, 0, 255, 0.1)'},
-    'properties': {'type': 'list', 'color': 'rgba(0, 0, 255, 0.1)'},
-  },
-  'property': {
-    'name': {'type': 'string',},
-    'value': {'type': 'float',},
-    'units': {'type': 'string',},
-    'notes': {'type': 'string',},
-  },
-};
-
-
-
+// import current data as single large JSON
+// copy it using var d = d0.slice();
+// make adjustments to d
+// save or cancel at the end
 
 
 
 const tablediv = document.getElementById('tablediv');
-var matcols = Object.keys(schema['material']);
-
+var udata = {};
+var matkeys = [];
+
+// retrieve the consolidated data
+getUserData();
+
+// retrieve data from the server
+function getUserData(){
+  $.ajax({
+      url: "/userdata",
+      type: "get",
+      success: function(r) {
+        udata = r;
+        updateTable();
+      },
+  });
+};
 
 
 function updateTable() {
 
+  // get material keys
+  var matkeys = Object.keys(udata['materials'][0]);
+
   // create table
-  const table = document.createElement('table');
+  var table = document.createElement('table');
   table.id = 'ingesttable';
   table.classList.add('table', 'table-hover');
 
   // loop over each row
   // this should happen before table headers are created
-  // so that the so that the tbody is created automatically 
-  for (let r = 0; r < 3; r++) {
+  // so that the tbody is created automatically 
+  for (let r = 0; r < udata['materials'].length; r++) {
     const tr = table.insertRow();
     tr.id = r;
 
@@ -48,33 +50,38 @@ function updateTable() {
 
 
     // loop over each cell in the row
-    for (mc of matcols) {
+    for (mk of matkeys) {
       const td = tr.insertCell();
 
       var el = document.createTextNode('');
-      var datatype = schema['material'][mc]['type'];
+      var dataval = udata['materials'][0][mk];
 
-      if (datatype === 'string') {
-        el = createInput(id='id'+r+mc, placeholder=formatLabel(mc), value='');
-        el.addEventListener('input', parseTable);
+      if (typeof dataval === 'string') {
 
-      } else if (datatype === 'longstring') {
-        el = createButton(trigger='notesmodal', id='id'+r+mc,)
+        if (mk === 'notes') {
+          el = createButton(trigger='notesmodal', id='id'+r+mk,)
+        } else {
+          el = createInput(id='id'+r+mk, placeholder=formatLabel(mk), value='');
+          el.addEventListener('input', parseTable);
+        };
 
-      } else if (datatype === 'list') {
+      } else if (dataval.constructor === Array) {
 
-        if (mc === 'keywords') {
-          el = createButton(trigger='keywordsmodal', id='id'+r+mc,)
+        if (mk === 'keywords') {
+          el = createButton(trigger='keywordsmodal', id='id'+r+mk,)
         };
 
-        if (mc === 'hazards') {
-          el = createButton(trigger='hazardsmodal', id='id'+r+mc,)
+        if (mk === 'hazards') {
+          el = createButton(trigger='hazardsmodal', id='id'+r+mk,)
         };
 
-        if (mc === 'properties') {
-          el = createButton(trigger='propertiesmodal', id='id'+r+mc,)
+        if (mk === 'properties') {
+          el = createButton(trigger='propertiesmodal', id='id'+r+mk,)
         };
 
+        if (mk === 'data') {
+          el = createButton(trigger='datamodal', id='id'+r+mk,)
+        };
 
       };
 
@@ -89,7 +96,7 @@ function updateTable() {
   // create table headers
   const thead = table.createTHead();
   var row = thead.insertRow(0);
-  for (mc of [''].concat(matcols)) {
+  for (mc of [''].concat(matkeys)) {
     var cell = row.insertCell();
     cell.innerHTML = formatLabel(mc);
   };
@@ -99,15 +106,16 @@ function updateTable() {
 
 
 // build the table
-var table = updateTable();
+//var table = updateTable();
 
 
 
 
 // parse the table contents into JSON format
 function parseTable() {
+  var table = document.getElementById('ingesttable');
   // create object to hold data from table
-  var data = {'materials': []};
+  var dataexport = {'materials': []};
   // iterate over table rows
   for (var r = 0, row; row = table.rows[r]; r++) {
     // skip the headers row
@@ -117,18 +125,17 @@ function parseTable() {
     // iterate over table columns
     for (var c = 1, cell; cell = row.cells[c]; c++) {
         // get name of current column (subtract 1 to ignore the 'delete row' button in 1st column)
-        var colname = matcols[c-1];
-        console.log(colname);
+        var colname = matkeys[c-1];
         // if cell contains a text input, add its value to the data object
-        if (schema['material'][colname]['type'] === 'string') {
+        if (typeof cell.children[0].value === 'string') {
           mat[colname] = cell.children[0].value;
       };
     };
     // add material to the dataset
-    data['materials'].push(mat);
+    dataexport['materials'].push(mat);
   };
   // display the dataset on the UI
-  document.getElementById('results').innerHTML = '<pre><b>Result:</b><br>' + JSON.stringify(data, null, 4) + '</pre>';
+  document.getElementById('results').innerHTML = '<pre><b>Result:</b><br>' + JSON.stringify(dataexport, null, 4) + '</pre>';
 };
 
 

src/ingest/templates/ingestor.html

@@ -14,6 +14,7 @@ <h1 class="card-header">
 		Materials table for data ingestion
 	</h1>
 
+
 	<div class="card-body">
 
 		<button id='addmaterialbtn' type='button' class='btn btn-success'><i class='bi bi-plus-lg'></i> Add new material</button>

src/utils/frontend.py

@@ -3,6 +3,30 @@
 
 """
 
+DATA_SCHEMA = {
+  'materials': [
+    {
+        'name': '',
+        'source': '',
+        'lot_number': '',
+        'notes': '',
+        'keywords': [''],
+        'hazards': [''],
+        'properties': [
+            {'name': '', 'value': 0, 'units': '',},
+        ],
+        'data': [
+            {'filename': '', 'data': '', 'notes': '',},
+        ],
+    },
+  ],
+};
+
+
+
+
+
+
 ASSET_TYPES = ["group", "publication", "collection", "experiment"]