dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- removed background image on /map view, closed #598

Browse Source 
- fixed a bug where signature reader does not update
This commit is contained in:
Mark Friedrich
2018-03-24 23:51:40 +01:00
parent bd33123a72
commit e3109e6663
17 changed files with 789 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/app/map/map.js
View File

@@ -64,9 +64,6 @@ define([
systemSec: 'pf-system-sec'
};
// active jsPlumb instances currently running
let activeInstances = {};
// active connections per map (cache object)
let connectionCache = {};
@@ -2602,7 +2599,7 @@ define([
*/
let getMapInstance = function(mapId){
if(typeof activeInstances[mapId] !== 'object'){
if( !MapUtil.existsMapInstance(mapId) ){
// create new instance
jsPlumb.Defaults.LogEnabled = true;
@@ -2712,10 +2709,10 @@ define([
return (targetEndpoint.connections.length === 0);
});
activeInstances[mapId] = newJsPlumbInstance;
MapUtil.setMapInstance(mapId, newJsPlumbInstance);
}
return activeInstances[mapId];
return MapUtil.getMapInstance(mapId);
};
/**
@@ -3339,16 +3336,6 @@ define([
return systemData;
};
/**
* removes a map instance from local cache
* @param mapId
*/
let clearMapInstance = (mapId) => {
if(typeof activeInstances[mapId] === 'object'){
delete activeInstances[mapId];
}
};
/**
* init map options
* @param mapConfig
@@ -3513,7 +3500,6 @@ define([
return {
getMapInstance: getMapInstance,
clearMapInstance: clearMapInstance,
loadMap: loadMap,
showNewSystemDialog: showNewSystemDialog
};

60
js/app/map/util.js
View File

@@ -55,6 +55,48 @@ define([
}
};
// active jsPlumb instances currently running =====================================================================
let activeInstances = {};
/**
* set mapInstance
* @param mapId
* @param map
*/
let setMapInstance = (mapId, map) => {
activeInstances[mapId] = map;
};
/**
* get mapInstance
* @param mapId
* @returns {*}
*/
let getMapInstance = (mapId) => {
return activeInstances[mapId];
};
/**
* check for mapInstance is set
* @param mapId
* @returns {boolean}
*/
let existsMapInstance = (mapId) => {
return typeof activeInstances[mapId] === 'object';
};
/**
* removes a map instance
* @param mapId
*/
let clearMapInstance = (mapId) => {
if(existsMapInstance(mapId)){
delete activeInstances[mapId];
}
};
// ================================================================================================================
/**
* get all available map Types
* optional they can be filtered by current access level of a user
@@ -604,6 +646,19 @@ define([
return connectionInfo;
};
/**
* get CSS classes for connection types
* @param types
* @returns {string[]}
*/
let getConnectionFakeClassesByTypes = (types) => {
let connectionClasses = ['pf-fake-connection'];
for(let i = 0; i < types.length; i++){
connectionClasses.push(getConnectionInfo( types[i], 'cssClass'));
}
return connectionClasses;
};
/**
* get all direct connections between two given systems
* @param map
@@ -1076,6 +1131,10 @@ define([
return {
config: config,
mapOptions: mapOptions,
setMapInstance: setMapInstance,
getMapInstance: getMapInstance,
existsMapInstance: existsMapInstance,
clearMapInstance: clearMapInstance,
getMapTypes: getMapTypes,
getMapScopes: getMapScopes,
getScopeInfoForMap: getScopeInfoForMap,
@@ -1094,6 +1153,7 @@ define([
searchConnectionsBySystems: searchConnectionsBySystems,
searchConnectionsByScopeAndType: searchConnectionsByScopeAndType,
getConnectionInfo: getConnectionInfo,
getConnectionFakeClassesByTypes: getConnectionFakeClassesByTypes,
checkForConnection: checkForConnection,
getDefaultConnectionTypeByScope: getDefaultConnectionTypeByScope,
setConnectionWHStatus: setConnectionWHStatus,

2
js/app/module_map.js
View File

@@ -905,7 +905,7 @@ define([
contentElement.remove();
// remove map instance from local cache
Map.clearMapInstance(mapId);
MapUtil.clearMapInstance(mapId);
}
resolve({

13
js/app/ui/connection_info.js
View File

@@ -124,15 +124,6 @@ define([
// connection scope -----------------------------------------------------------------------
let scopeLabel = MapUtil.getScopeInfoForConnection(connectionData.scope, 'label');
// connection type (dummy) classes --------------------------------------------------------
let getConnectionClasses = (types) => {
let connectionClasses = ['pf-fake-connection'];
for(let i = 0; i < types.length; i++){
connectionClasses.push( MapUtil.getConnectionInfo( types[i], 'cssClass') );
}
return connectionClasses;
};
let element = $('<div>', {
class: 'pf-dynamic-area'
}).append(
@@ -199,7 +190,7 @@ define([
class: ['text-right', config.connectionInfoTableCellConnectionClass].join(' ')
}).append(
$('<div>', {
class: getConnectionClasses(connectionData.type).join(' ')
class: MapUtil.getConnectionFakeClassesByTypes(connectionData.type).join(' ')
})
)
),
@@ -382,7 +373,7 @@ define([
}
// get connection type (show fake connection div) ---------------------------------
connectionCell.find('div').removeClass().addClass(getConnectionClasses(connectionData.type).join(' '));
connectionCell.find('div').removeClass().addClass(MapUtil.getConnectionFakeClassesByTypes(connectionData.type).join(' '));
// get wormhole status ------------------------------------------------------------
if(connectionData.type.indexOf('wh_critical') !== -1){

7
js/app/ui/dialog/map_info.js
View File

@@ -658,13 +658,8 @@ define([
};
// connection
let connectionClasses = [];
for(let k = 0; k < tempConnectionData.type.length; k++){
connectionClasses.push( MapUtil.getConnectionInfo( tempConnectionData.type[k], 'cssClass') );
}
let connectionClasses = MapUtil.getConnectionFakeClassesByTypes(tempConnectionData.type);
connectionClasses = connectionClasses.join(' ');
tempConData.connection = '<div class="pf-fake-connection ' + connectionClasses + '"></div>';
tempConData.target = {

335
js/app/ui/system_route.js
View File

@@ -18,7 +18,7 @@ define([
moduleHeadClass: 'pf-module-head', // class for module header
moduleHandlerClass: 'pf-module-handler-drag', // class for "drag" handler
routeCacheTTL: 10, // route cache timer (client) in seconds
routeCacheTTL: 5, // route cache timer (client) in seconds
// system route module
moduleTypeClass: 'pf-system-route-module', // class for this module
@@ -38,12 +38,64 @@ define([
systemInfoRoutesTableClass: 'pf-system-route-table', // class for route tables
mapSelectId: 'pf-route-dialog-map-select', // id for "map" select
dataTableActionCellClass: 'pf-table-action-cell' // class for "action" cells
dataTableActionCellClass: 'pf-table-action-cell', // class for "action" cells
dataTableRouteCellClass: 'pf-table-route-cell', // class for "route" cells
dataTableJumpCellClass: 'pf-table-jump-cell' // class for "route jump" cells
};
// cache for system routes
let cache = {
systemRoutes: {} // jump information between solar systems
systemRoutes: {}, // jump information between solar systems
mapConnections: {} // connection data read from UI
};
/**
* set cache data
* @param cacheType
* @param cacheKey
* @param data
*/
let setCacheData = (cacheType, cacheKey, data) => {
cache[cacheType][cacheKey] = {
data: data,
updated: Util.getServerTime().getTime() / 1000
};
};
/**
* get cache data
* @param cacheType
* @param cacheKey
* @returns {*}
*/
let getCacheData = (cacheType, cacheKey) => {
let cachedData = null;
let currentTimestamp = Util.getServerTime().getTime();
if(
cache[cacheType].hasOwnProperty(cacheKey) &&
Math.round(
( currentTimestamp - (new Date( cache[cacheType][cacheKey].updated * 1000).getTime())) / 1000
) <= config.routeCacheTTL
){
cachedData = cache[cacheType][cacheKey].data;
}
return cachedData;
};
let getRouteDataCacheKey = (mapIds, sourceName, targetName) => {
return [mapIds.join('_'), sourceName.toLowerCase(), targetName.toLowerCase()].join('###');
};
/**
* get a unique cache key name for "source"/"target"-name
* @param sourceName
* @param targetName
* @returns {string}
*/
let getConnectionDataCacheKey = (sourceName, targetName) => {
return [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
};
/**
@@ -59,22 +111,12 @@ define([
// format routeData
let rowData = formatRouteData(routeData);
if(rowData.route){
let cacheKey = routeData.systemFromData.name.toLowerCase() +
'_' + routeData.systemToData.name.toLowerCase();
// update route cache
cache.systemRoutes[cacheKey] = {
data: rowData,
updated: Util.getServerTime().getTime() / 1000
};
let cacheKey = getRouteDataCacheKey(rowData.mapIds, routeData.systemFromData.name, routeData.systemToData.name);
setCacheData('systemRoutes', cacheKey, rowData);
let rowElement = addRow(context, rowData);
rowElement.initTooltips({
container: 'body'
});
addRow(context, rowData);
}
}
@@ -116,10 +158,13 @@ define([
if(row.length > 0){
rowElement = row.nodes().to$();
if(animationStatus !== null){
rowElement.data('animationStatus', animationStatus);
}
rowElement.initTooltips({
container: 'body'
});
}
return rowElement;
@@ -186,6 +231,7 @@ define([
wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical | 0 : 1,
wormholesFrigate: (rowData.hasOwnProperty('wormholesFrigate')) ? rowData.wormholesFrigate | 0 : 1,
wormholesEOL: (rowData.hasOwnProperty('wormholesEOL')) ? rowData.wormholesEOL | 0 : 1,
connections: (rowData.hasOwnProperty('connections')) ? rowData.connections.value | 0 : 0,
flag: (rowData.hasOwnProperty('flag')) ? rowData.flag.value : 'shortest'
};
};
@@ -320,34 +366,30 @@ define([
* @param routesTable
* @param systemsTo
*/
let drawRouteTable = function(mapId, moduleElement, systemFromData, routesTable, systemsTo){
let drawRouteTable = (mapId, moduleElement, systemFromData, routesTable, systemsTo) => {
let requestRouteData = [];
let currentTimestamp = Util.getServerTime().getTime();
// Skip some routes from search
// -> this should help to throttle requests (heavy CPU load for route calculation)
let defaultRoutesCount = Init.routeSearch.defaultCount;
let rowElements = [];
for(let i = 0; i < systemsTo.length; i++){
let systemToData = systemsTo[i];
if(systemFromData.name !== systemToData.name){
let cacheKey = 'route_' + mapId + '_' + systemFromData.name.toUpperCase() + '_' + systemToData.name.toUpperCase();
if(
cache.systemRoutes.hasOwnProperty(cacheKey) &&
Math.round(
( currentTimestamp - (new Date( cache.systemRoutes[cacheKey].updated * 1000).getTime())) / 1000
) <= config.routeCacheTTL
){
// check for cached rowData
let cacheKey = getRouteDataCacheKey([mapId], systemFromData.name, systemToData.name);
let rowData = getCacheData('systemRoutes', cacheKey);
if(rowData){
// route data is cached (client side)
let context = {
dataTable: routesTable
};
addRow(context, cache.systemRoutes[cacheKey].data);
rowElements.push( addRow(context, rowData) );
}else{
// get route data
// get route data -> ajax
let searchData = {
mapIds: [mapId],
systemFromData: systemFromData,
@@ -360,6 +402,11 @@ define([
}
}
// rows added from cache -> redraw() table
if(rowElements.length){
routesTable.draw();
}
// check if routes data is not cached and is requested
if(requestRouteData.length > 0){
let contextData = {
@@ -382,7 +429,7 @@ define([
* @param systemFromData
* @param routesTable
*/
let showSettingsDialog = function(dialogData, moduleElement, systemFromData, routesTable){
let showSettingsDialog = (dialogData, moduleElement, systemFromData, routesTable) => {
let promiseStore = MapUtil.getLocaleData('map', dialogData.mapId);
promiseStore.then(function(dataStore) {
@@ -405,7 +452,7 @@ define([
maxSelectionLength: maxSelectionLength
};
requirejs(['text!templates/dialog/route_settings.html', 'mustache'], function(template, Mustache) {
requirejs(['text!templates/dialog/route_settings.html', 'mustache'], (template, Mustache) => {
let content = Mustache.render(template, data);
let settingsDialog = bootbox.dialog({
@@ -461,7 +508,7 @@ define([
* @param {Array} data
* @returns {Array}
*/
let formSystemSelectData = function(data){
let formSystemSelectData = (data) => {
let formattedData = [];
for(let i = 0; i < data.length; i++){
let tmpData = data[i];
@@ -479,7 +526,7 @@ define([
* set event observer for route finder dialog
* @param routeDialog
*/
let setDialogObserver = function(routeDialog){
let setDialogObserver = (routeDialog) => {
let wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
let wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
let wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
@@ -528,19 +575,137 @@ define([
onWormholeCheckboxChange();
};
/**
* get a connectionsData object that holds all connections for given mapIds (used as cache for route search)
* @param mapIds
* @returns {{}}
*/
let getConnectionsDataFromMaps = (mapIds) => {
let connectionsData = {};
for(let mapId of mapIds) {
let map = MapUtil.getMapInstance(mapId);
if(map){
let cacheKey = 'map_' + mapId;
let mapConnectionsData = getCacheData('mapConnections', cacheKey);
if(!mapConnectionsData){
mapConnectionsData = {};
let connections = map.getAllConnections();
if(connections.length){
let connectionsData = MapUtil.getDataByConnections(connections);
for(let connectionData of connectionsData){
let connectionDataCacheKey = getConnectionDataCacheKey(connectionData.sourceName, connectionData.targetName);
// skip double connections between same systems
if( !mapConnectionsData.hasOwnProperty(connectionDataCacheKey) ){
mapConnectionsData[connectionDataCacheKey] = {
map: {
id: mapId
},
connection: {
id: connectionData.id,
type: connectionData.type,
scope: connectionData.scope
},
source: {
id: connectionData.source,
name: connectionData.sourceName,
alias: connectionData.sourceAlias
},
target: {
id: connectionData.target,
name: connectionData.targetName,
alias: connectionData.targetAlias
}
};
}
}
}
// update cache
setCacheData('mapConnections', cacheKey, mapConnectionsData);
}
if(connectionsData !== null){
connectionsData = Object.assign({}, mapConnectionsData, connectionsData);
}
}
}
return connectionsData;
};
/**
* search for a specific connection by "source"/"target"-name inside connectionsData cache
* @param connectionsData
* @param sourceName
* @param targetName
* @returns {{}}
*/
let findConnectionsData = (connectionsData, sourceName, targetName) => {
let connectionDataCacheKey = getConnectionDataCacheKey(sourceName, targetName);
return connectionsData.hasOwnProperty(connectionDataCacheKey) ?
connectionsData[connectionDataCacheKey] : {};
};
/**
* get stargate connection data (default connection type in case connection was not found on a map)
* @param sourceRouteNodeData
* @param targetRouteNodeData
* @returns {{connection: {id: number, type: string[], scope: string}, source: {id: number, name, alias}, target: {id: number, name, alias}}}
*/
let getStargateConnectionData = (sourceRouteNodeData, targetRouteNodeData) => {
return {
connection: {
id: 0,
type: ['stargate'],
scope: 'stargate'
},
source: {
id: 0,
name: sourceRouteNodeData.system,
alias: sourceRouteNodeData.system
},
target: {
id: 0,
name: targetRouteNodeData.system,
alias: targetRouteNodeData.system
}
};
};
/**
* get fake connection Element
* @param connectionData
* @returns {string}
*/
let getFakeConnectionElement = (connectionData) => {
let mapId = Util.getObjVal(connectionData, 'map.id') | 0;
let connectionId = Util.getObjVal(connectionData, 'connection.id') | 0;
let scope = Util.getObjVal(connectionData, 'connection.scope');
let classes = MapUtil.getConnectionFakeClassesByTypes(connectionData.connection.type);
let disabled = !mapId || !connectionId;
let connectionElement = '<div data-mapId="' + mapId + '" data-connectionId="' + connectionId + '" ';
connectionElement += (disabled ? 'data-disabled' : '');
connectionElement += ' class="' + classes.join(' ') + '" ';
connectionElement += ' title="' + scope + '" data-placement="bottom"></div>';
return connectionElement;
};
/**
* format route data from API request into dataTable row format
* @param routeData
* @returns {{}}
*/
let formatRouteData = function(routeData){
let formatRouteData = (routeData) => {
/**
* get status icon for route
* @param status
* @returns {string}
*/
let getStatusIcon= function(status){
let getStatusIcon= (status) => {
let color = 'txt-color-danger';
let title = 'route not found';
switch(status){
@@ -566,6 +731,7 @@ define([
// button class for flag (e.g. "secure" routes)
let flagButtonClass = routeData.flag === 'secure' ? 'txt-color-success' : '';
let connectionButton = '<i class="fas ' + ['fa-link', 'txt-color'].join(' ') + '"></i>';
let flagButton = '<i class="fas ' + ['fa-shield-alt', 'txt-color', flagButtonClass].join(' ') + '"></i>';
let reloadButton = '<i class="fas ' + ['fa-sync'].join(' ') + '"></i>';
let searchButton = '<i class="fas ' + ['fa-search-plus '].join(' ') + '"></i>';
@@ -583,7 +749,10 @@ define([
value: '',
formatted: ''
},
route: routeStatus === 2 ? 'search now' : 'not found',
route: {
value: routeStatus === 2 ? 'search now' : 'not found',
data: routeData.route
},
stargates: routeData.stargates,
jumpbridges: routeData.jumpbridges,
wormholes: routeData.wormholes,
@@ -591,6 +760,10 @@ define([
wormholesCritical: routeData.wormholesCritical,
wormholesFrigate: routeData.wormholesFrigate,
wormholesEOL: routeData.wormholesEOL,
connections: {
value: 0,
button: connectionButton
},
flag: {
value: routeData.flag,
button: flagButton
@@ -613,15 +786,28 @@ define([
routeStatus = 1;
// add route Data
let jumpData = [];
let routeJumpElements = [];
let avgSecTemp = 0;
let connectionsData = getConnectionsDataFromMaps(routeData.mapIds);
let prevRouteNodeData = null;
// loop all systems on this route
for(let i = 0; i < routeData.route.length; i++){
let routeNodeData = routeData.route[i];
// format system name
let systemName = routeNodeData.system;
// fake connection elements between systems -----------------------------------------------------------
if(prevRouteNodeData){
let connectionData = findConnectionsData(connectionsData, prevRouteNodeData.system, systemName);
if(!connectionData.hasOwnProperty('connection')){
connectionData = getStargateConnectionData(prevRouteNodeData, routeNodeData);
}
let connectionElement = getFakeConnectionElement(connectionData);
routeJumpElements.push( connectionElement );
}
// system elements ------------------------------------------------------------------------------------
let systemSec = Number(routeNodeData.security).toFixed(1).toString();
let tempSystemSec = systemSec;
@@ -640,12 +826,14 @@ define([
let system = '<i class="' + icon + ' ' + systemSecClass + '" ';
system += 'data-toggle="tooltip" data-placement="bottom" data-container="body" ';
system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
jumpData.push( system );
routeJumpElements.push( system );
// "source" system is not relevant for average security
if(i > 0){
avgSecTemp += Number(routeNodeData.security);
}
prevRouteNodeData = routeNodeData;
}
let avgSec = ( avgSecTemp / (routeData.route.length - 1)).toFixed(2);
@@ -666,7 +854,8 @@ define([
value: avgSec,
formatted: '<span class="' + avgSecClass + '">' + avgSec + '</span>'
};
tableRowData.route = jumpData.join(' ');
tableRowData.route.value = routeJumpElements.join(' ');
}
// route status data ----------------------------------------------------------------------
@@ -682,7 +871,7 @@ define([
* get module element
* @returns {*}
*/
let getModule = function(){
let getModule = () => {
// create new module container
let moduleElement = $('<div>').append(
$('<div>', {
@@ -737,7 +926,7 @@ define([
targets: 0,
orderable: true,
title: '',
width: '10px',
width: 2,
class: ['text-center'].join(' '),
data: 'status',
render: {
@@ -764,7 +953,7 @@ define([
targets: 2,
orderable: true,
title: '<span title="jumps" data-toggle="tooltip"><i class="fas fa-arrows-alt-h"></i>&nbsp;&nbsp;</span>',
width: '18px',
width: 18,
class: 'text-right',
data: 'jumps',
render: {
@@ -775,7 +964,7 @@ define([
targets: 3,
orderable: true,
title: '<span title="average security" data-toggle="tooltip">&#216;&nbsp;&nbsp;</span>',
width: '15px',
width: 15,
class: 'text-right',
data: 'avgTrueSec',
render: {
@@ -786,13 +975,43 @@ define([
targets: 4,
orderable: false,
title: 'route',
data: 'route'
class: [config.dataTableRouteCellClass].join(' '),
data: 'route',
render: {
_: 'value'
}
},{
targets: 5,
title: '<i title="toggle connections" data-toggle="tooltip" class="fas fa-link text-right"></i>',
orderable: false,
searchable: false,
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'connections',
render: {
_: 'button'
},
createdCell: function(cell, cellData, rowData, rowIndex, colIndex) {
let tempTableApi = this.api();
$(cell).on('click', function(e) {
let routeCellElement = tempTableApi.cell( rowIndex, 4 ).nodes().to$();
if(routeCellElement.hasClass(config.dataTableJumpCellClass)){
routeCellElement.toggleClass(config.dataTableJumpCellClass, false);
$(this).find('i').toggleClass('txt-color-orange', false);
}else{
routeCellElement.toggleClass(config.dataTableJumpCellClass, true);
$(this).find('i').toggleClass('txt-color-orange', true);
}
});
}
},{
targets: 6,
title: '<i title="search safer route (HS)" data-toggle="tooltip" class="fas fa-shield-alt text-right"></i>',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'flag',
render: {
@@ -824,11 +1043,11 @@ define([
});
}
},{
targets: 6,
targets: 7,
title: '',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'reload',
render: {
@@ -859,11 +1078,11 @@ define([
});
}
},{
targets: 7,
targets: 8,
title: '',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'clear',
render: {
@@ -908,6 +1127,20 @@ define([
}
},
initComplete: function(settings, json){
// click on "fake connection" -------------------------------------------------------------------------
$(this).on('click', '.pf-fake-connection', function(){
let fakeConnectionElement = $(this);
let mapId = fakeConnectionElement.attr('data-mapId');
let connectionId = fakeConnectionElement.attr('data-connectionId');
let connection = $().getConnectionById(mapId, connectionId);
if(connection){
let map = connection._jsPlumb.instance;
MapUtil.showConnectionInfo(map, [connection]);
}
});
},
data: [] // will be added dynamic
});
@@ -990,7 +1223,7 @@ define([
* @param mapId
* @param systemData
*/
let initModule = function(moduleElement, mapId, systemData){
let initModule = (moduleElement, mapId, systemData) => {
let systemFromData = {
name: systemData.name,

46
js/app/ui/system_signature.js
View File

@@ -225,37 +225,39 @@ define([
let getTableData = function(tableApi){
let tableData = [];
tableApi.rows().eq(0).each(function(idx){
let row = tableApi.row(idx);
// default row data
let defaultRowData = row.data();
let rowElement = row.nodes().to$();
if(tableApi){
tableApi.rows().eq(0).each(function(idx){
let row = tableApi.row(idx);
// default row data
let defaultRowData = row.data();
let rowElement = row.nodes().to$();
if(defaultRowData.id > 0){
// get all editable fields per row
let editableFields = rowElement.find('.editable');
if(defaultRowData.id > 0){
// get all editable fields per row
let editableFields = rowElement.find('.editable');
if(editableFields.length > 0){
let values = $(editableFields).editable('getValue');
if(editableFields.length > 0){
let values = $(editableFields).editable('getValue');
if(values.name){
// convert to lower for better compare options
values.name = values.name.toLowerCase();
if(values.name){
// convert to lower for better compare options
values.name = values.name.toLowerCase();
// add pk for this row
values.id = defaultRowData.id;
// add pk for this row
values.id = defaultRowData.id;
// add updated for this row
values.updated = defaultRowData.updated;
// add updated for this row
values.updated = defaultRowData.updated;
// add row index
values.index = idx;
// add row index
values.index = idx;
tableData.push( values );
tableData.push( values );
}
}
}
}
});
});
}
return tableData;
};

4
public/css/pathfinder.css
View File

File diff suppressed because one or more lines are too long

2
public/css/pathfinder.css.map
View File

File diff suppressed because one or more lines are too long

20
public/js/v1.3.4/app/map/map.js
View File

@@ -64,9 +64,6 @@ define([
systemSec: 'pf-system-sec'
};
// active jsPlumb instances currently running
let activeInstances = {};
// active connections per map (cache object)
let connectionCache = {};
@@ -2602,7 +2599,7 @@ define([
*/
let getMapInstance = function(mapId){
if(typeof activeInstances[mapId] !== 'object'){
if( !MapUtil.existsMapInstance(mapId) ){
// create new instance
jsPlumb.Defaults.LogEnabled = true;
@@ -2712,10 +2709,10 @@ define([
return (targetEndpoint.connections.length === 0);
});
activeInstances[mapId] = newJsPlumbInstance;
MapUtil.setMapInstance(mapId, newJsPlumbInstance);
}
return activeInstances[mapId];
return MapUtil.getMapInstance(mapId);
};
/**
@@ -3339,16 +3336,6 @@ define([
return systemData;
};
/**
* removes a map instance from local cache
* @param mapId
*/
let clearMapInstance = (mapId) => {
if(typeof activeInstances[mapId] === 'object'){
delete activeInstances[mapId];
}
};
/**
* init map options
* @param mapConfig
@@ -3513,7 +3500,6 @@ define([
return {
getMapInstance: getMapInstance,
clearMapInstance: clearMapInstance,
loadMap: loadMap,
showNewSystemDialog: showNewSystemDialog
};

60
public/js/v1.3.4/app/map/util.js
View File

@@ -55,6 +55,48 @@ define([
}
};
// active jsPlumb instances currently running =====================================================================
let activeInstances = {};
/**
* set mapInstance
* @param mapId
* @param map
*/
let setMapInstance = (mapId, map) => {
activeInstances[mapId] = map;
};
/**
* get mapInstance
* @param mapId
* @returns {*}
*/
let getMapInstance = (mapId) => {
return activeInstances[mapId];
};
/**
* check for mapInstance is set
* @param mapId
* @returns {boolean}
*/
let existsMapInstance = (mapId) => {
return typeof activeInstances[mapId] === 'object';
};
/**
* removes a map instance
* @param mapId
*/
let clearMapInstance = (mapId) => {
if(existsMapInstance(mapId)){
delete activeInstances[mapId];
}
};
// ================================================================================================================
/**
* get all available map Types
* optional they can be filtered by current access level of a user
@@ -604,6 +646,19 @@ define([
return connectionInfo;
};
/**
* get CSS classes for connection types
* @param types
* @returns {string[]}
*/
let getConnectionFakeClassesByTypes = (types) => {
let connectionClasses = ['pf-fake-connection'];
for(let i = 0; i < types.length; i++){
connectionClasses.push(getConnectionInfo( types[i], 'cssClass'));
}
return connectionClasses;
};
/**
* get all direct connections between two given systems
* @param map
@@ -1076,6 +1131,10 @@ define([
return {
config: config,
mapOptions: mapOptions,
setMapInstance: setMapInstance,
getMapInstance: getMapInstance,
existsMapInstance: existsMapInstance,
clearMapInstance: clearMapInstance,
getMapTypes: getMapTypes,
getMapScopes: getMapScopes,
getScopeInfoForMap: getScopeInfoForMap,
@@ -1094,6 +1153,7 @@ define([
searchConnectionsBySystems: searchConnectionsBySystems,
searchConnectionsByScopeAndType: searchConnectionsByScopeAndType,
getConnectionInfo: getConnectionInfo,
getConnectionFakeClassesByTypes: getConnectionFakeClassesByTypes,
checkForConnection: checkForConnection,
getDefaultConnectionTypeByScope: getDefaultConnectionTypeByScope,
setConnectionWHStatus: setConnectionWHStatus,

2
public/js/v1.3.4/app/module_map.js
View File

@@ -905,7 +905,7 @@ define([
contentElement.remove();
// remove map instance from local cache
Map.clearMapInstance(mapId);
MapUtil.clearMapInstance(mapId);
}
resolve({

13
public/js/v1.3.4/app/ui/connection_info.js
View File

@@ -124,15 +124,6 @@ define([
// connection scope -----------------------------------------------------------------------
let scopeLabel = MapUtil.getScopeInfoForConnection(connectionData.scope, 'label');
// connection type (dummy) classes --------------------------------------------------------
let getConnectionClasses = (types) => {
let connectionClasses = ['pf-fake-connection'];
for(let i = 0; i < types.length; i++){
connectionClasses.push( MapUtil.getConnectionInfo( types[i], 'cssClass') );
}
return connectionClasses;
};
let element = $('<div>', {
class: 'pf-dynamic-area'
}).append(
@@ -199,7 +190,7 @@ define([
class: ['text-right', config.connectionInfoTableCellConnectionClass].join(' ')
}).append(
$('<div>', {
class: getConnectionClasses(connectionData.type).join(' ')
class: MapUtil.getConnectionFakeClassesByTypes(connectionData.type).join(' ')
})
)
),
@@ -382,7 +373,7 @@ define([
}
// get connection type (show fake connection div) ---------------------------------
connectionCell.find('div').removeClass().addClass(getConnectionClasses(connectionData.type).join(' '));
connectionCell.find('div').removeClass().addClass(MapUtil.getConnectionFakeClassesByTypes(connectionData.type).join(' '));
// get wormhole status ------------------------------------------------------------
if(connectionData.type.indexOf('wh_critical') !== -1){

7
public/js/v1.3.4/app/ui/dialog/map_info.js
View File

@@ -658,13 +658,8 @@ define([
};
// connection
let connectionClasses = [];
for(let k = 0; k < tempConnectionData.type.length; k++){
connectionClasses.push( MapUtil.getConnectionInfo( tempConnectionData.type[k], 'cssClass') );
}
let connectionClasses = MapUtil.getConnectionFakeClassesByTypes(tempConnectionData.type);
connectionClasses = connectionClasses.join(' ');
tempConData.connection = '<div class="pf-fake-connection ' + connectionClasses + '"></div>';
tempConData.target = {

335
public/js/v1.3.4/app/ui/system_route.js
View File

@@ -18,7 +18,7 @@ define([
moduleHeadClass: 'pf-module-head', // class for module header
moduleHandlerClass: 'pf-module-handler-drag', // class for "drag" handler
routeCacheTTL: 10, // route cache timer (client) in seconds
routeCacheTTL: 5, // route cache timer (client) in seconds
// system route module
moduleTypeClass: 'pf-system-route-module', // class for this module
@@ -38,12 +38,64 @@ define([
systemInfoRoutesTableClass: 'pf-system-route-table', // class for route tables
mapSelectId: 'pf-route-dialog-map-select', // id for "map" select
dataTableActionCellClass: 'pf-table-action-cell' // class for "action" cells
dataTableActionCellClass: 'pf-table-action-cell', // class for "action" cells
dataTableRouteCellClass: 'pf-table-route-cell', // class for "route" cells
dataTableJumpCellClass: 'pf-table-jump-cell' // class for "route jump" cells
};
// cache for system routes
let cache = {
systemRoutes: {} // jump information between solar systems
systemRoutes: {}, // jump information between solar systems
mapConnections: {} // connection data read from UI
};
/**
* set cache data
* @param cacheType
* @param cacheKey
* @param data
*/
let setCacheData = (cacheType, cacheKey, data) => {
cache[cacheType][cacheKey] = {
data: data,
updated: Util.getServerTime().getTime() / 1000
};
};
/**
* get cache data
* @param cacheType
* @param cacheKey
* @returns {*}
*/
let getCacheData = (cacheType, cacheKey) => {
let cachedData = null;
let currentTimestamp = Util.getServerTime().getTime();
if(
cache[cacheType].hasOwnProperty(cacheKey) &&
Math.round(
( currentTimestamp - (new Date( cache[cacheType][cacheKey].updated * 1000).getTime())) / 1000
) <= config.routeCacheTTL
){
cachedData = cache[cacheType][cacheKey].data;
}
return cachedData;
};
let getRouteDataCacheKey = (mapIds, sourceName, targetName) => {
return [mapIds.join('_'), sourceName.toLowerCase(), targetName.toLowerCase()].join('###');
};
/**
* get a unique cache key name for "source"/"target"-name
* @param sourceName
* @param targetName
* @returns {string}
*/
let getConnectionDataCacheKey = (sourceName, targetName) => {
return [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
};
/**
@@ -59,22 +111,12 @@ define([
// format routeData
let rowData = formatRouteData(routeData);
if(rowData.route){
let cacheKey = routeData.systemFromData.name.toLowerCase() +
'_' + routeData.systemToData.name.toLowerCase();
// update route cache
cache.systemRoutes[cacheKey] = {
data: rowData,
updated: Util.getServerTime().getTime() / 1000
};
let cacheKey = getRouteDataCacheKey(rowData.mapIds, routeData.systemFromData.name, routeData.systemToData.name);
setCacheData('systemRoutes', cacheKey, rowData);
let rowElement = addRow(context, rowData);
rowElement.initTooltips({
container: 'body'
});
addRow(context, rowData);
}
}
@@ -116,10 +158,13 @@ define([
if(row.length > 0){
rowElement = row.nodes().to$();
if(animationStatus !== null){
rowElement.data('animationStatus', animationStatus);
}
rowElement.initTooltips({
container: 'body'
});
}
return rowElement;
@@ -186,6 +231,7 @@ define([
wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical | 0 : 1,
wormholesFrigate: (rowData.hasOwnProperty('wormholesFrigate')) ? rowData.wormholesFrigate | 0 : 1,
wormholesEOL: (rowData.hasOwnProperty('wormholesEOL')) ? rowData.wormholesEOL | 0 : 1,
connections: (rowData.hasOwnProperty('connections')) ? rowData.connections.value | 0 : 0,
flag: (rowData.hasOwnProperty('flag')) ? rowData.flag.value : 'shortest'
};
};
@@ -320,34 +366,30 @@ define([
* @param routesTable
* @param systemsTo
*/
let drawRouteTable = function(mapId, moduleElement, systemFromData, routesTable, systemsTo){
let drawRouteTable = (mapId, moduleElement, systemFromData, routesTable, systemsTo) => {
let requestRouteData = [];
let currentTimestamp = Util.getServerTime().getTime();
// Skip some routes from search
// -> this should help to throttle requests (heavy CPU load for route calculation)
let defaultRoutesCount = Init.routeSearch.defaultCount;
let rowElements = [];
for(let i = 0; i < systemsTo.length; i++){
let systemToData = systemsTo[i];
if(systemFromData.name !== systemToData.name){
let cacheKey = 'route_' + mapId + '_' + systemFromData.name.toUpperCase() + '_' + systemToData.name.toUpperCase();
if(
cache.systemRoutes.hasOwnProperty(cacheKey) &&
Math.round(
( currentTimestamp - (new Date( cache.systemRoutes[cacheKey].updated * 1000).getTime())) / 1000
) <= config.routeCacheTTL
){
// check for cached rowData
let cacheKey = getRouteDataCacheKey([mapId], systemFromData.name, systemToData.name);
let rowData = getCacheData('systemRoutes', cacheKey);
if(rowData){
// route data is cached (client side)
let context = {
dataTable: routesTable
};
addRow(context, cache.systemRoutes[cacheKey].data);
rowElements.push( addRow(context, rowData) );
}else{
// get route data
// get route data -> ajax
let searchData = {
mapIds: [mapId],
systemFromData: systemFromData,
@@ -360,6 +402,11 @@ define([
}
}
// rows added from cache -> redraw() table
if(rowElements.length){
routesTable.draw();
}
// check if routes data is not cached and is requested
if(requestRouteData.length > 0){
let contextData = {
@@ -382,7 +429,7 @@ define([
* @param systemFromData
* @param routesTable
*/
let showSettingsDialog = function(dialogData, moduleElement, systemFromData, routesTable){
let showSettingsDialog = (dialogData, moduleElement, systemFromData, routesTable) => {
let promiseStore = MapUtil.getLocaleData('map', dialogData.mapId);
promiseStore.then(function(dataStore) {
@@ -405,7 +452,7 @@ define([
maxSelectionLength: maxSelectionLength
};
requirejs(['text!templates/dialog/route_settings.html', 'mustache'], function(template, Mustache) {
requirejs(['text!templates/dialog/route_settings.html', 'mustache'], (template, Mustache) => {
let content = Mustache.render(template, data);
let settingsDialog = bootbox.dialog({
@@ -461,7 +508,7 @@ define([
* @param {Array} data
* @returns {Array}
*/
let formSystemSelectData = function(data){
let formSystemSelectData = (data) => {
let formattedData = [];
for(let i = 0; i < data.length; i++){
let tmpData = data[i];
@@ -479,7 +526,7 @@ define([
* set event observer for route finder dialog
* @param routeDialog
*/
let setDialogObserver = function(routeDialog){
let setDialogObserver = (routeDialog) => {
let wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
let wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
let wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
@@ -528,19 +575,137 @@ define([
onWormholeCheckboxChange();
};
/**
* get a connectionsData object that holds all connections for given mapIds (used as cache for route search)
* @param mapIds
* @returns {{}}
*/
let getConnectionsDataFromMaps = (mapIds) => {
let connectionsData = {};
for(let mapId of mapIds) {
let map = MapUtil.getMapInstance(mapId);
if(map){
let cacheKey = 'map_' + mapId;
let mapConnectionsData = getCacheData('mapConnections', cacheKey);
if(!mapConnectionsData){
mapConnectionsData = {};
let connections = map.getAllConnections();
if(connections.length){
let connectionsData = MapUtil.getDataByConnections(connections);
for(let connectionData of connectionsData){
let connectionDataCacheKey = getConnectionDataCacheKey(connectionData.sourceName, connectionData.targetName);
// skip double connections between same systems
if( !mapConnectionsData.hasOwnProperty(connectionDataCacheKey) ){
mapConnectionsData[connectionDataCacheKey] = {
map: {
id: mapId
},
connection: {
id: connectionData.id,
type: connectionData.type,
scope: connectionData.scope
},
source: {
id: connectionData.source,
name: connectionData.sourceName,
alias: connectionData.sourceAlias
},
target: {
id: connectionData.target,
name: connectionData.targetName,
alias: connectionData.targetAlias
}
};
}
}
}
// update cache
setCacheData('mapConnections', cacheKey, mapConnectionsData);
}
if(connectionsData !== null){
connectionsData = Object.assign({}, mapConnectionsData, connectionsData);
}
}
}
return connectionsData;
};
/**
* search for a specific connection by "source"/"target"-name inside connectionsData cache
* @param connectionsData
* @param sourceName
* @param targetName
* @returns {{}}
*/
let findConnectionsData = (connectionsData, sourceName, targetName) => {
let connectionDataCacheKey = getConnectionDataCacheKey(sourceName, targetName);
return connectionsData.hasOwnProperty(connectionDataCacheKey) ?
connectionsData[connectionDataCacheKey] : {};
};
/**
* get stargate connection data (default connection type in case connection was not found on a map)
* @param sourceRouteNodeData
* @param targetRouteNodeData
* @returns {{connection: {id: number, type: string[], scope: string}, source: {id: number, name, alias}, target: {id: number, name, alias}}}
*/
let getStargateConnectionData = (sourceRouteNodeData, targetRouteNodeData) => {
return {
connection: {
id: 0,
type: ['stargate'],
scope: 'stargate'
},
source: {
id: 0,
name: sourceRouteNodeData.system,
alias: sourceRouteNodeData.system
},
target: {
id: 0,
name: targetRouteNodeData.system,
alias: targetRouteNodeData.system
}
};
};
/**
* get fake connection Element
* @param connectionData
* @returns {string}
*/
let getFakeConnectionElement = (connectionData) => {
let mapId = Util.getObjVal(connectionData, 'map.id') | 0;
let connectionId = Util.getObjVal(connectionData, 'connection.id') | 0;
let scope = Util.getObjVal(connectionData, 'connection.scope');
let classes = MapUtil.getConnectionFakeClassesByTypes(connectionData.connection.type);
let disabled = !mapId || !connectionId;
let connectionElement = '<div data-mapId="' + mapId + '" data-connectionId="' + connectionId + '" ';
connectionElement += (disabled ? 'data-disabled' : '');
connectionElement += ' class="' + classes.join(' ') + '" ';
connectionElement += ' title="' + scope + '" data-placement="bottom"></div>';
return connectionElement;
};
/**
* format route data from API request into dataTable row format
* @param routeData
* @returns {{}}
*/
let formatRouteData = function(routeData){
let formatRouteData = (routeData) => {
/**
* get status icon for route
* @param status
* @returns {string}
*/
let getStatusIcon= function(status){
let getStatusIcon= (status) => {
let color = 'txt-color-danger';
let title = 'route not found';
switch(status){
@@ -566,6 +731,7 @@ define([
// button class for flag (e.g. "secure" routes)
let flagButtonClass = routeData.flag === 'secure' ? 'txt-color-success' : '';
let connectionButton = '<i class="fas ' + ['fa-link', 'txt-color'].join(' ') + '"></i>';
let flagButton = '<i class="fas ' + ['fa-shield-alt', 'txt-color', flagButtonClass].join(' ') + '"></i>';
let reloadButton = '<i class="fas ' + ['fa-sync'].join(' ') + '"></i>';
let searchButton = '<i class="fas ' + ['fa-search-plus '].join(' ') + '"></i>';
@@ -583,7 +749,10 @@ define([
value: '',
formatted: ''
},
route: routeStatus === 2 ? 'search now' : 'not found',
route: {
value: routeStatus === 2 ? 'search now' : 'not found',
data: routeData.route
},
stargates: routeData.stargates,
jumpbridges: routeData.jumpbridges,
wormholes: routeData.wormholes,
@@ -591,6 +760,10 @@ define([
wormholesCritical: routeData.wormholesCritical,
wormholesFrigate: routeData.wormholesFrigate,
wormholesEOL: routeData.wormholesEOL,
connections: {
value: 0,
button: connectionButton
},
flag: {
value: routeData.flag,
button: flagButton
@@ -613,15 +786,28 @@ define([
routeStatus = 1;
// add route Data
let jumpData = [];
let routeJumpElements = [];
let avgSecTemp = 0;
let connectionsData = getConnectionsDataFromMaps(routeData.mapIds);
let prevRouteNodeData = null;
// loop all systems on this route
for(let i = 0; i < routeData.route.length; i++){
let routeNodeData = routeData.route[i];
// format system name
let systemName = routeNodeData.system;
// fake connection elements between systems -----------------------------------------------------------
if(prevRouteNodeData){
let connectionData = findConnectionsData(connectionsData, prevRouteNodeData.system, systemName);
if(!connectionData.hasOwnProperty('connection')){
connectionData = getStargateConnectionData(prevRouteNodeData, routeNodeData);
}
let connectionElement = getFakeConnectionElement(connectionData);
routeJumpElements.push( connectionElement );
}
// system elements ------------------------------------------------------------------------------------
let systemSec = Number(routeNodeData.security).toFixed(1).toString();
let tempSystemSec = systemSec;
@@ -640,12 +826,14 @@ define([
let system = '<i class="' + icon + ' ' + systemSecClass + '" ';
system += 'data-toggle="tooltip" data-placement="bottom" data-container="body" ';
system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
jumpData.push( system );
routeJumpElements.push( system );
// "source" system is not relevant for average security
if(i > 0){
avgSecTemp += Number(routeNodeData.security);
}
prevRouteNodeData = routeNodeData;
}
let avgSec = ( avgSecTemp / (routeData.route.length - 1)).toFixed(2);
@@ -666,7 +854,8 @@ define([
value: avgSec,
formatted: '<span class="' + avgSecClass + '">' + avgSec + '</span>'
};
tableRowData.route = jumpData.join(' ');
tableRowData.route.value = routeJumpElements.join(' ');
}
// route status data ----------------------------------------------------------------------
@@ -682,7 +871,7 @@ define([
* get module element
* @returns {*}
*/
let getModule = function(){
let getModule = () => {
// create new module container
let moduleElement = $('<div>').append(
$('<div>', {
@@ -737,7 +926,7 @@ define([
targets: 0,
orderable: true,
title: '',
width: '10px',
width: 2,
class: ['text-center'].join(' '),
data: 'status',
render: {
@@ -764,7 +953,7 @@ define([
targets: 2,
orderable: true,
title: '<span title="jumps" data-toggle="tooltip"><i class="fas fa-arrows-alt-h"></i>&nbsp;&nbsp;</span>',
width: '18px',
width: 18,
class: 'text-right',
data: 'jumps',
render: {
@@ -775,7 +964,7 @@ define([
targets: 3,
orderable: true,
title: '<span title="average security" data-toggle="tooltip">&#216;&nbsp;&nbsp;</span>',
width: '15px',
width: 15,
class: 'text-right',
data: 'avgTrueSec',
render: {
@@ -786,13 +975,43 @@ define([
targets: 4,
orderable: false,
title: 'route',
data: 'route'
class: [config.dataTableRouteCellClass].join(' '),
data: 'route',
render: {
_: 'value'
}
},{
targets: 5,
title: '<i title="toggle connections" data-toggle="tooltip" class="fas fa-link text-right"></i>',
orderable: false,
searchable: false,
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'connections',
render: {
_: 'button'
},
createdCell: function(cell, cellData, rowData, rowIndex, colIndex) {
let tempTableApi = this.api();
$(cell).on('click', function(e) {
let routeCellElement = tempTableApi.cell( rowIndex, 4 ).nodes().to$();
if(routeCellElement.hasClass(config.dataTableJumpCellClass)){
routeCellElement.toggleClass(config.dataTableJumpCellClass, false);
$(this).find('i').toggleClass('txt-color-orange', false);
}else{
routeCellElement.toggleClass(config.dataTableJumpCellClass, true);
$(this).find('i').toggleClass('txt-color-orange', true);
}
});
}
},{
targets: 6,
title: '<i title="search safer route (HS)" data-toggle="tooltip" class="fas fa-shield-alt text-right"></i>',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'flag',
render: {
@@ -824,11 +1043,11 @@ define([
});
}
},{
targets: 6,
targets: 7,
title: '',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'reload',
render: {
@@ -859,11 +1078,11 @@ define([
});
}
},{
targets: 7,
targets: 8,
title: '',
orderable: false,
searchable: false,
width: '10px',
width: 10,
class: ['text-center', config.dataTableActionCellClass].join(' '),
data: 'clear',
render: {
@@ -908,6 +1127,20 @@ define([
}
},
initComplete: function(settings, json){
// click on "fake connection" -------------------------------------------------------------------------
$(this).on('click', '.pf-fake-connection', function(){
let fakeConnectionElement = $(this);
let mapId = fakeConnectionElement.attr('data-mapId');
let connectionId = fakeConnectionElement.attr('data-connectionId');
let connection = $().getConnectionById(mapId, connectionId);
if(connection){
let map = connection._jsPlumb.instance;
MapUtil.showConnectionInfo(map, [connection]);
}
});
},
data: [] // will be added dynamic
});
@@ -990,7 +1223,7 @@ define([
* @param mapId
* @param systemData
*/
let initModule = function(moduleElement, mapId, systemData){
let initModule = (moduleElement, mapId, systemData) => {
let systemFromData = {
name: systemData.name,

46
public/js/v1.3.4/app/ui/system_signature.js
View File

@@ -225,37 +225,39 @@ define([
let getTableData = function(tableApi){
let tableData = [];
tableApi.rows().eq(0).each(function(idx){
let row = tableApi.row(idx);
// default row data
let defaultRowData = row.data();
let rowElement = row.nodes().to$();
if(tableApi){
tableApi.rows().eq(0).each(function(idx){
let row = tableApi.row(idx);
// default row data
let defaultRowData = row.data();
let rowElement = row.nodes().to$();
if(defaultRowData.id > 0){
// get all editable fields per row
let editableFields = rowElement.find('.editable');
if(defaultRowData.id > 0){
// get all editable fields per row
let editableFields = rowElement.find('.editable');
if(editableFields.length > 0){
let values = $(editableFields).editable('getValue');
if(editableFields.length > 0){
let values = $(editableFields).editable('getValue');
if(values.name){
// convert to lower for better compare options
values.name = values.name.toLowerCase();
if(values.name){
// convert to lower for better compare options
values.name = values.name.toLowerCase();
// add pk for this row
values.id = defaultRowData.id;
// add pk for this row
values.id = defaultRowData.id;
// add updated for this row
values.updated = defaultRowData.updated;
// add updated for this row
values.updated = defaultRowData.updated;
// add row index
values.index = idx;
// add row index
values.index = idx;
tableData.push( values );
tableData.push( values );
}
}
}
}
});
});
}
return tableData;
};

36
sass/layout/_system-info.scss
View File

@@ -114,6 +114,42 @@
.fa-sync, .fa-search-plus{
@extend .pf-dialog-icon-button;
}
.pf-fake-connection{
display: none; // toggled by js see .pf-table-jump-cell
width: 12px;
height: 3px;
cursor: pointer;
&[data-disabled]{
cursor: initial;
}
&.pf-map-connection-frig{
width: 32px;
&:after{
left: 4px;
}
}
&.pf-map-connection-preserve-mass{
width: 26px;
&:after{
content: "\f071";
font-family: "Font Awesome 5 Free";
font-style: normal;
font-weight: bold;
left: 4px;
}
}
}
&.pf-table-jump-cell{
.pf-fake-connection{
display: inline-block;
}
}
}
}
}