sriramphanib/WebBuild
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change

Browse Source
This commit is contained in:
sriram
2023-03-13 08:13:18 +00:00
parent b6c4e025bc
commit 0da601e691
36 changed files with 215 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wwwroot/platform/analytics/components/reportbuilder/style.reportbuilder.css
+8 -3
View File
@@ -50,9 +50,6 @@
padding: 1.25rem;
}
._bizgaze_popup_container .biz-pg-wrapper {
margin-top: 0px !important;
}
.select2-container--default .select2-results > #select2-RptGroup_AutoComplete-results {
max-height: 115px !important;
@@ -409,4 +406,12 @@ custom-right-chart-nav .nav-tabs > li.nav-item a.nav-link.active {
.biz-bldr-wrap.chart_view .reportbuilder-main-wrap {
overflow: hidden;
}
.biz-reportbuilder-wrap .biz-drawer {
width: 290px;
}
.biz-reportbuilder-wrap.biz-drawer-push.biz-drawer-pushright .biz-pg-wrapper {
margin-right: 290px;
}
wwwroot/platform/analytics/components/reportfolder.js
+7 -1
View File
@@ -170,7 +170,13 @@ var Unibase;
});
let searchReports = [];
for (let i = 0; i < this.allReports[0].length; i++) {
let reportName = this.allReports[0][i].ReportName.toLowerCase();
let reportName;
if (this.allReports[0][i].DisplayName == "" || this.allReports[0][i].DisplayName == null) {
reportName = this.allReports[0][i].ReportName.toLowerCase();
}
else {
reportName = this.allReports[0][i].DisplayName.toLowerCase();
}
if (searchText != '') {
if (reportName.includes(searchText)) {
searchReports.push(this.allReports[0][i]);
wwwroot/platform/analytics/components/reportviewer/_reportviewer.js
+9 -4
View File
@@ -776,6 +776,7 @@ ${instance.getViewAllHtml(containerid, 'desktop', reportid)}
if (reportInfo.PinDynamicFilters || $(`#unPinDynamicFiltersIcon_${containerid}`).is(':visible')) {
instance.pinDynamicFiltersHandler(reportid, containerid);
}
instance.noDataMessage(rv_instance.dynamicFilters, reportInfo.IsAutoData, containerid);
}
else {
var _chartviewer = Unibase.Platform.Analytics.Charts.ChartViewer.Instance();
@@ -2974,6 +2975,7 @@ ${instance.getViewAllHtml(containerid, 'desktop', reportid)}
let tableViewer = Unibase.Platform.Analytics.Viewers.TableViewer.Instance();
if (response.result.ReportInfo.PivotTypeId != 0 && !response.result.ReportInfo.IsTreeExpand) {
tableViewer.loadView(response, reportid, rv_instance.ViewerSettings.selectedViewerTypeId, instance.Page, instance.PageSize, containerid, rv_instance.ViewerSettings, null, rv_instance.reportWidgetData);
instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
}
else {
let responseData = filterresponse.Result.Data;
@@ -2988,10 +2990,7 @@ ${instance.getViewAllHtml(containerid, 'desktop', reportid)}
if (!responseData.length) {
$("#btn-list-load-more_div_" + containerid).addClass('hidden');
$(`#Viewer_${containerid} .report-viewer-footer`).addClass('hidden');
if (!rv_instance.dynamicFilters.length && !rv_instance.reportResponse.result.ReportInfo.IsAutoData)
$("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
else
$("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
}
else {
$(`#Viewer_${containerid} .report-viewer-footer`).removeClass('hidden');
@@ -3053,6 +3052,12 @@ ${instance.getViewAllHtml(containerid, 'desktop', reportid)}
});
});
}
noDataMessage(dynamicFilters, isAutoData, containerid) {
if (!dynamicFilters.length && !isAutoData)
$("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
else
$("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
}
clearGlobalDateFilter(containerId, reportId) {
var dateTimeHelper = Unibase.Platform.Helpers.DateTimeHelper.Instance();
let user = Unibase.Platform.Membership.Infos.Identity.currentUser;
wwwroot/platform/analytics/components/tableviewer/tableviewer.js
+9 -8
View File
@@ -1220,14 +1220,14 @@ var Unibase;
}
tableCellClick(e, cell, level, mainreportid, subres, containerid) {
var instance = this;
var filter = [];
var appliedFilters = [];
if (subres.length != 0) {
var subrpt = subres.find(s => s.AliasName == cell["_cell"].column.definition.field);
if (subrpt) {
var row = cell.getRow();
let row_data = row.getData();
if (subrpt.SubReportTypeId == Unibase.Platform.Analytics.Reports.Enums.SubReportType.Detail) {
var onclick = "Unibase.Platform.Helpers.NavigationHelper.Instance().loadDetail({{" + subrpt.PrimaryKeyColumn + "}},{{appinstalledappid}},null,null);";
var onclick = `Unibase.Platform.Helpers.NavigationHelper.Instance().loadDetail({{${subrpt.PrimaryKeyColumn}}},{{appinstalledappid}},null,null);`;
onclick = onclick.replace("{{appinstalledappid}}", subrpt.InstalledAppId);
onclick = onclick.replace("{{" + subrpt.PrimaryKeyColumn + "}}", row_data[subrpt.PrimaryKeyColumn]);
var templateScript = Handlebars.compile(onclick);
@@ -1242,22 +1242,23 @@ var Unibase;
dynamicFilters.forEach(filter => {
filter.IsSubReportFilter = true;
});
filter = filter.concat(dynamicFilters);
appliedFilters = appliedFilters.concat(dynamicFilters);
}
var filters = JSON.parse(subrpt.Filters);
for (var i = 0; i < filters.length; i++) {
let fill = filters[i];
var subRepFilters = JSON.parse(subrpt.Filters);
subRepFilters = subRepFilters.filter(item1 => appliedFilters.some(item2 => item1.ParameterName === item2.ParameterName));
for (var i = 0; i < subRepFilters.length; i++) {
let fill = subRepFilters[i];
let value = row_data[fill.ParameterName.trim()];
let expid = instance.getExpId(fill.Operator);
if (fill.Isvalue)
value = fill.ParameterName;
filter.push({
appliedFilters.push({
ParameterName: fill.ParameterValue.trim(),
ParameterValue: value.toString(),
ExpOp: expid, IsSubReportFilter: true
});
}
instance._reportViewer.dynamicFilters = filter.filter((f, i, a) => a.findIndex(f2 => (f.ParameterName === f2.ParameterName)) === i);
instance._reportViewer.dynamicFilters = appliedFilters.filter((f, i, a) => a.findIndex(f2 => (f.ParameterName === f2.ParameterName)) === i);
instance._reportViewer.isSubReport = true;
return instance._reportViewer.report_ViewAll(subrpt.ChildReportId, 0, "_linkedreport_" + subrpt.ChildReportId);
}