Dk api test (#820)

* temp save * temp save * temp save * tabs with multiple datatables implemented * multi tab data tables completed * Subsection type "api" added. * field_page_mode issue resolved. * BYOR a new option "sub to top" is added to "data convert" option * Data convert "split" updated * BYOR "data convert" option "from parameter" added. * json lines option in BYOR sections component updated
broadinstitute · Dec 17, 2024 · 81f182e · 81f182e
1 parent 393d5b4
commit 81f182e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 32 deletions.
diff --git a/src/components/researchPortal/ResearchHeatmap.vue b/src/components/researchPortal/ResearchHeatmap.vue
@@ -42,6 +42,7 @@
 						:sectionId="sectionId"
 						:utils="utils"
 						:ref="sectionId + '_heatmap'"
+						@mousemove="checkPosition($event)" 
 					>
 					</research-heatmap-vector>
 				</div>

diff --git a/src/components/researchPortal/ResearchSection.vue b/src/components/researchPortal/ResearchSection.vue
@@ -1499,9 +1499,8 @@ export default Vue.component("research-section", {
 						
 					} else if (!!dataWrappers){
 
-						let tempData = []
-						let headers = [];
-
+						let tempData = {}
+						let headers = {};
 
 						dataWrappers.map(dataWrapper => {
 
@@ -1511,54 +1510,41 @@ export default Vue.component("research-section", {
 								dataEntity = dataEntity[w];
 							})
 
-							headers = headers.concat(dataEntity);
+							//headers = headers.concat(dataEntity);
+							headers[dataWrapper["stamp"]] = dataEntity;
+							//headers[dataWrapper["stamp"]].push("stamp");
 
 						})
 
-						let uniqHeaders = [...new Set(headers)];
-
-						uniqHeaders.push("stamp")
-						
-
 						dataWrappers.map(dataWrapper => {
 
 							let dataEntity = CONTENT;
-							dataWrapper["headers"].map(w => {
-
-								dataEntity = dataEntity[w];
-							})
-
-							let tempHeaders = dataEntity;
-
-							dataEntity = CONTENT;
 
 							dataWrapper["data"].map(w => {
 								dataEntity = dataEntity[w];
 							})
+							tempData[dataWrapper["stamp"]] = dataEntity;
+						})
 
-							dataEntity.map((item,itemIndex) => {
-								let tempObj = {}
+						let mergedData = []
 
-								item.map((column, columnIndex) => {
-									tempObj[headers[columnIndex]] = column;
-								})
+						dataWrappers.map(dataWrapper => {
 
-								tempObj["stamp"] = dataWrapper["stamp"];
+							let stamp = dataWrapper["stamp"];
 
-								tempData.push(tempObj);
-							})
+							tempData[stamp].map(item => {
+								let tempObj = {};
 
-						})
+								headers[stamp].map((header, hIndex) => {
 
-						let mergedData = [];
+									tempObj[header] = item[hIndex];
+
+								})
 
-						tempData.map(d => {
-							let tempObj = {}
-							uniqHeaders.map(header => {
-								tempObj[header] = (!!d[header])? d[header]:"";
+								tempObj["stamp"] = stamp;
+								mergedData.push(tempObj)
 							})
 
-							mergedData.push(tempObj);
 						})
 
 						data = mergedData;