Permalink
Browse files

Merge branch 'Issues/#25' of https://github.com/BEXIS2/Core into Issues/

  • Loading branch information...
javadch committed Jun 5, 2018
2 parents 45afe68 + 23cd6f5 commit 5318e519a3c1fbb67bfc1e71dd97ebfef7d24974
@@ -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);
@@ -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();

0 comments on commit 5318e51

Please sign in to comment.