+
+
+
+
-
+
+
@@ -91,4 +436,13 @@ class GISMap extends React.Component{
}
}
-export default connect()(GISMap);
\ No newline at end of file
+function mapStateToProps(state){
+ return {
+ cells: state.gis.cells || {},
+ relations: state.gis.relations || {},
+ redraw: state.gis.redraw,
+ hiddenRelations: state.gis.hiddenRelations || {}
+ };
+}
+
+export default connect(mapStateToProps)(GISMap);
\ No newline at end of file
diff --git a/src/modules/gis/gis-actions.js b/src/modules/gis/gis-actions.js
new file mode 100644
index 00000000..b63f24ea
--- /dev/null
+++ b/src/modules/gis/gis-actions.js
@@ -0,0 +1,165 @@
+import { runQuery } from '../reports/DBQueryHelper.js';
+const log = window.require('electron-log');
+
+//Start fetching cells
+export const GIS_FETCH_CELLS = 'GIS_FETCH_CELLS';
+
+//Start fetching nbrs for a cell
+export const GIS_FETCH_NBRS = 'GIS_FETCH_NBRS';
+
+//Confirm that the cells have been received and add them to the state
+export const GIS_CONFIRM_CELLS_RECEIVED = 'GIS_CONFIRM_CELLS_RECEIVED';
+
+//Confirm that the nbrs have been received and add them to the state
+export const GIS_CONFIRM_NBRS_RECEIVED = 'GIS_CONFIRM_NBRS_RECEIVED';
+
+//Hide nbrs for a cell
+export const GIS_HIDE_CELL_NBRS = 'GIS_HIDE_CELL_NBRS';
+
+export const GIS_HIDE_RELATION = 'GIS_HIDE_RELATION';
+export const GIS_SHOW_RELATION = 'GIS_SHOW_RELATION';
+
+export const GIS_CLEAR = 'GIS_CLEAR';
+
+//Convert array to object
+const arrayToObject = (array, id) =>
+ array.reduce((obj, item) => {
+ obj[item[id]] = item
+ return obj
+ }, {})
+
+/*
+* Show error on the left panel
+*/
+export const GIS_SHOW_ERROR = 'GIS_SHOW_ERROR';
+export const GIS_SHOW_SUCCESS = 'GIS_SHOW_SUCCESS';
+export const GIS_SHOW_INFO = 'GIS_SHOW_INFO';
+
+export function gisFetchCells(){
+ return {
+ type: GIS_FETCH_CELLS
+ };
+}
+
+/*
+* Get the neighbour list for the give cell id
+*
+* @param integer ci Cell Identity
+*/
+export function gisFetchNbrs(ci){
+ return {
+ type: GIS_FETCH_NBRS,
+ ci: ci
+ };
+}
+
+
+/*
+*
+* @param array cells list of cells
+*/
+export function gisConfirmCellsReceived(cells){
+ return {
+ type: GIS_CONFIRM_CELLS_RECEIVED,
+ cells: cells
+ };
+}
+
+
+/*
+*
+* @param array cells list of nbr cell ids
+*/
+export function gisConfirmNbrsReceived(svrCI, nbrs){
+ return {
+ type: GIS_CONFIRM_NBRS_RECEIVED,
+ ci: svrCI,
+ nbrs: nbrs
+ };
+}
+
+
+export function gisShowError(errorMsg){
+ return {
+ type: GIS_SHOW_ERROR,
+ message: errorMsg
+ }
+}
+
+export function gisShowSuccess(successMsg){
+ return {
+ type: GIS_SHOW_SUCCESS,
+ message: successMsg
+ }
+}
+
+export function gisShowInfo(infoMsg){
+ return {
+ type: GIS_SHOW_INFO,
+ message: infoMsg
+ }
+}
+
+
+export function gisGetCells(){
+ return async (dispatch, getState) => {
+ dispatch(gisFetchCells());
+
+ const results = await runQuery('SELECT * FROM plan_network.vw_cells');
+ if(typeof results.error !== 'undefined'){
+ log.error(results.error);
+ return dispatch(gisShowError("Failed to retreive cells"));
+ }
+
+ dispatch(gisConfirmCellsReceived(arrayToObject(results.rows, 'ci')));
+ dispatch(gisShowSuccess("Cells successfull retrieved"));
+ }
+}
+
+/*
+* Get nbrs for a given cell
+*
+* @param integer svrCI Neighbour CI
+*
+*/
+export function gisGetNbrs(svrCI){
+ return async (dispatch, getState) => {
+ dispatch(gisFetchNbrs(svrCI));
+
+ const results = await runQuery(`SELECT svr_ci, nbr_ci FROM plan_network.relations r WHERE svr_ci = ${svrCI}`);
+ if(typeof results.error !== 'undefined'){
+ log.error(results.error);
+ return dispatch(gisShowError("Failed to retreive neighbours"));
+ }
+
+ dispatch(gisConfirmNbrsReceived(svrCI, results.rows));
+ dispatch(gisShowSuccess("Neighbours successfull retrieved"));
+ }
+}
+
+/*
+* Hide nbrs for a cell
+*
+* @param integer svrCI Cell ID
+*/
+export function gisHideCellNbrs(svrCI){
+ return {
+ type: GIS_HIDE_CELL_NBRS,
+ ci: svrCI
+ }
+}
+
+
+export function gisHideRelation(svrCI, nbrCI){
+ return {
+ type: GIS_HIDE_RELATION,
+ svr_ci: svrCI,
+ nbr_ci: nbrCI
+ }
+}
+
+export function gisClear(){
+ return {
+ type: GIS_CLEAR
+ }
+}
\ No newline at end of file
diff --git a/src/modules/gis/gis-helper.js b/src/modules/gis/gis-helper.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/modules/gis/gis-reducer.js b/src/modules/gis/gis-reducer.js
new file mode 100644
index 00000000..4c62f960
--- /dev/null
+++ b/src/modules/gis/gis-reducer.js
@@ -0,0 +1,70 @@
+import { GIS_CONFIRM_CELLS_RECEIVED, GIS_CONFIRM_NBRS_RECEIVED,
+ //Notifications
+ GIS_SHOW_ERROR,
+ GIS_SHOW_SUCCESS,
+ GIS_SHOW_INFO,
+ GIS_HIDE_CELL_NBRS,
+ GIS_HIDE_RELATION,
+ GIS_CLEAR} from './gis-actions';
+
+const initialState = {
+ cells: [],
+ relations: {},
+ redraw : 0,
+
+ //List of relations to hide
+ hiddenRelations: {},
+ carrierLayer: {}
+};
+
+function gis(state = initialState, action) {
+ switch (action.type) {
+ case GIS_CONFIRM_CELLS_RECEIVED:
+ return {
+ ...state,
+ cells: action.cells
+ }
+ case GIS_CONFIRM_NBRS_RECEIVED:
+ //Show hidden relations
+ let rlns = {}
+ Object.keys(state.hiddenRelations).forEach(key => {
+ let re = new RegExp(`^${action.ci}-`);
+ if(!key.match(re)) rlns[key] = 1;
+ });
+
+ return {
+ ...state,
+ relations: {
+ ...state.relations,
+ [action.ci]: action.nbrs
+ },
+ redraw: state.redraw + 1,
+ hiddenRelations: rlns
+ }
+ case GIS_HIDE_CELL_NBRS:
+ let relations = state.relations;
+ delete relations[action.ci];
+
+ console.log("delete relations[action.ci];:", relations);
+
+ return {
+ ...state,
+ relations: relations,
+ redraw: state.redraw + 1
+ }
+ case GIS_HIDE_RELATION:
+ return {
+ ...state,
+ hiddenRelations:{
+ ...state.hiddenRelations,
+ [action.svr_ci + "-" + action.nbr_ci]: {}
+ }
+ }
+ case GIS_CLEAR:
+ return initialState;
+ default:
+ return state;
+ }
+}
+
+export default gis;
\ No newline at end of file
diff --git a/src/modules/gis/gis.css b/src/modules/gis/gis.css
index e69de29b..c4bf0008 100644
--- a/src/modules/gis/gis.css
+++ b/src/modules/gis/gis.css
@@ -0,0 +1,65 @@
+ .gis-text-labels {
+}
+
+.gis-cell-table-wrapper {
+ position:relative;
+}
+
+.gis-cell-table-scroll {
+ height:150px;
+ overflow:auto;
+ margin-top:20px;
+}
+
+.gis-cell-table-wrapper table {
+ width:100%;
+}
+
+.gis-cell-table-wrapper table thead th .text {
+ position:absolute;
+ top:-20px;
+ z-index:2;
+ height:20px;
+ width:40%;
+}
+
+
+.gis-cell-table-wrapper table thead th{
+ padding: 0rem;
+ vertical-align: top;
+ border-top: 0px solid #dee2e6;
+}
+
+
+.map-container .sidebar-pane {
+ display: none;
+ left: 0;
+ right: 0;
+ box-sizing: border-box;
+ padding: 10px 10px;
+}
+
+.map-container .sidebar-header {
+ font-size: 11.4pt;
+}
+
+
+h6.horizontal-line {
+ position: relative;
+}
+
+h6.horizontal-line span.horizontal-line-text {
+ background-color: white;
+ padding-right: 10px;
+}
+
+h6.horizontal-line:after {
+ content:"";
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 0.5em;
+ border-top: 1px solid black;
+ z-index: -1;
+}
\ No newline at end of file
diff --git a/src/modules/help/Help.jsx b/src/modules/help/Help.jsx
index 6da7b9df..b86f444c 100644
--- a/src/modules/help/Help.jsx
+++ b/src/modules/help/Help.jsx
@@ -40,9 +40,15 @@ export default class Help extends React.Component {
forum.
+
+
The project source code is available on
+ Github
+
Issues with the application should be logged at the project's
github issue tracker
+ target="_blank" rel="noopener noreferrer"> Github issue tracker
+
diff --git a/src/modules/layout/SidePanel.jsx b/src/modules/layout/SidePanel.jsx
index 8d8897e3..776df088 100644
--- a/src/modules/layout/SidePanel.jsx
+++ b/src/modules/layout/SidePanel.jsx
@@ -1,12 +1,14 @@
import React from 'react';
import DashboardSidePanel from '../dashboard/DashboardSidepanel';
import ReportsTree from '../reports/ReportsTree';
+import GISLeftPanel from '../gis/GISLeftPanel';
import { connect } from 'react-redux';
import './sidepanel.css'
const SidePanels = {
"DashboardSidePanel": DashboardSidePanel,
- "ReportsTree": ReportsTree
+ "ReportsTree": ReportsTree,
+ "GISLeftPanel": GISLeftPanel
};
class SidePanel extends React.Component{
diff --git a/src/modules/layout/Tabs.jsx b/src/modules/layout/Tabs.jsx
index d51bedcd..5b25cf15 100644
--- a/src/modules/layout/Tabs.jsx
+++ b/src/modules/layout/Tabs.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import Dashboard from '../dashboard/Dashboard';
-import ProcessCMDumps from '../cm/ProcessCMDumps';
+import ParseAndImport from '../cm/ParseAndImport';
import { closeTab, setActiveTab } from './uilayout-actions';
import { OverflowList, Boundary, Position, Classes, MenuItem,
Popover, Menu, Icon } from "@blueprintjs/core";
@@ -18,7 +18,7 @@ import GISMap from '../gis/GISMap';
const Components = {
"Help": Help,
"Dashboard": Dashboard,
- "ProcessCMDumps": ProcessCMDumps,
+ "ParseAndImport": ParseAndImport,
"UserProfile": UserProfile,
"Settings": Settings,
"Database": Database,
diff --git a/src/modules/layout/UILayout.js b/src/modules/layout/UILayout.js
index 6077f58b..7b6034d9 100644
--- a/src/modules/layout/UILayout.js
+++ b/src/modules/layout/UILayout.js
@@ -44,15 +44,18 @@ class UILayout extends React.Component {
const moduleMenu = (