Compare commits

..

No commits in common. "56e7d25acd3f6bcbb286508193c518995231e54b" and "d149a1553084de124563df1e39e94dd1e57a5f54" have entirely different histories.

2 changed files with 4 additions and 33 deletions

View File

@ -1,10 +1,4 @@
import {
DATA_FORMAT,
DATA_TYPE,
FILTER_FIELD_TYPE,
FILTER_TYPE,
REPORT_GROUP,
} from '../../../constant';
import { DATA_FORMAT, DATA_TYPE, REPORT_GROUP } from '../../../constant';
import { ReportConfigEntity } from '../../../entities/report-config.entity';
export default <ReportConfigEntity>{
@ -42,26 +36,5 @@ export default <ReportConfigEntity>{
format: DATA_FORMAT.TEXT,
},
],
filter_configs: [
{
filed_label: 'Name',
filter_column: 'main__name',
field_type: FILTER_FIELD_TYPE.select,
filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
select_data_source_url: '/v1/season-types',
select_custom_options: [],
select_label_key: 'name',
select_value_key: 'name',
},
{
filed_label: 'Status',
filter_column: 'main__status',
field_type: FILTER_FIELD_TYPE.input_text,
filter_type: FILTER_TYPE.TEXT_EQUAL,
// select_data_source_url: '/v1/season-types',
// select_custom_options: [],
// select_label_key: 'code',
// select_value_key: 'code',
},
],
filter_configs: [],
};

View File

@ -360,10 +360,8 @@ export class ReportQueryBuilder {
});
}
const tableWhereConditions = [...whereCondition, ...whereParts].filter(
Boolean,
);
const defaultWhereConditions = defaultWhereOptions.filter(Boolean);
const tableWhereConditions = [...whereCondition, ...whereParts];
const defaultWhereConditions = defaultWhereOptions;
if (tableWhereConditions.length > 0) {
return `WHERE (${