#25 The system columns are filtered out of the datatable

BEXIS2 · May 31, 2018 · 23cd6f5 · 23cd6f5
1 parent 4051f5c
commit 23cd6f5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/Console/BExIS.Web.Shell/Areas/DDM/Controllers/DataController.cs b/Console/BExIS.Web.Shell/Areas/DDM/Controllers/DataController.cs
@@ -257,7 +257,8 @@ public ActionResult ShowPrimaryData(long datasetID)
                         //
                         //List<AbstractTuple> dataTuples = dm.GetDatasetVersionEffectiveTuples(dsv, 0, 100);
                         //DataTable table = SearchUIHelper.ConvertPrimaryDataToDatatable(dsv, dataTuples);
-                        DataTable table = dm.GetLatestDatasetVersionTuples(dsv.Dataset.Id, 0, 100, true);
+
+                        DataTable table = dm.GetLatestDatasetVersionTuples(dsv.Dataset.Id, null, null, null, 1, 100);
 
                         Session["gridTotal"] = dm.GetDatasetVersionEffectiveTupleCount(dsv);
 

diff --git a/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/_structuredDataView.cshtml b/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/_structuredDataView.cshtml
@@ -128,27 +128,26 @@
 					if (column.ColumnName.ToLower().StartsWith("var"))
 					{
 						visible = true;
-					}
-
 
-					DisplayFormatObject dfo = Model.DisplayFormats.FirstOrDefault(a => a.Column.Equals(title)); 
+						DisplayFormatObject dfo = Model.DisplayFormats.FirstOrDefault(a => a.Column.Equals(title));
 
-					string format = "";
+						string format = "";
 
-					if (dfo != null && !string.IsNullOrEmpty(dfo.Format))
-					{
-						//string unit = "";
-						//if (dfo.Unit != "None") unit = dfo.Unit;
+						if (dfo != null && !string.IsNullOrEmpty(dfo.Format))
+						{
+							//string unit = "";
+							//if (dfo.Unit != "None") unit = dfo.Unit;
 
-						format = "{0:" + dfo.Format +"}";
+							format = "{0:" + dfo.Format + "}";
 
-						columns.Bound(column.DataType, column.ColumnName)
-						   .Title(title).Format(format).Hidden(!visible);
-					}
-					else
-					{
-						columns.Bound(column.DataType, column.ColumnName)
-						   .Title(title).Hidden(!visible);
+							columns.Bound(column.DataType, column.ColumnName)
+							   .Title(title).Format(format).Hidden(!visible);
+						}
+						else
+						{
+							columns.Bound(column.DataType, column.ColumnName)
+							   .Title(title).Hidden(!visible);
+						}
 					}
 				}
 			})
@@ -192,28 +191,28 @@
 
 	function PrimaryData_OnCommand(e) {
 
-	    var grid = $("#PrimaryDataResultGrid").data("tGrid");
+		var grid = $("#PrimaryDataResultGrid").data("tGrid");
 
-	    var columns = grid.columns;
+		var columns = grid.columns;
 
-	    var currentFilter = grid.filterBy;
-	    var currentOrder = grid.orderBy;
+		var currentFilter = grid.filterBy;
+		var currentOrder = grid.orderBy;
 
-	    var visibleColumns ="";
-	    jQuery.each(columns, function (index) {
-		    if (!this.hidden) {
-			    if (visibleColumns != "")
+		var visibleColumns ="";
+		jQuery.each(columns, function (index) {
+			if (!this.hidden) {
+				if (visibleColumns != "")
 
-				    visibleColumns += "," + this.member;
-			    else
-				    visibleColumns = this.member;
-		    }
-	    });
+					visibleColumns += "," + this.member;
+				else
+					visibleColumns = this.member;
+			}
+		});
 
 		$.post('@Url.Action("SetGridCommand", "Data", new RouteValueDictionary { { "area", "ddm" } })', { filters: currentFilter, orders: currentOrder, columns: visibleColumns }, function (response) {
 		//alert("set grid");
 		OnDataBound();
-	    })
+		})
 
 		resetAllTelerikIconTitles();
 		addTooltips();