Skip to content

Commit

Permalink
Merge pull request #90 from erssebaggala/preserve_column_order_on_export
Browse files Browse the repository at this point in the history
Preserve column order on export
  • Loading branch information
erssebaggala authored Aug 26, 2019
2 parents 22742af + ff8539c commit 3cc2bbc
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ os:

cache:
yarn: true
timeout: 1200
directories:
- node_modules
- $HOME/.cache/electron
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Boda-Lite is a minimal feature version of [bts-ce](https://github.com/bodastage/
platform telecommunication management desktop app.

## Features
* Parsing telecommunication configuration management dumps for various vendors(Ericsson, Huawei, Nokia, ZTE)
* Parsing and loading telecommunication configuration management(CM) dumps for various vendors(Ericsson, Huawei, Nokia, ZTE)
* Parsing and loading telecommunication performance management(PM) network dumps
* Reports module that supports tabular, graphs, and composite(dashboard-like) reports
* Advanced GIS module

Expand Down
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Boda-Lite is a multi-vendor network management desktop application. It is a mini
- [Parse and Import](parse_and_import.md)
- [Reports](reports.md)
- [GIS](gis.md)
- [Key Files and Folders](key_files_and_folders.md)
- [Contributing](contributing.md)
- [Development](development.md)

1 change: 0 additions & 1 deletion docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ Below is a summary of the steps needed to install and start the application:
* Drive Test Post-processing
* Optimization
* Geo-reference analysis
- [NEXT](installation.md)
10 changes: 10 additions & 0 deletions docs/key_files_and_folders.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Key Files and Folders
There are some key files and folders such as the log file, libraries folder, and migrations files.

Below is a list of key files and folder
1. Log file. The log file is useful when an error occurs in the application. Below are the locations for the different operation systems supported.
* on Linux: ~/.config/Boda-Lite/log.log
* on macOS: ~/Library/Logs/Boda-Lite/log.log
* on Windows: %USERPROFILE%\AppData\Roaming\Boda-Lite\log.log
2. Libraries. These include the parser jar files for the different vendor formats.
* on Windows: %USERPROFILE%\AppData\Local\Programs\Boda-Lite\resources
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Boda-Lite",
"version": "0.3.0-alpha.3",
"version": "0.3.0-alpha.4",
"description": "Boda-Lite is a telecommunication network management application",
"private": true,
"homepage": "./",
Expand Down
8 changes: 6 additions & 2 deletions src/modules/reports/TableReport.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,13 @@ class TableReport extends React.Component{
//Sanitize download file name
fileName = fileName.replace(/['"+]/g,"");

//Preserve column order in export
const columnOrder = this.gridColumnApi.getColumnState().filter(v => v.hide == false ).map( v => v.colId)
let downloadQuery = `SELECT "${columnOrder.join('","')}" FROM ( ${this.filteredSortedQuery} ) dq`

let payload = {
reportId: this.props.options.reportId, //deprecate
query: this.filteredSortedQuery,
query: downloadQuery,
filename: fileName, //Name of the file to be downloaded without extension
outputFolder: app.getPath('downloads'),
format: format
Expand Down Expand Up @@ -284,7 +288,7 @@ class TableReport extends React.Component{
let that = this;

if(typeof this.props.reportInfo === 'undefined') return;

let query = this.props.reportInfo.query ;

let dataSource = {
Expand Down
2 changes: 1 addition & 1 deletion src/version.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const VERSION = "0.3.0-alpha.3";
export const VERSION = "0.3.0-alpha.4";

export default VERSION;

0 comments on commit 3cc2bbc

Please sign in to comment.