', {
class: config.systemHeadClass
}).append(
- // System name is editable
- $('', {
- class: config.systemHeadNameClass
- }).attr('data-value', systemName)
- ).append(
- // System locked status
- $('', {
- class: ['fas', 'fa-lock', 'fa-fw'].join(' ')
- }).attr('title', 'locked')
- ).append(
- // System effect color
- $('', {
- class: ['fas', 'fa-square ', 'fa-fw', effectBasicClass, effectClass].join(' ')
- }).attr('title', effectName)
- ).append(
- // expand option
- $('', {
- class: ['fas', 'fa-angle-down ', config.systemHeadExpandClass].join(' ')
- })
- ).prepend(
$('', {
class: [config.systemSec, secClass].join(' '),
text: data.security
- })
- )
- ).append(
- // system body
+ }),
+ // System name is editable
+ $('', {
+ class: systemHeadClasses.join(' '),
+ }).attr('data-value', systemName),
+ // System locked status
+ $('', {
+ class: ['fas', 'fa-lock', 'fa-fw'].join(' ')
+ }).attr('title', 'locked'),
+ // System effect color
+ $('', {
+ class: ['fas', 'fa-square', 'fa-fw', effectBasicClass, effectClass, config.popoverTriggerClass].join(' ')
+ }),
+ // expand option
+ $('', {
+ class: ['fas', 'fa-angle-down', config.systemHeadExpandClass].join(' ')
+ }),
+ // info element (new line) (optional)
+ System.getHeadInfoElement(data)
+ ),
$('
', {
class: config.systemBodyClass
})
@@ -574,6 +440,9 @@ define([
// hide system tooltip
$(system).toggleSystemTooltip('hide', {});
+ // destroy popovers
+ $(system).destroyPopover(true);
+
// move them to the "top"
$(system).updateSystemZIndex();
},
@@ -749,7 +618,7 @@ define([
}
}.bind(connection);
- connectionCanvas.singleDoubleClick(single, () => {});
+ Util.singleDoubleClick(connectionCanvas, single, () => {});
};
/**
@@ -1009,7 +878,6 @@ define([
checkMapSize(mapWrapper[0]);
}
-
};
/**
@@ -1506,7 +1374,7 @@ define([
* @param systemData
* @param connectedSystem
*/
- let drawSystem = function(map, systemData, connectedSystem){
+ let drawSystem = (map, systemData, connectedSystem) => {
// check if systemData is valid
if(isValidSystem(systemData)){
@@ -1552,7 +1420,7 @@ define([
* @param requestData
* @param context
*/
- let saveSystem = function(requestData, context){
+ let saveSystem = (requestData, context) => {
$.ajax({
type: 'POST',
url: Init.path.saveSystem,
@@ -1963,7 +1831,6 @@ define([
dataType: 'json',
context: connections
}).done(function(data){
-
// remove connections from map
removeConnections(this);
@@ -1971,7 +1838,6 @@ define([
if(callback){
callback();
}
-
}).fail(function( jqXHR, status, error) {
let reason = status + ' ' + error;
Util.showNotify({title: jqXHR.status + ': deleteSystem', text: reason, type: 'warning'});
@@ -1998,7 +1864,8 @@ define([
{icon: 'fa-filter', action: 'filter_scope', text: 'filter scope', subitems: [
{subIcon: '', subAction: 'filter_wh', subText: 'wormhole'},
{subIcon: '', subAction: 'filter_stargate', subText: 'stargate'},
- {subIcon: '', subAction: 'filter_jumpbridge', subText: 'jumpbridge'}
+ {subIcon: '', subAction: 'filter_jumpbridge', subText: 'jumpbridge'},
+ {subIcon: '', subAction: 'filter_abyssal', subText: 'abyssal'}
]},
{icon: 'fa-sitemap', action: 'map', text: 'map', subitems: [
{subIcon: 'fa-edit', subAction: 'map_edit', subText: 'edit map'},
@@ -2040,7 +1907,7 @@ define([
{subIcon: 'fa-circle', subAction: 'status_critical', subText: 'stage 3 (critical)'}
]},
- {divider: true, action: 'delete_connection'} ,
+ {divider: true, action: 'separator'} ,
{icon: 'fa-unlink', action: 'delete_connection', text: 'detach'}
]
};
@@ -2106,7 +1973,14 @@ define([
let scope = component.scope;
- if(scope === 'stargate'){
+ if(scope === 'abyssal'){
+ hiddenOptions.push('frigate');
+ hiddenOptions.push('preserve_mass');
+ hiddenOptions.push('change_status');
+
+ hiddenOptions.push('change_scope');
+ hiddenOptions.push('separator');
+ }else if(scope === 'stargate'){
hiddenOptions.push('frigate');
hiddenOptions.push('preserve_mass');
hiddenOptions.push('change_status');
@@ -2173,6 +2047,9 @@ define([
if(component.data('filter_scope') === 'jumpbridge'){
activeOptions.push('filter_jumpbridge');
}
+ if(component.data('filter_scope') === 'abyssal'){
+ activeOptions.push('filter_abyssal');
+ }
}else if( component.hasClass(config.systemClass) ){
// active system menu entries
if(component.data('locked') === true){
@@ -2191,7 +2068,7 @@ define([
* @param map
* @param system
*/
- let setSystemObserver = function(map, system){
+ let setSystemObserver = (map, system) => {
system = $(system);
// get map container
@@ -2235,6 +2112,9 @@ define([
// hide tooltip
$(selectedSystems).toggleSystemTooltip('hide', {});
+ // destroy popovers
+ $(selectedSystems).destroyPopover(true);
+
// move them to the "top"
$(selectedSystems).updateSystemZIndex();
},
@@ -2292,6 +2172,8 @@ define([
}
// init system tooltips =======================================================================================
+ // TODO check this code:
+ /*
let systemTooltipOptions = {
toggle: 'tooltip',
placement: 'right',
@@ -2300,79 +2182,7 @@ define([
};
system.find('.fas').tooltip(systemTooltipOptions);
-
- // init system body expand ====================================================================================
- systemHeadExpand.hoverIntent(function(e){
- // hover in
- let hoverSystem = $(this).parents('.' + config.systemClass);
- let hoverSystemId = hoverSystem.attr('id');
-
- // bring system in front (increase zIndex)
- hoverSystem.updateSystemZIndex();
-
- // get ship counter and calculate expand height
- let userCount = parseInt( hoverSystem.data('userCount') );
-
- let expandHeight = userCount * config.systemBodyItemHeight;
-
- systemBody.velocity('stop').velocity(
- {
- height: expandHeight + 'px',
- width: 150,
- 'min-width': '150px'
- },{
- easing: 'easeInOutQuart',
- duration: 150,
- progress: function(){
- // repaint connections of current system
- map.revalidate( hoverSystemId );
- },
- complete: function(){
- map.revalidate( hoverSystemId );
-
- // extend player name element
- $(this).find('.' + config.systemBodyItemNameClass).css({width: '80px'});
-
- $(this).find('.' + config.systemBodyRightClass).velocity('stop').velocity({
- opacity: 1
- },{
- duration: 150,
- display: 'auto'
- });
- }
- }
- );
-
- }, function(e){
- // hover out
- let hoverSystem = $(this).parents('.' + config.systemClass);
- let hoverSystemId = hoverSystem.attr('id');
-
- // stop animation (prevent visual bug if user spams hover-icon [in - out])
- systemBody.velocity('stop');
-
- // reduce player name element back to "normal" size (css class width is used)
- systemBody.find('.' + config.systemBodyItemNameClass).css({width: ''});
-
- systemBody.find('.' + config.systemBodyRightClass).velocity('stop').velocity( {
- opacity: 0,
- 'min-width': '0px'
- },{
- easing: 'easeInOutQuart',
- duration: 150,
- display: 'none',
- complete: function(){
- systemBody.velocity('stop').velocity('reverse', {
- complete: function(){
- // overwrite "complete" function from first "hover"-open
- map.revalidate( hoverSystemId );
- }
- });
- }
- });
-
- });
-
+*/
// context menu ===============================================================================================
// trigger context menu
@@ -2482,7 +2292,6 @@ define([
};
let single = function(e){
-
// check if click was performed on "popover" (x-editable)
let popoverClick = false;
if( $(e.target).parents('.popover').length ){
@@ -2511,7 +2320,7 @@ define([
};
- system.singleDoubleClick(single, double);
+ Util.singleDoubleClick(system, single, double);
};
/**
@@ -2698,6 +2507,11 @@ define([
return false;
}
+ // switch connection type to "abyss" in case source OR target system belongs to "a-space"
+ if(sourceSystem.data('typeId') === 3 || targetSystem.data('typeId') === 3){
+ setConnectionScope(connection, 'abyssal');
+ }
+
// set "default" connection status only for NEW connections
if(!connection.suspendedElement){
MapUtil.setConnectionWHStatus(connection, MapUtil.getDefaultConnectionTypeByScope(connection.scope) );
@@ -2823,6 +2637,7 @@ define([
case 'filter_wh':
case 'filter_stargate':
case 'filter_jumpbridge':
+ case 'filter_abyssal':
// filter (show/hide)
let filterScope = action.split('_')[1];
@@ -2919,6 +2734,119 @@ define([
}
});
+
+ // system body expand -----------------------------------------------------------------------------------------
+ mapContainer.hoverIntent({
+ over: function(e){
+ let system = $(this).closest('.' + config.systemClass);
+ let map = MapUtil.getMapInstance(system.attr('data-mapid'));
+ let systemId = system.attr('id');
+ let systemBody = system.find('.' + config.systemBodyClass);
+
+ // bring system in front (increase zIndex)
+ system.updateSystemZIndex();
+
+ // get ship counter and calculate expand height
+ let userCount = parseInt(system.data('userCount'));
+ let expandHeight = userCount * config.systemBodyItemHeight;
+
+ // calculate width
+ let width = system[0].clientWidth;
+ let minWidth = 150;
+ let newWidth = width > minWidth ? width : minWidth; // in case of big systems
+
+ systemBody.velocity('stop').velocity(
+ {
+ height: expandHeight + 'px',
+ width: newWidth,
+ 'min-width': minWidth + 'px'
+ },{
+ easing: 'easeInOutQuart',
+ duration: 120,
+ progress: function(){
+ // repaint connections of current system
+ map.revalidate(systemId);
+ },
+ complete: function(){
+ map.revalidate(systemId);
+
+ // extend player name element
+ let systemBody = $(this);
+ let systemBodyItemNameWidth = newWidth - 50 - 10 - 20; // - bodyRight - icon - somePadding
+ systemBody.find('.' + config.systemBodyItemNameClass).css({width: systemBodyItemNameWidth + 'px'});
+ systemBody.find('.' + config.systemBodyRightClass).show();
+ }
+ }
+ );
+ },
+ out: function(e){
+ let system = $(this).closest('.' + config.systemClass);
+ let map = MapUtil.getMapInstance(system.attr('data-mapid'));
+ let systemId = system.attr('id');
+ let systemBody = system.find('.' + config.systemBodyClass);
+
+ // stop animation (prevent visual bug if user spams hover-icon [in - out])
+ systemBody.velocity('stop');
+
+ // reduce player name element back to "normal" size (css class width is used)
+ systemBody.find('.' + config.systemBodyRightClass).hide();
+ systemBody.find('.' + config.systemBodyItemNameClass).css({width: ''});
+
+ systemBody.velocity('reverse', {
+ complete: function(){
+ // overwrite "complete" function from first "hover"-open
+ // set animated "with" back to default "100%" important in case of system with change (e.g. longer name)
+ $(this).css({width: ''});
+
+ map.revalidate(systemId);
+ }
+ });
+ },
+ selector: '.' + config.systemClass + ' .' + config.systemHeadExpandClass
+ });
+
+ // system "effect" popover ------------------------------------------------------------------------------------
+ // -> event delegation to system elements, popup only if needed (hover)
+ mapContainer.hoverIntent({
+ over: function(e){
+ let effectElement = $(this);
+ let systemElement = effectElement.closest('.' + config.systemClass);
+ let security = systemElement.data('security');
+ let effect = systemElement.data('effect');
+
+ effectElement.addSystemEffectTooltip(security, effect, {
+ trigger: 'manual',
+ placement: 'right'
+ }).setPopoverSmall().popover('show');
+ },
+ out: function(e){
+ $(this).destroyPopover();
+ },
+ selector: '.' + config.systemClass + ' .' + MapUtil.getEffectInfoForSystem('effect', 'class')
+ });
+
+ // system "statics" popover -----------------------------------------------------------------------------------
+ // -> event delegation to system elements, popup only if needed (hover)
+ mapContainer.hoverIntent({
+ over: function(e){
+ let staticWormholeElement = $(this);
+ let wormholeName = staticWormholeElement.attr('data-name');
+ let wormholeData = Util.getObjVal(Init, 'wormholes.' + wormholeName);
+ if(wormholeData){
+ staticWormholeElement.addWormholeInfoTooltip(wormholeData, {
+ trigger: 'manual',
+ placement: 'right',
+ smaller: true,
+ show: true
+ });
+ }
+ },
+ out: function(e){
+ $(this).destroyPopover();
+ },
+ selector: '.' + config.systemHeadInfoClass + ' span[class^="pf-system-sec-"]'
+ });
+
// catch events ===============================================================================================
// toggle global map option (e.g. "grid snap", "magnetization")
@@ -2962,7 +2890,6 @@ define([
// delete map option
MapUtil.deleteLocalData('map', this.mapElement.data('id'), this.mapOption.option );
}else{
-
// toggle button class
button.addClass('active');
@@ -3102,7 +3029,6 @@ define([
default:
systemInfo.push('bad system query');
}
-
}
if(systemInfo.length === 1){
@@ -3119,7 +3045,6 @@ define([
* @returns {boolean}
*/
$.fn.updateUserData = function(userData){
-
let returnStatus = true;
// get new map instance or load existing
@@ -3213,7 +3138,7 @@ define([
// users who are not in any map system --------------------------------------------------------------------
for(let i = 0; i < userData.data.systems.length; i++){
- // users without location are grouped in systemid: 0
+ // users without location are grouped in systemId: 0
if(userData.data.systems[i].id){
headerUpdateData.userCountOutside += userData.data.systems[i].user.length;
}else{
diff --git a/js/app/map/system.js b/js/app/map/system.js
index c87f0e9e..39853354 100644
--- a/js/app/map/system.js
+++ b/js/app/map/system.js
@@ -19,7 +19,14 @@ define([
y: 0
},
+ mapClass: 'pf-map', // class for all maps
+
+ popoverTriggerClass: 'pf-popover-trigger', // class for "popover" trigger elements
+
+ systemHeadInfoClass: 'pf-system-head-info', // class for system info
systemActiveClass: 'pf-system-active', // class for an active system on a map
+ systemTooltipInnerIdPrefix: 'pf-system-tooltip-inner-', // id prefix for system tooltip content
+ systemTooltipInnerClass: 'pf-system-tooltip-inner', // class for system tooltip content
dialogRallyId: 'pf-rally-dialog', // id for "Rally point" dialog
@@ -219,6 +226,139 @@ define([
return this;
};
+ /**
+ * toggle system tooltip (current pilot count)
+ * @param show
+ * @param tooltipOptions
+ * @returns {*}
+ */
+ $.fn.toggleSystemTooltip = function(show, tooltipOptions){
+ let highlightData = {
+ good: {
+ colorClass: 'txt-color-green',
+ iconClass: 'fa-caret-up'
+ },
+ bad: {
+ colorClass: 'txt-color-red',
+ iconClass: 'fa-caret-down'
+ }
+ };
+
+ let getHighlightClass = (highlight) => {
+ return Util.getObjVal(highlightData, highlight + '.colorClass') || '';
+ };
+
+ let getHighlightIcon = (highlight) => {
+ return Util.getObjVal(highlightData, highlight + '.iconClass') || '';
+ };
+
+ let getTitle = (userCounter, highlight) => {
+ return ' ' + userCounter + '';
+ };
+
+ return this.each(function(){
+ let system = $(this);
+ switch(show){
+ case 'destroy':
+ //destroy tooltip and remove some attributes which are not deleted by 'destroy'
+ system.tooltip('destroy').removeAttr('title data-original-title');
+ break;
+ case 'hide':
+ system.tooltip('hide');
+ break;
+ case 'show':
+ // initial "show" OR "update" open tooltip
+ // -> do not update tooltips while a system is dragged
+ let showTooltip = !system.hasClass('jsPlumb_dragged');
+
+ if(system.data('bs.tooltip')){
+ // tooltip initialized but could be hidden
+ // check for title update
+ if(
+ tooltipOptions.hasOwnProperty('userCount') &&
+ tooltipOptions.hasOwnProperty('highlight')
+ ){
+ let currentTitle = system.attr('data-original-title');
+ let newTitle = getTitle(tooltipOptions.userCount, tooltipOptions.highlight);
+
+ if(currentTitle !== newTitle){
+ // update tooltip
+ let tooltipInner = system.attr('title', newTitle).tooltip('fixTitle').data('bs.tooltip').$tip.find('.tooltip-inner');
+ tooltipInner.html(newTitle);
+
+ // change highlight class
+ let highlightClass = getHighlightClass(tooltipOptions.highlight);
+ if( !tooltipInner.hasClass(highlightClass) ){
+ tooltipInner.removeClass( getHighlightClass('good') + ' ' + getHighlightClass('bad')).addClass(highlightClass);
+ }
+ }
+ }
+
+ let tip = system.data('bs.tooltip').tip();
+ if( !tip.hasClass('in') && showTooltip){
+ // update tooltip placement based on system position
+ system.data('bs.tooltip').options.placement = getSystemTooltipPlacement(system);
+
+ system.tooltip('show');
+ }
+ }else{
+ // no tooltip initialized
+ // "some" config data is required
+ if(
+ tooltipOptions.hasOwnProperty('systemId') &&
+ tooltipOptions.hasOwnProperty('userCount') &&
+ tooltipOptions.hasOwnProperty('highlight')
+ ){
+ let innerTooltipId = config.systemTooltipInnerIdPrefix + tooltipOptions.systemId;
+
+ let template = '
' +
+ '' +
+ '' +
+ '
';
+
+ let options = {
+ trigger: 'manual',
+ placement: getSystemTooltipPlacement(system),
+ html: true,
+ animation: true,
+ template: template,
+ viewport: system.closest('.' + config.mapClass)
+ };
+
+ // init new tooltip -> Do not show automatic maybe system is currently dragged
+ system.attr('title', getTitle(tooltipOptions.userCount, tooltipOptions.highlight));
+ system.tooltip(options);
+
+ system.one('shown.bs.tooltip', function() {
+ // set highlight only on FIRST show
+ $('#' + this.innerTooltipId).addClass(this.highlightClass);
+ }.bind({
+ highlightClass: getHighlightClass(tooltipOptions.highlight),
+ innerTooltipId: innerTooltipId
+ }));
+
+ if(showTooltip){
+ system.tooltip('show');
+ }
+ }
+ }
+ break;
+ }
+ });
+ };
+
+ /**
+ * get tooltip position (top, bottom) based on system position
+ * @param system
+ * @returns {string}
+ */
+ let getSystemTooltipPlacement = (system) => {
+ let offsetParent = system.parent().offset();
+ let offsetSystem = system.offset();
+
+ return (offsetSystem.top - offsetParent.top < 27) ? 'bottom' : 'top';
+ };
+
/**
* delete system(s) with all their connections
* (ajax call) remove system from DB
@@ -266,7 +406,6 @@ define([
* @param systems
*/
let removeSystems = (map, systems) => {
-
let removeSystemCallbak = function(deleteSystem){
map.remove(deleteSystem);
};
@@ -285,8 +424,9 @@ define([
// do not fire a "connectionDetached" event
map.detachAllConnections(system, {fireEvent: false});
- // hide tooltip
+ // destroy tooltip/popover
system.toggleSystemTooltip('destroy', {});
+ system.destroyPopover(true);
// remove system
system.velocity('transition.whirlOut', {
@@ -299,7 +439,6 @@ define([
/**
* calculate the x/y coordinates for a new system - relativ to a source system
* @param sourceSystem
- * @param grid
* @returns {{x: *, y: *}}
*/
let calculateNewSystemPosition = function(sourceSystem){
@@ -343,9 +482,42 @@ define([
return newPosition;
};
+ /**
+ * get new dom element for systemData that shows "info" data (additional data)
+ * -> this is show below the system base data on map
+ * @param data
+ * @returns {*}
+ */
+ let getHeadInfoElement = (data) => {
+ let headInfo = null;
+
+ // check systemData if headInfo element is needed
+ if(data.statics && data.statics.length){
+ // format wh statics
+ let statics = [];
+ for(let staticData of data.statics){
+ statics.push(
+ '' + staticData.security + ''
+ );
+ }
+
+ headInfo = $('', {
+ class: config.systemHeadInfoClass
+ }).append(
+ statics.join(' ')
+ );
+ }
+
+ return headInfo;
+ };
+
return {
deleteSystems: deleteSystems,
removeSystems: removeSystems,
- calculateNewSystemPosition: calculateNewSystemPosition
+ calculateNewSystemPosition: calculateNewSystemPosition,
+ getHeadInfoElement: getHeadInfoElement
};
});
\ No newline at end of file
diff --git a/js/app/map/util.js b/js/app/map/util.js
index 3334f993..dd86d7b1 100644
--- a/js/app/map/util.js
+++ b/js/app/map/util.js
@@ -692,6 +692,9 @@ define([
case'stargate':
type = 'stargate';
break;
+ case'abyssal':
+ type = 'abyssal';
+ break;
default:
console.error('Connection scope "' + scope + '" unknown!');
}
@@ -990,16 +993,53 @@ define([
});
};
+ /**
+ * add system effect tooltip
+ * @param security
+ * @param effect
+ * @returns {*}
+ */
+ $.fn.addSystemEffectTooltip = function(security, effect, options){
+ let effectClass = getEffectInfoForSystem(effect, 'class');
+ let systemEffectData = Util.getSystemEffectData(security, effect);
+
+ let title = ' ' +
+ getEffectInfoForSystem(effect, 'name') +
+ '' + security + '';
+
+ let content = Util.getSystemEffectTable(systemEffectData);
+
+ let defaultOptions = {
+ placement: 'top',
+ html: true,
+ trigger: 'hover',
+ container: 'body',
+ title: title,
+ content: content,
+ delay: {
+ show: 150,
+ hide: 0
+ },
+ };
+
+ options = $.extend({}, defaultOptions, options);
+
+ return this.each(function(){
+ $(this).popover(options);
+ });
+ };
+
/**
* add a wormhole tooltip with wh specific data to elements
* @param tooltipData
* @returns {*}
*/
- $.fn.addWormholeInfoTooltip = function(tooltipData){
- return this.each(function() {
+ $.fn.addWormholeInfoTooltip = function(tooltipData, options){
+ return this.each(function(){
let element = $(this);
- requirejs(['text!templates/tooltip/wormhole_info.html', 'mustache'], function (template, Mustache) {
+ requirejs(['text!templates/tooltip/wormhole_info.html', 'mustache'], (template, Mustache) => {
+
// format tooltip data
let data = {};
if(tooltipData.massTotal){
@@ -1014,28 +1054,48 @@ define([
if(tooltipData.maxStableTime){
data.maxStableTime = tooltipData.maxStableTime + ' h';
}
+ if(tooltipData.signatureStrength){
+ data.signatureStrength = parseFloat(tooltipData.signatureStrength).toLocaleString() + ' %';
+ }else{
+ data.signatureStrength = 'unknown';
+ }
+ if(!tooltipData.class){
+ tooltipData.class = Util.getSecurityClassForSystem(tooltipData.security);
+ }
let title = tooltipData.name +
'' + tooltipData.security + '';
let content = Mustache.render(template, data);
- element.popover({
+ let defaultOptions = {
placement: 'top',
html: true,
trigger: 'hover',
- content: '',
container: 'body',
title: title,
+ content: '',
delay: {
show: 150,
hide: 0
}
- });
+ };
+
+ options = $.extend({}, defaultOptions, options);
+
+ element.popover(options);
// set new popover content
let popover = element.data('bs.popover');
popover.options.title = title;
popover.options.content = content;
+
+ if(options.smaller){
+ element.setPopoverSmall();
+ }
+
+ if(options.show){
+ element.popover('show');
+ }
});
});
};
diff --git a/js/app/mappage.js b/js/app/mappage.js
index cbea1124..a72015fb 100644
--- a/js/app/mappage.js
+++ b/js/app/mappage.js
@@ -32,6 +32,9 @@ define([
// set default dialog config
Util.initDefaultBootboxConfig();
+ // set default select2 config
+ Util.initDefaultSelect2Config();
+
// load page
// load info (maintenance) info panel (if scheduled)
$('body').loadPageStructure().setGlobalShortcuts();
@@ -128,6 +131,8 @@ define([
Init.url = response.url;
Init.slack = response.slack;
Init.discord = response.discord;
+ Init.structureStatus = response.structureStatus;
+ Init.universeCategories = response.universeCategories;
Init.routeSearch = response.routeSearch;
Init.programMode = response.programMode;
diff --git a/js/app/module_map.js b/js/app/module_map.js
index c01e93f2..0c12980a 100644
--- a/js/app/module_map.js
+++ b/js/app/module_map.js
@@ -9,6 +9,7 @@ define([
'app/ui/system_graph',
'app/ui/system_signature',
'app/ui/system_route',
+ 'app/ui/system_intel',
'app/ui/system_killboard',
'app/ui/connection_info',
'app/counter'
@@ -23,6 +24,7 @@ define([
SystemGraphModule,
SystemSignatureModule,
SystemRouteModule,
+ SystemIntelModule,
SystemKillboardModule,
ConnectionInfoModule
) => {
@@ -276,6 +278,9 @@ define([
// draw system routes module
drawModule(secondCell, SystemRouteModule, currentSystemData.mapId, currentSystemData.systemData);
+ // draw system intel module
+ drawModule(secondCell, SystemIntelModule, currentSystemData.mapId, currentSystemData.systemData);
+
// draw system killboard module
drawModule(secondCell, SystemKillboardModule, currentSystemData.mapId, currentSystemData.systemData);
});
diff --git a/js/app/page.js b/js/app/page.js
index 49a3104c..58cee340 100644
--- a/js/app/page.js
+++ b/js/app/page.js
@@ -69,7 +69,8 @@ define([
dynamicElementWrapperId: 'pf-dialog-wrapper',
// system signature module
- systemSigModuleClass: 'pf-sig-table-module', // module wrapper (signatures)
+ systemSignatureModuleClass: 'pf-signature-table-module', // module wrapper (signatures)
+ systemIntelModuleClass: 'pf-system-intel-module', // module wrapper (intel)
};
let programStatusCounter = 0; // current count down in s until next status change is possible
@@ -137,13 +138,18 @@ define([
location.reload();
});
- body.watchKey('signaturePaste', (e) => {
+ body.watchKey('clipboardPaste', (e) => {
// just send event to the current active map
let activeMap = Util.getMapModule().getActiveMap();
if(activeMap){
// look for active signature module (active system)
- let signatureModuleElement = MapUtil.getTabContentElementByMapElement(activeMap).find('.' + config.systemSigModuleClass);
- if(signatureModuleElement.length){
+ let mapContentElement = MapUtil.getTabContentElementByMapElement(activeMap);
+ let signatureModuleElement = mapContentElement.find('.' + config.systemSignatureModuleClass);
+ let intelModuleElement = mapContentElement.find('.' + config.systemIntelModuleClass);
+ if(
+ signatureModuleElement.length ||
+ intelModuleElement.length
+ ){
e = e.originalEvent;
let targetElement = $(e.target);
// do not read clipboard if pasting into form elements
@@ -155,6 +161,7 @@ define([
){
let clipboard = (e.originalEvent || e).clipboardData.getData('text/plain');
signatureModuleElement.trigger('pf:updateSystemSignatureModuleByClipboard', [clipboard]);
+ intelModuleElement.trigger('pf:updateIntelModuleByClipboard', [clipboard]);
}
}
}
diff --git a/js/app/setup.js b/js/app/setup.js
index 1d1b2ec4..8de203c6 100644
--- a/js/app/setup.js
+++ b/js/app/setup.js
@@ -14,24 +14,71 @@ define([
splashOverlayClass: 'pf-splash' // class for "splash" overlay
};
+ /**
+ * send ajax request for index build
+ * @param url
+ * @param requestData
+ * @param context
+ * @param callback
+ */
+ let sendRequest = (url, requestData, context, callback) => {
+ if(requestData.count === 0){
+ // first iteration
+ context.target.button('loading');
+ }
+
+ $.ajax({
+ url: url,
+ type: 'POST',
+ dataType: 'json',
+ data: requestData,
+ context: context
+ }).done(function(data){
+ callback(this, data);
+ }).fail(function( jqXHR, status, error) {
+ let reason = status + ' ' + error;
+ Util.showNotify({title: jqXHR.status + ': Failed. Please retry', text: reason, type: 'warning'});
+ this.target.button('reset');
+ });
+ };
+
/**
* set page observer
*/
let setPageObserver = () => {
let body = $('body');
- // collapse ---------------------------------------
+ // collapse ---------------------------------------------------------------------------------------------------
body.find('[data-toggle="collapse"]').css({cursor: 'pointer'}).on('click', function(){
$(this).find('.pf-animate-rotate').toggleClass('right');
});
- // buttons ----------------------------------------
+ // buttons ----------------------------------------------------------------------------------------------------
// exclude "download" && "navigation" buttons
- body.find('.btn').not('.navbar-fixed-bottom .btn').not('[href^="?export"]').on('click', function(e){
+ body.find('.btn')
+ .not('.navbar-fixed-bottom .btn')
+ .not('[data-action="clearIndex"]')
+ .not('[data-action="buildIndex"]')
+ .not('[href^="?export"]').on('click', function(e){
$('.' + config.splashOverlayClass).showSplashOverlay();
});
- // tooltips ---------------------------------------
+ // build/clear index buttons ----------------------------------------------------------------------------------
+ // clear index buttons ----------------------------------------------------------------------------------------
+ body.find('.btn[data-action="buildIndex"], .btn[data-action="clearIndex"]').on('click', function(e){
+ e.preventDefault();
+ let element = $(this);
+ let url = '/api/setup/' + element.attr('data-action');
+ sendRequest(url, {
+ type: element.attr('data-type'),
+ count: 0
+ }, {
+ target: element,
+ url: url
+ }, updateIndexCount);
+ });
+
+ // tooltips ---------------------------------------------------------------------------------------------------
body.initTooltips();
// change url (remove logout parameter)
@@ -40,6 +87,42 @@ define([
}
};
+ /**
+ * update data count label for "indexed data"
+ * @param context
+ * @param responseData
+ */
+ let updateIndexCount = (context, responseData) => {
+ let countElement = context.target.closest('.row').children().eq(1).find('kbd');
+ countElement.text(responseData.countBuildAll + '/' + responseData.countAll);
+ countElement.removeClass('txt-color-success txt-color-danger txt-color-warning');
+ if(responseData.countBuildAll >=responseData.countAll){
+ countElement.addClass('txt-color-success');
+ }else if(responseData.countBuildAll > 0){
+ countElement.addClass('txt-color-warning');
+ }else{
+ countElement.addClass('txt-color-danger');
+ }
+
+ context.target.find('.btn-progress').html(' ' + responseData.progress + '%').css('width', responseData.progress + '%');
+
+ // send next chunk of rows -> import only
+ if(
+ context.target.attr('data-action') === 'buildIndex' &&
+ responseData.countBuildAll < responseData.countAll
+ ){
+ sendRequest(context.url, {
+ type: responseData.type,
+ count: responseData.count
+ }, {
+ target: context.target,
+ url: context.url
+ }, updateIndexCount);
+ }else{
+ context.target.button('reset');
+ }
+ };
+
/**
* perform a basic check if Clients (browser) can connect to the webSocket server
*/
@@ -165,10 +248,10 @@ define([
*/
$(function(){
- // show app information in browser console --------
+ // show app information in browser console --------------------------------------------------------------------
Util.showVersionInfo();
- // hide splash loading animation ------------------
+ // hide splash loading animation ------------------------------------------------------------------------------
$('.' + config.splashOverlayClass).hideSplashOverlay();
setPageObserver();
diff --git a/js/app/ui/dialog/jump_info.js b/js/app/ui/dialog/jump_info.js
index d87428ed..bfb3b1b2 100644
--- a/js/app/ui/dialog/jump_info.js
+++ b/js/app/ui/dialog/jump_info.js
@@ -44,7 +44,13 @@ define([
}.bind(this);
}.bind({
Util: Util
- })
+ }),
+ sigStrengthValue: function(){
+ return function(value, render){
+ let float = render(value);
+ return float.length ? parseFloat(float).toLocaleString() + ' %' : 'unknown';
+ };
+ }
};
let content = Mustache.render(template, data);
diff --git a/js/app/ui/dialog/map_settings.js b/js/app/ui/dialog/map_settings.js
index 41d099e0..8b1f8af0 100644
--- a/js/app/ui/dialog/map_settings.js
+++ b/js/app/ui/dialog/map_settings.js
@@ -346,7 +346,6 @@ define([
let formValid = form.isValidForm();
if(formValid === true){
-
// lock dialog
let dialogContent = mapInfoDialog.find('.modal-content');
dialogContent.showLoadingAnimation();
@@ -391,7 +390,6 @@ define([
data: requestData,
dataType: 'json'
}).done(function(responseData){
-
if(responseData.error.length){
form.showFormMessage(responseData.error);
}else{
diff --git a/js/app/ui/form_element.js b/js/app/ui/form_element.js
index cb93d83e..a5f7d41d 100644
--- a/js/app/ui/form_element.js
+++ b/js/app/ui/form_element.js
@@ -7,10 +7,67 @@ define([
'app/init',
'app/util',
'app/map/util'
-], function($, Init, Util, MapUtil) {
-
+], ($, Init, Util, MapUtil) => {
'use strict';
+ /**
+ * format result data
+ * @param data
+ * @returns {*}
+ */
+ let formatCategoryTypeResultData = (data) => {
+ if(data.loading) return data.text;
+ if(data.placeholder) return data.placeholder;
+
+ let markup = '
';
- break;
- case 'corporation':
- imagePath = Init.url.ccpImageServer + '/Corporation/' + data.id + '_32.png';
- previewContent = '';
- break;
- case 'alliance':
- imagePath = Init.url.ccpImageServer + '/Alliance/' + data.id + '_32.png';
- previewContent = '';
- break;
- }
-
- let markup = '
';
+
+ if(data.hasOwnProperty('children')){
+ // category group label
+ markup += '';
+ }else if(iconName){
+ thumb = '';
+ }
+
+ markup += '
';
+
+ return markup;
+ };
+
/**
* init a select element as "select2" for map selection
*/
@@ -20,7 +77,6 @@ define([
$.when(
selectElement.select2({
dropdownParent: selectElement.parents('.modal-body'),
- theme: 'pathfinder',
maximumSelectionLength: 5
})
);
@@ -133,8 +189,7 @@ define([
}
},
dropdownParent: selectElement.parents('.modal-body'),
- theme: 'pathfinder',
- minimumInputLength: 2,
+ minimumInputLength: 3,
templateResult: formatResultData,
placeholder: 'System name',
allowClear: true,
@@ -147,7 +202,7 @@ define([
// select changed
}).on('select2:open', function(){
// clear selected system (e.g. default system)
- // => improves usability (not necessary). There is a small "x" whe it could be cleared manually
+ // => improves usability (not necessary). There is a small "x" if field can be cleared manually
if(
options.maxSelectionLength === 1 &&
$(this).val() !== null
@@ -171,52 +226,8 @@ define([
$.fn.initAccessSelect = function(options){
return this.each(function(){
-
let selectElement = $(this);
- // format result data
- function formatResultData (data) {
-
- if (data.loading){
- return data.text;
- }
-
- // check if an option is already selected
- // do not show the same result twice
- let currentValues = selectElement.val();
-
- if(
- currentValues &&
- currentValues.indexOf( data.id.toString() ) !== -1
- ){
- return ;
- }
-
- let imagePath = '';
- let previewContent = '';
-
- switch(options.type){
- case 'character':
- imagePath = Init.url.ccpImageServer + '/Character/' + data.id + '_32.jpg';
- previewContent = '' + data.text + '
';
+ markup += '(' + data.children.length + ')
';
+ }else{
+ let imagePath = '';
+ let iconName = '';
+ let thumb = '';
+
+ switch(data.categoryType){
+ case 'character':
+ imagePath = Init.url.ccpImageServer + '/Character/' + data.id + '_32.jpg';
+ break;
+ case 'corporation':
+ imagePath = Init.url.ccpImageServer + '/Corporation/' + data.id + '_32.png';
+ break;
+ case 'alliance':
+ imagePath = Init.url.ccpImageServer + '/Alliance/' + data.id + '_32.png';
+ break;
+ case 'inventoryType':
+ imagePath = Init.url.ccpImageServer + '/Type/' + data.id + '_32.png';
+ break;
+ case 'render':
+ imagePath = Init.url.ccpImageServer + '/Render/' + data.id + '_32.png';
+ break;
+ case 'station':
+ iconName = 'fa-home';
+ break;
+ case 'system':
+ iconName = 'fa-sun';
+ break;
+ }
+
+ if(imagePath){
+ thumb = '' + thumb + '
';
+ markup += '' + data.text + '
';
+ }
+ markup += '';
- markup += '
';
-
- return markup;
- }
-
// format selection data
function formatSelectionData (data){
@@ -251,7 +262,8 @@ define([
results: data.map( function(item){
return {
id: item.id,
- text: item.name
+ text: item.name,
+ categoryType: options.type
};
})
};
@@ -266,12 +278,11 @@ define([
}
},
dropdownParent: selectElement.parents('.modal-body'),
- theme: 'pathfinder',
minimumInputLength: 3,
placeholder: options.type + ' names',
allowClear: false,
maximumSelectionLength: options.maxSelectionLength,
- templateResult: formatResultData,
+ templateResult: formatCategoryTypeResultData,
templateSelection: formatSelectionData,
escapeMarkup: function(markup){
// let our custom formatter work
@@ -288,4 +299,190 @@ define([
};
+ /**
+ * init a select element as an ajax based "select2" object for universeTypes
+ * e.g. 'alliance', 'corporation', 'character', ...
+ * @param options
+ * @returns {*}
+ */
+ $.fn.initUniverseSearch = function(options) {
+
+ let showErrorNotification = (reason) => {
+ Util.showNotify({title: 'Search failed', text: reason + ' deleted', type: 'warning'});
+ };
+
+ /**
+ * format selection data
+ * @param data
+ * @returns {*}
+ */
+ function formatSelectionData (data){
+ if(data.loading) return data.text;
+ if(data.placeholder) return data.placeholder;
+
+ let markup = '' + previewContent + '
';
- markup += '' + data.text + '
';
+ markup += '
';
+
+ return markup;
+ }
+
+ return this.each(function() {
+ let selectElement = $(this);
+
+ $.when(
+ selectElement.select2({
+ ajax: {
+ type: 'POST',
+ url: function(params){
+ // add params to URL
+ return Init.path.searchUniverseData + '/' + params.term;
+ },
+ dataType: 'json',
+ delay: 250,
+ timeout: 5000,
+ cache: true,
+ data: function(params){
+ return {
+ categories: options.categoryNames
+ };
+ },
+ processResults: function(result, page) {
+ let data = {results: []};
+ if(result.hasOwnProperty('error')){
+ showErrorNotification(result.error);
+ }else{
+ let mapChildren = function(item){
+ return {
+ id: item.id,
+ text: item.name,
+ categoryType: this
+ };
+ };
+
+ for(let category in result){
+ // skip custom functions in case result = [] (array functions)
+ if(result.hasOwnProperty(category)){
+ data.results.push({
+ text: category,
+ children: result[category].map(mapChildren, category)
+ });
+ }
+ }
+ }
+
+ return data;
+ },
+ error: function (jqXHR, status, error) {
+ if( !Util.isXHRAborted(jqXHR) ){
+ let reason = status + ' ' + jqXHR.status + ': ' + error;
+ showErrorNotification(reason);
+ }
+ }
+ },
+ dropdownParent: selectElement.parents('.modal-body') ,
+ minimumInputLength: 3,
+ placeholder: '',
+ allowClear: options.maxSelectionLength <= 1,
+ maximumSelectionLength: options.maxSelectionLength,
+ templateResult: formatCategoryTypeResultData,
+ // templateSelection: formatSelectionData, // some issues with "clear" selection on single selects (empty option is needed)
+ escapeMarkup: function(markup){
+ // let our custom formatter work
+ return markup;
+ }
+ }).on('change', function(e){
+ // select changed
+ }).on('select2:open', function(){
+ // clear selected system (e.g. default system)
+ // => improves usability (not necessary). There is a small "x" if field can be cleared manually
+ if(
+ options.maxSelectionLength === 1 &&
+ $(this).val() !== null
+ ){
+ $(this).val('').trigger('change');
+ }
+ })
+ ).done(function(){
+ // after init finish
+ });
+ });
+ };
+
+
+ $.fn.initUniverseTypeSelect = function(options) {
+
+ /**
+ * get select option data by categoryIds
+ * @param categoryIds
+ * @returns {{results: Array}}
+ */
+ let getOptionsData = categoryIds => {
+ let data = [];
+
+ let mapChildren = function(type){
+ return {
+ id: type.id,
+ text: type.name,
+ groupId: this.groupId,
+ categoryId: this.categoryId,
+ categoryType: this.categoryType
+ };
+ };
+
+ for(let categoryId of categoryIds){
+ let categoryData = Util.getObjVal(Init, 'universeCategories.' + categoryId);
+ if(categoryData && categoryData.groups){
+ // categoryId data exists and has groups...
+ for(let groupData of categoryData.groups){
+ if(groupData && groupData.types){
+ // groupData exists and has types...
+ data.push({
+ text: groupData.name,
+ children: groupData.types.map(mapChildren, {
+ groupId: groupData.id,
+ categoryId: categoryData.id,
+ categoryType: 'inventoryType',
+ })
+ });
+ }
+ }
+ }
+ }
+
+ return data;
+ };
+
+ return this.each(function() {
+ let selectElement = $(this);
+
+ $.when(
+ selectElement.select2({
+ data: getOptionsData(options.categoryIds),
+ dropdownParent: selectElement.parents('.modal-body'),
+ minimumInputLength: 0, // minimum number of characters required to start a search
+ maximumInputLength: 100, // maximum number of characters that may be provided for a search term
+ placeholder: '',
+ allowClear: options.maxSelectionLength <= 1,
+ multiple: options.maxSelectionLength > 1,
+ maximumSelectionLength: options.maxSelectionLength,
+ // maximumSelectionLength: options.maxSelectionLength > 1 ? options.maxSelectionLength > 1 : 0,
+ // minimumResultsForSearch: 5, // minimum number of results required to display the search box
+ templateResult: formatCategoryTypeResultData,
+ escapeMarkup: function(markup){
+ return markup;
+ }
+ }).on('select2:open', function(){
+ // clear selected system (e.g. default system)
+ // => improves usability (not necessary). There is a small "x" if field can be cleared manually
+ if(
+ options.maxSelectionLength === 1 &&
+ $(this).val() !== null
+ ){
+ $(this).val('').trigger('change');
+ }
+ }).val(options.selected).trigger('change')
+ );
+ });
+ };
+
});
diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js
index a00b8db3..7aa5f4c3 100644
--- a/js/app/ui/system_info.js
+++ b/js/app/ui/system_info.js
@@ -39,7 +39,10 @@ define([
tableToolsActionClass: 'pf-table-tools-action', // class for "edit" action
descriptionTextareaElementClass: 'pf-system-info-description', // class for "description" textarea element (xEditable)
- descriptionTextareaCharCounter: 'pf-form-field-char-count' // class for "character counter" element for form field
+ descriptionTextareaCharCounter: 'pf-form-field-char-count', // class for "character counter" element for form field
+
+ // fonts
+ fontTriglivianClass: 'pf-triglivian' // class for "Triglivian" names (e.g. Abyssal systems)
};
// disable Module update temporary (until. some requests/animations) are finished
@@ -54,7 +57,7 @@ define([
/**
* set module observer and look for relevant system data to update
*/
- let setModuleObserver = function(moduleElement){
+ let setModuleObserver = (moduleElement) => {
$(document).off('pf:updateSystemInfoModule').on('pf:updateSystemInfoModule', function(e, data){
if(data){
moduleElement.updateSystemInfoModule(data);
@@ -66,7 +69,7 @@ define([
* shows the tool action element by animation
* @param toolsActionElement
*/
- let showToolsActionElement = function(toolsActionElement){
+ let showToolsActionElement = (toolsActionElement) => {
toolsActionElement.velocity('stop').velocity({
opacity: 1,
height: '100%'
@@ -81,7 +84,7 @@ define([
* hides the tool action element by animation
* @param toolsActionElement
*/
- let hideToolsActionElement = function(toolsActionElement){
+ let hideToolsActionElement = (toolsActionElement) => {
toolsActionElement.velocity('stop').velocity('reverse', {
display: 'none',
visibility: 'hidden'
@@ -169,40 +172,13 @@ define([
moduleElement.find('.' + config.descriptionArea).hideLoadingAnimation();
};
- /**
- * update a character counter field with current value length - maxCharLength
- * @param field
- * @param charCounterElement
- * @param maxCharLength
- */
- let updateCounter = function(field, charCounterElement, maxCharLength){
- let value = field.val();
- let inputLength = value.length;
-
- // line breaks are 2 characters!
- let newLines = value.match(/(\r\n|\n|\r)/g);
- let addition = 0;
- if (newLines != null) {
- addition = newLines.length;
- }
- inputLength += addition;
-
- charCounterElement.text(maxCharLength - inputLength);
-
- if(maxCharLength <= inputLength){
- charCounterElement.toggleClass('txt-color-red', true);
- }else{
- charCounterElement.toggleClass('txt-color-red', false);
- }
- };
-
/**
* get module element
* @param parentElement
* @param mapId
* @param systemData
*/
- let getModule = function(parentElement, mapId, systemData){
+ let getModule = (parentElement, mapId, systemData) => {
// create new module container
let moduleElement = $('' + data.text + '
');
@@ -263,7 +239,6 @@ define([
inputclass: config.descriptionTextareaElementClass,
tpl: '',
params: function(params){
-
params.mapData = {
id: mapId
};
@@ -319,10 +294,10 @@ define([
textarea.parent().next().append(charCounter);
// update character counter
- updateCounter(textarea, charCounter, maxDescriptionLength);
+ Util.updateCounter(textarea, charCounter, maxDescriptionLength);
textarea.on('keyup', function(){
- updateCounter($(this), charCounter, maxDescriptionLength);
+ Util.updateCounter($(this), charCounter, maxDescriptionLength);
});
});
@@ -358,30 +333,7 @@ define([
tooltipElements.tooltip();
// init system effect popover ----------------------------------------------------------------
- let infoEffectElement = $(moduleElement).find('.' + config.systemInfoEffectInfoClass);
-
- if(infoEffectElement.length){
- // effect row exists -> get effect data
- let systemEffectData = Util.getSystemEffectData( systemData.security, systemData.effect);
-
- if(systemEffectData !== false){
- // transform data into table
- let systemEffectTable = Util.getSystemEffectTable( systemEffectData );
-
- infoEffectElement.popover({
- html: true,
- trigger: 'hover',
- placement: 'top',
- delay: 200,
- title: 'System effects',
- container: 'body',
- content: systemEffectTable
- });
- }else{
- // effect data not found (e.g. !unknown! shattered system) -> hide "popover" icon icon
- infoEffectElement.children().hide();
- }
- }
+ $(moduleElement).find('.' + config.systemInfoEffectInfoClass).addSystemEffectTooltip(systemData.security, systemData.effect);
// init static wormhole information ----------------------------------------------------------
if(systemData.statics){
@@ -408,7 +360,6 @@ define([
popoverElement = $(popoverElement);
let popover = popoverElement.data('bs.popover');
-
$.ajax({
url: popoverElement.data('url'),
success: function(data){
@@ -434,6 +385,7 @@ define([
statusInfoClass: config.systemInfoStatusLabelClass,
systemTypeName: MapUtil.getSystemTypeInfo(systemData.type.id, 'name'),
+ systemIsWormhole: MapUtil.getSystemTypeInfo(systemData.type.id, 'name') === 'w-space',
systemStatusId: systemData.status.id,
systemStatusClass: Util.getStatusInfoForSystem(systemData.status.id, 'class'),
systemStatusLabel: Util.getStatusInfoForSystem(systemData.status.id, 'label'),
@@ -446,6 +398,11 @@ define([
descriptionButtonClass: config.addDescriptionButtonClass,
tableToolsActionClass: config.tableToolsActionClass,
descriptionTextareaClass: config.descriptionTextareaElementClass,
+ systemNameClass: () => {
+ return (val, render) => {
+ return render(val) === 'A' ? config.fontTriglivianClass : '';
+ };
+ },
shatteredWormholeInfo: shatteredWormholeInfo,
@@ -468,7 +425,7 @@ define([
* @param mapId
* @param systemData
*/
- let initModule = function(moduleElement, mapId, systemData){
+ let initModule = (moduleElement, mapId, systemData) => {
// set module observer
setModuleObserver(moduleElement);
diff --git a/js/app/ui/system_intel.js b/js/app/ui/system_intel.js
new file mode 100644
index 00000000..33786cba
--- /dev/null
+++ b/js/app/ui/system_intel.js
@@ -0,0 +1,791 @@
+/**
+ * system route module
+ */
+
+define([
+ 'jquery',
+ 'app/init',
+ 'app/util',
+ 'bootbox'
+], ($, Init, Util, bootbox) => {
+ 'use strict';
+
+ let config = {
+ // module info
+ modulePosition: 1,
+ moduleName: 'systemIntel',
+ moduleHeadClass: 'pf-module-head', // class for module header
+ moduleHandlerClass: 'pf-module-handler-drag', // class for "drag" handler
+ moduleTypeClass: 'pf-system-intel-module', // class for this module
+
+ // headline toolbar
+ moduleHeadlineIconClass: 'pf-module-icon-button', // class for toolbar icons in the head
+ moduleHeadlineIconAddClass: 'pf-module-icon-button-add', // class for "add structure" icon
+ moduleHeadlineIconReaderClass: 'pf-module-icon-button-reader', // class for "dScan reader" icon
+ moduleHeadlineIconRefreshClass: 'pf-module-icon-button-refresh', // class for "refresh" icon
+
+ // system intel module
+ systemStructuresTableClass: 'pf-system-structure-table', // class for route tables
+
+ // structure dialog
+ structureDialogId: 'pf-structure-dialog', // id for "structure" dialog
+ statusSelectId: 'pf-structure-dialog-status-select', // id for "status" select
+ typeSelectId: 'pf-structure-dialog-type-select', // id for "type" select
+ corporationSelectId: 'pf-structure-dialog-corporation-select', // id for "corporation" select
+ descriptionTextareaId: 'pf-structure-dialog-description-textarea', // id for "description" textarea
+ descriptionTextareaCharCounter: 'pf-form-field-char-count', // class for "character counter" element for form field
+
+ // dataTable
+ tableRowIdPrefix: 'pf-structure-row_', // id prefix for table rows
+ tableCellImageClass: 'pf-table-image-smaller-cell', // class for table "image" cells
+ tableCellCounterClass: 'pf-table-counter-cell', // class for table "counter" cells
+ tableCellEllipsisClass: 'pf-table-cell-ellipses-auto', // class for table "ellipsis" cells
+ dataTableActionCellClass: 'pf-table-action-cell' // class for "action" cells
+ };
+
+ let maxDescriptionLength = 512;
+
+ /**
+ * get status icon for structure
+ * @param statusData
+ * @returns {string}
+ */
+ let getStatusData = (statusData) => {
+ return '';
+ };
+
+ /**
+ * get DOM id by id
+ * @param tableApi
+ * @param id
+ * @returns {*}
+ */
+ let getRowId = (tableApi, id) => {
+ return tableApi.rows().ids().toArray().find(rowId => rowId === config.tableRowIdPrefix + id);
+ };
+
+ /**
+ * callback -> add structure rows from responseData
+ * @param context
+ * @param responseData
+ */
+ let callbackAddStructureRows = (context, responseData) => {
+ let systemData = Util.getObjVal(responseData, 'system');
+ callbackUpdateStructureRows(context, systemData);
+ };
+
+ /**
+ * callback -> add structure rows from systemData
+ * @param context
+ * @param systemData
+ */
+ let callbackUpdateStructureRows = (context, systemData) => {
+ let touchedRows = [];
+ let hadData = context.tableApi.rows().any();
+ let notificationCounter = {
+ added: 0,
+ changed: 0,
+ deleted: 0
+ };
+
+ if(systemData){
+ let corporations = Util.getObjVal(systemData, 'structures');
+ if(corporations) {
+ for (let [corporationId, corporationData] of Object.entries(corporations)){
+ if(corporationData.structures && corporationData.structures.length){
+ for(let structureData of corporationData.structures){
+ let rowId = getRowId(context.tableApi, structureData.id);
+
+ // add corporation data
+ structureData.corporation = {
+ id: corporationData.id,
+ name: corporationData.name
+ };
+
+ if(rowId){
+ // update row
+ let api = context.tableApi.row('#' + rowId).data(structureData);
+ api.nodes().to$().data('animationStatus', 'changed').destroyTimestampCounter();
+
+ touchedRows.push(api.id());
+ notificationCounter.changed++;
+ }else{
+ // insert new row
+ //context.tableApi.row.add(structureData).nodes().to$().data('animationStatus', 'added');
+ let api = context.tableApi.row.add(structureData);
+ api.nodes().to$().data('animationStatus', 'added');
+
+ touchedRows.push(api.id());
+ notificationCounter.added++;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if(context.removeMissing){
+ notificationCounter.deleted += context.tableApi.rows((idx, data, node) => !touchedRows.includes(node.id)).remove().ids().count();
+ }
+
+ context.tableApi.draw();
+
+ // show notification ------------------------------------------------------------------------------------------
+ let notification = '';
+ notification += notificationCounter.added > 0 ? notificationCounter.added + ' added
' : ''; + notification += notificationCounter.changed > 0 ? notificationCounter.changed + ' changed
' : ''; + notification += notificationCounter.deleted > 0 ? notificationCounter.deleted + ' deleted
' : ''; + + if(hadData && notification.length){ + Util.showNotify({title: 'Structures updated', text: notification, type: 'success'}); + } + }; + + /** + * callback -> delete structure rows + * @param context + * @param responseData + */ + let callbackDeleteStructures = (context, responseData) => { + let structureIds = Util.getObjVal(responseData, 'deletedStructureIds'); + let deletedCounter = 0; + if(structureIds && structureIds.length){ + for(let structureId of structureIds){ + let rowId = getRowId(context.tableApi, structureId); + if(rowId){ + context.tableApi.row('#' + rowId).remove(); + deletedCounter++; + } + } + } + + if(deletedCounter){ + context.tableApi.draw(); + Util.showNotify({title: 'Structure deleted', text: deletedCounter + ' deleted', type: 'success'}); + } + }; + + /** + * send ajax request + * @param url + * @param requestData + * @param context + * @param callback + */ + let sendRequest = (url, requestData, context, callback) => { + context.moduleElement.showLoadingAnimation(); + + $.ajax({ + url: url, + type: 'POST', + dataType: 'json', + data: requestData, + context: context + }).done(function(data){ + callback(this, data); + }).fail(function( jqXHR, status, error) { + let reason = status + ' ' + error; + Util.showNotify({title: jqXHR.status + ': System intel data', text: reason, type: 'warning'}); + $(document).setProgramStatus('problem'); + }).always(function(){ + // hide loading animation + this.moduleElement.hideLoadingAnimation(); + }); + }; + + /** + * requests system data + * @param requestData + * @param context + * @param callback + */ + let getStructureData = (requestData, context, callback) => { + sendRequest(Init.path.getSystemData, requestData, context, callback); + }; + + /** + * save structure data + * @param requestData + * @param context + * @param callback + */ + let saveStructureData = (requestData, context, callback) => { + sendRequest(Init.path.saveStructureData, requestData, context, callback); + }; + + /** + * delete structure + * @param requestData + * @param context + * @param callback + */ + let deleteStructure = (requestData, context, callback) => { + sendRequest(Init.path.deleteStructureData, requestData, context, callback); + }; + + /** + * show structure dialog + * @param moduleElement + * @param tableApi + * @param systemId + * @param structureData + */ + let showStructureDialog = (moduleElement, tableApi, systemId, structureData) => { + let structureStatusData = Util.getObjVal(Init, 'structureStatus'); + let structureTypeData = Util.getObjVal(Init, 'structureStatus'); + + let data = { + id: config.structureDialogId, + structureData: structureData, + structureStatus: Object.keys(structureStatusData).map((k) => { + let data = structureStatusData[k]; + data.selected = data.id === Util.getObjVal(structureData, 'status.id'); + return data; + }), + statusSelectId: config.statusSelectId, + typeSelectId: config.typeSelectId, + corporationSelectId: config.corporationSelectId, + descriptionTextareaId: config.descriptionTextareaId, + descriptionTextareaCharCounter: config.descriptionTextareaCharCounter, + maxDescriptionLength: maxDescriptionLength + }; + + requirejs(['text!templates/dialog/structure.html', 'mustache'], (template, Mustache) => { + let content = Mustache.render(template, data); + + let structureDialog = bootbox.dialog({ + title: 'Structure', + message: content, + show: true, + buttons: { + close: { + label: 'cancel', + className: 'btn-default' + }, + success: { + label: ' save', + className: 'btn-success', + callback: function (){ + let form = this.find('form'); + + // validate form + form.validator('validate'); + + // check whether the form is valid + let formValid = form.isValidForm(); + + if(formValid){ + // get form data + let formData = form.getFormValues(); + formData.id = Util.getObjVal(structureData, 'id') | 0; + formData.structureId = Util.getObjVal(formData, 'structureId') | 0; + formData.corporationId = Util.getObjVal(formData, 'corporationId') | 0; + formData.systemId = systemId | 0; + + saveStructureData({ + structures: [formData] + }, { + moduleElement: moduleElement, + tableApi: tableApi + }, callbackUpdateStructureRows); + }else{ + return false; + } + } + } + } + }); + + structureDialog.on('shown.bs.modal', function(e) { + // init type select live search + let selectElementType = $(this).find('#' + config.typeSelectId); + selectElementType.initUniverseTypeSelect({ + categoryIds: [65], + maxSelectionLength: 1, + selected: [Util.getObjVal(structureData, 'structure.id')] + }); + + // init corporation select live search + let selectElementCorporation = $(this).find('#' + config.corporationSelectId); + selectElementCorporation.initUniverseSearch({ + categoryNames: ['corporation'], + maxSelectionLength: 1 + }); + + $(this).find('#' + config.statusSelectId).select2({ + minimumResultsForSearch: -1 + }); + + // init character counter + let textarea = $(this).find('#' + config.descriptionTextareaId); + let charCounter = $(this).find('.' + config.descriptionTextareaCharCounter); + Util.updateCounter(textarea, charCounter, maxDescriptionLength); + + textarea.on('keyup', function(){ + Util.updateCounter($(this), charCounter, maxDescriptionLength); + }); + + // set form validator (after select2 init finish) + $(this).find('form').initFormValidation(); + }); + + }); + }; + + /** + * show D-Scan reader dialog + * @param moduleElement + * @param tableApi + * @param systemData + */ + let showDscanReaderDialog = (moduleElement, tableApi, systemData) => { + requirejs(['text!templates/dialog/dscan_reader.html', 'mustache'], (template, Mustache) => { + let structureDialog = bootbox.dialog({ + title: 'D-Scan reader', + message: Mustache.render(template, {}), + show: true, + buttons: { + close: { + label: 'cancel', + className: 'btn-default' + }, + success: { + label: ' update intel', + className: 'btn-success', + callback: function (){ + let form = this.find('form'); + let formData = form.getFormValues(); + + updateStructureTableByClipboard(systemData, formData.clipboard, { + moduleElement: moduleElement, + tableApi: tableApi + }); + } + } + } + }); + + // dialog shown event + structureDialog.on('shown.bs.modal', function(e) { + // set focus on textarea + structureDialog.find('textarea').focus(); + }); + }); + }; + + /** + * get module element + * @param parentElement + * @param mapId + * @param systemData + * @returns {jQuery} + */ + let getModule = (parentElement, mapId, systemData) => { + let corporationId = Util.getCurrentUserInfo('corporationId'); + + // create new module container + let moduleElement = $('
' : ''; + notification += notificationCounter.changed > 0 ? notificationCounter.changed + ' changed
' : ''; + notification += notificationCounter.deleted > 0 ? notificationCounter.deleted + ' deleted
' : ''; + + if(hadData && notification.length){ + Util.showNotify({title: 'Structures updated', text: notification, type: 'success'}); + } + }; + + /** + * callback -> delete structure rows + * @param context + * @param responseData + */ + let callbackDeleteStructures = (context, responseData) => { + let structureIds = Util.getObjVal(responseData, 'deletedStructureIds'); + let deletedCounter = 0; + if(structureIds && structureIds.length){ + for(let structureId of structureIds){ + let rowId = getRowId(context.tableApi, structureId); + if(rowId){ + context.tableApi.row('#' + rowId).remove(); + deletedCounter++; + } + } + } + + if(deletedCounter){ + context.tableApi.draw(); + Util.showNotify({title: 'Structure deleted', text: deletedCounter + ' deleted', type: 'success'}); + } + }; + + /** + * send ajax request + * @param url + * @param requestData + * @param context + * @param callback + */ + let sendRequest = (url, requestData, context, callback) => { + context.moduleElement.showLoadingAnimation(); + + $.ajax({ + url: url, + type: 'POST', + dataType: 'json', + data: requestData, + context: context + }).done(function(data){ + callback(this, data); + }).fail(function( jqXHR, status, error) { + let reason = status + ' ' + error; + Util.showNotify({title: jqXHR.status + ': System intel data', text: reason, type: 'warning'}); + $(document).setProgramStatus('problem'); + }).always(function(){ + // hide loading animation + this.moduleElement.hideLoadingAnimation(); + }); + }; + + /** + * requests system data + * @param requestData + * @param context + * @param callback + */ + let getStructureData = (requestData, context, callback) => { + sendRequest(Init.path.getSystemData, requestData, context, callback); + }; + + /** + * save structure data + * @param requestData + * @param context + * @param callback + */ + let saveStructureData = (requestData, context, callback) => { + sendRequest(Init.path.saveStructureData, requestData, context, callback); + }; + + /** + * delete structure + * @param requestData + * @param context + * @param callback + */ + let deleteStructure = (requestData, context, callback) => { + sendRequest(Init.path.deleteStructureData, requestData, context, callback); + }; + + /** + * show structure dialog + * @param moduleElement + * @param tableApi + * @param systemId + * @param structureData + */ + let showStructureDialog = (moduleElement, tableApi, systemId, structureData) => { + let structureStatusData = Util.getObjVal(Init, 'structureStatus'); + let structureTypeData = Util.getObjVal(Init, 'structureStatus'); + + let data = { + id: config.structureDialogId, + structureData: structureData, + structureStatus: Object.keys(structureStatusData).map((k) => { + let data = structureStatusData[k]; + data.selected = data.id === Util.getObjVal(structureData, 'status.id'); + return data; + }), + statusSelectId: config.statusSelectId, + typeSelectId: config.typeSelectId, + corporationSelectId: config.corporationSelectId, + descriptionTextareaId: config.descriptionTextareaId, + descriptionTextareaCharCounter: config.descriptionTextareaCharCounter, + maxDescriptionLength: maxDescriptionLength + }; + + requirejs(['text!templates/dialog/structure.html', 'mustache'], (template, Mustache) => { + let content = Mustache.render(template, data); + + let structureDialog = bootbox.dialog({ + title: 'Structure', + message: content, + show: true, + buttons: { + close: { + label: 'cancel', + className: 'btn-default' + }, + success: { + label: ' save', + className: 'btn-success', + callback: function (){ + let form = this.find('form'); + + // validate form + form.validator('validate'); + + // check whether the form is valid + let formValid = form.isValidForm(); + + if(formValid){ + // get form data + let formData = form.getFormValues(); + formData.id = Util.getObjVal(structureData, 'id') | 0; + formData.structureId = Util.getObjVal(formData, 'structureId') | 0; + formData.corporationId = Util.getObjVal(formData, 'corporationId') | 0; + formData.systemId = systemId | 0; + + saveStructureData({ + structures: [formData] + }, { + moduleElement: moduleElement, + tableApi: tableApi + }, callbackUpdateStructureRows); + }else{ + return false; + } + } + } + } + }); + + structureDialog.on('shown.bs.modal', function(e) { + // init type select live search + let selectElementType = $(this).find('#' + config.typeSelectId); + selectElementType.initUniverseTypeSelect({ + categoryIds: [65], + maxSelectionLength: 1, + selected: [Util.getObjVal(structureData, 'structure.id')] + }); + + // init corporation select live search + let selectElementCorporation = $(this).find('#' + config.corporationSelectId); + selectElementCorporation.initUniverseSearch({ + categoryNames: ['corporation'], + maxSelectionLength: 1 + }); + + $(this).find('#' + config.statusSelectId).select2({ + minimumResultsForSearch: -1 + }); + + // init character counter + let textarea = $(this).find('#' + config.descriptionTextareaId); + let charCounter = $(this).find('.' + config.descriptionTextareaCharCounter); + Util.updateCounter(textarea, charCounter, maxDescriptionLength); + + textarea.on('keyup', function(){ + Util.updateCounter($(this), charCounter, maxDescriptionLength); + }); + + // set form validator (after select2 init finish) + $(this).find('form').initFormValidation(); + }); + + }); + }; + + /** + * show D-Scan reader dialog + * @param moduleElement + * @param tableApi + * @param systemData + */ + let showDscanReaderDialog = (moduleElement, tableApi, systemData) => { + requirejs(['text!templates/dialog/dscan_reader.html', 'mustache'], (template, Mustache) => { + let structureDialog = bootbox.dialog({ + title: 'D-Scan reader', + message: Mustache.render(template, {}), + show: true, + buttons: { + close: { + label: 'cancel', + className: 'btn-default' + }, + success: { + label: ' update intel', + className: 'btn-success', + callback: function (){ + let form = this.find('form'); + let formData = form.getFormValues(); + + updateStructureTableByClipboard(systemData, formData.clipboard, { + moduleElement: moduleElement, + tableApi: tableApi + }); + } + } + } + }); + + // dialog shown event + structureDialog.on('shown.bs.modal', function(e) { + // set focus on textarea + structureDialog.find('textarea').focus(); + }); + }); + }; + + /** + * get module element + * @param parentElement + * @param mapId + * @param systemData + * @returns {jQuery} + */ + let getModule = (parentElement, mapId, systemData) => { + let corporationId = Util.getCurrentUserInfo('corporationId'); + + // create new module container + let moduleElement = $('
').append(
+ $('
', {
+ class: config.moduleHeadClass
+ }).append(
+ $('', {
+ class: config.moduleHandlerClass
+ }),
+ $('
', {
+ class: config.moduleHandlerClass
+ }),
+ $('', {
+ class: 'pull-right'
+ }).append(
+ $('', {
+ class: ['fas', 'fa-fw', 'fa-plus', config.moduleHeadlineIconClass, config.moduleHeadlineIconAddClass].join(' '),
+ title: 'add'
+ }).attr('data-html', 'true').attr('data-toggle', 'tooltip'),
+ $('', {
+ class: ['fas', 'fa-fw', 'fa-paste', config.moduleHeadlineIconClass, config.moduleHeadlineIconReaderClass].join(' '),
+ title: 'D-Scan reader'
+ }).attr('data-html', 'true').attr('data-toggle', 'tooltip'),
+ $('', {
+ class: ['fas', 'fa-fw', 'fa-sync', config.moduleHeadlineIconClass, config.moduleHeadlineIconRefreshClass].join(' '),
+ title: 'refresh all'
+ }).attr('data-html', 'true').attr('data-toggle', 'tooltip')
+ ),
+ $('', {
+ text: 'Intel'
+ })
+ )
+ );
+
+ let table = $('
', {
+ class: ['compact', 'stripe', 'order-column', 'row-border', 'pf-table-fixed', config.systemStructuresTableClass].join(' ')
+ });
+ moduleElement.append(table);
+
+ let structureTable = table.DataTable({
+ paging: false,
+ lengthChange: false,
+ ordering: true,
+ order: [[ 10, 'desc' ], [ 0, 'asc' ]],
+ info: false,
+ searching: false,
+ hover: false,
+ autoWidth: false,
+ rowId: rowData => config.tableRowIdPrefix + rowData.id,
+ language: {
+ emptyTable: 'No structures recorded',
+ info: '_START_ to _END_ of _MAX_',
+ infoEmpty: ''
+ },
+ rowGroup: {
+ enable: true,
+ dataSrc: 'systemId'
+ },
+ columnDefs: [
+ {
+ targets: 0,
+ title: '',
+ width: 2,
+ class: 'text-center',
+ data: 'status',
+ render: {
+ display: data => getStatusData(data),
+ sort: data => data.id
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ $(cell).find('i').tooltip();
+ }
+ },{
+ targets: 1,
+ title: '',
+ width: 26,
+ orderable: false,
+ className: [config.tableCellImageClass, 'text-center'].join(' '),
+ data: 'structure.id',
+ defaultContent: '',
+ render: {
+ _: function(data, type, row, meta){
+ let value = data;
+ if(type === 'display' && value){
+ value = '
';
+ }
+ return value;
+ }
+ }
+ },{
+ targets: 2,
+ title: 'type',
+ width: 30,
+ className: [config.tableCellEllipsisClass].join(' '),
+ data: 'structure.name',
+ defaultContent: '',
+ },{
+ targets: 3,
+ title: 'name',
+ width: 60,
+ className: [config.tableCellEllipsisClass].join(' '),
+ data: 'name'
+ },{
+ targets: 4,
+ title: '',
+ width: 26,
+ orderable: false,
+ className: [config.tableCellImageClass, 'text-center'].join(' '),
+ data: 'owner.id',
+ defaultContent: '',
+ render: {
+ _: function(data, type, row, meta){
+ let value = data;
+ if(type === 'display' && value){
+ value = '
';
+ }
+ return value;
+ }
+ }
+ },{
+ targets: 5,
+ title: 'owner',
+ width: 50,
+ className: [config.tableCellEllipsisClass].join(' '),
+ data: 'owner.name',
+ defaultContent: '',
+ },{
+ targets: 6,
+ title: 'note',
+ className: [config.tableCellEllipsisClass].join(' '),
+ data: 'description'
+ },{
+ targets: 7,
+ title: 'updated',
+ width: 80,
+ className: ['text-right', config.tableCellCounterClass].join(' '),
+ data: 'updated.updated'
+ },{
+ targets: 8,
+ title: '',
+ orderable: false,
+ width: 10,
+ class: ['text-center', config.dataTableActionCellClass, config.moduleHeadlineIconClass].join(' '),
+ data: null,
+ render: {
+ display: data => {
+ let icon = '';
+ if(data.corporation.id !== corporationId){
+ icon = '';
+ }
+ return icon;
+ }
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ let tableApi = this.api();
+
+ if($(cell).is(':empty')){
+ $(cell).removeClass(config.dataTableActionCellClass + ' ' + config.moduleHeadlineIconClass);
+ }else{
+ $(cell).on('click', function(e) {
+ // get current row data (important!)
+ // -> "rowData" param is not current state, values are "on createCell()" state
+ rowData = tableApi.row( $(cell).parents('tr')).data();
+ showStructureDialog(moduleElement, tableApi, systemData.systemId, rowData);
+ });
+ }
+ }
+ },{
+ targets: 9,
+ title: '',
+ orderable: false,
+ width: 10,
+ class: ['text-center', config.dataTableActionCellClass].join(' '),
+ data: null,
+ render: {
+ display: data => {
+ let icon = '';
+ if(data.corporation.id !== corporationId){
+ icon = '';
+ }
+ return icon;
+ }
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ let tableApi = this.api();
+
+ if($(cell).find('.fa-ban').length){
+ $(cell).removeClass(config.dataTableActionCellClass + ' ' + config.moduleHeadlineIconClass);
+ $(cell).find('i').tooltip();
+ }else{
+ let confirmationSettings = {
+ container: 'body',
+ placement: 'left',
+ btnCancelClass: 'btn btn-sm btn-default',
+ btnCancelLabel: 'cancel',
+ btnCancelIcon: 'fas fa-fw fa-ban',
+ title: 'delete structure',
+ btnOkClass: 'btn btn-sm btn-danger',
+ btnOkLabel: 'delete',
+ btnOkIcon: 'fas fa-fw fa-times',
+ onConfirm : function(e, target){
+ // get current row data (important!)
+ // -> "rowData" param is not current state, values are "on createCell()" state
+ rowData = tableApi.row( $(cell).parents('tr')).data();
+
+ // let deleteRowElement = $(cell).parents('tr');
+ // tableApi.rows(deleteRowElement).remove().draw();
+ deleteStructure({
+ id: rowData.id
+ },{
+ moduleElement: moduleElement,
+ tableApi: tableApi
+ }, callbackDeleteStructures);
+ }
+ };
+
+ // init confirmation dialog
+ $(cell).confirmation(confirmationSettings);
+ }
+ }
+ },{
+ targets: 10,
+ name: 'corporation',
+ data: 'corporation',
+ visible: false,
+ render: {
+ sort: function(data){
+ return data.name;
+ }
+ }
+ }
+ ],
+ drawCallback: function (settings){
+ let tableApi = this.api();
+ let columnCount = tableApi.columns(':visible').count();
+ let rows = tableApi.rows( {page:'current'} ).nodes();
+ let last= null;
+
+ tableApi.column('corporation:name', {page:'current'} ).data().each( function ( group, i ) {
+ if ( !last || last.id !== group.id ) {
+ $(rows).eq(i).before(
+ '' +
+ '' +
+ '
' +
+ ' ' +
+ '' + group.name + ' ' +
+ ' '
+ );
+ last = group;
+ }
+ });
+
+ rows.to$().find('.' + config.tableCellCounterClass + ':not([data-counter])').initTimestampCounter();
+
+ let animationRows = rows.to$().filter(function() {
+ return (
+ $(this).data('animationStatus') ||
+ $(this).data('animationTimer')
+ );
+ });
+
+ for(let i = 0; i < animationRows.length; i++){
+ let animationRow = $(animationRows[i]);
+ animationRow.pulseTableRow(animationRow.data('animationStatus'));
+ animationRow.removeData('animationStatus');
+ }
+ },
+ initComplete: function(settings){
+ let tableApi = this.api();
+
+ // initial structure data request
+ getStructureData({
+ mapId: mapId,
+ systemId: systemData.id
+ },{
+ moduleElement: moduleElement,
+ tableApi: tableApi
+ }, callbackAddStructureRows);
+ }
+ });
+
+ // init tooltips for this module
+ let tooltipElements = moduleElement.find('[data-toggle="tooltip"]');
+ tooltipElements.tooltip({
+ container: 'body'
+ });
+
+ return moduleElement;
+ };
+
+ /**
+ * get universe typeIds for given categoryIds
+ * @param categoryIds
+ * @returns {Array}
+ */
+ let getUniverseTypeIdsByCategoryIds = (categoryIds) => {
+ let typeIds = [];
+ let mapIds = type => type.id;
+ for(let categoryId of categoryIds){
+ let categoryData = Util.getObjVal(Init, 'universeCategories.' + categoryId);
+ if(categoryData && categoryData.groups){
+ for(let groupData of categoryData.groups){
+ if(groupData && groupData.types){
+ typeIds = typeIds.concat(groupData.types.map(mapIds));
+ }
+ }
+ }
+ }
+
+ return typeIds;
+ };
+
+ /**
+ * parse a copy&paste string from ingame dScan windows
+ * @param systemData
+ * @param clipboard
+ * @returns {Array}
+ */
+ let parseDscanString = (systemData, clipboard) => {
+ let dScanData = [];
+ let structureTypeIds = getUniverseTypeIdsByCategoryIds([65]);
+
+ if(clipboard.length){
+ let dScanRows = clipboard.split(/\r\n|\r|\n/g);
+
+ for(let rowData of dScanRows){
+ rowData = rowData.split(/\t/g);
+
+ if(rowData.length === 4){
+ rowData[0] = parseInt(rowData[0]);
+ // valid dScan result
+ if(structureTypeIds.indexOf( rowData[0] ) !== -1){
+ dScanData.push({
+ structureId: rowData[0],
+ name: rowData[1],
+ systemId: systemData.systemId
+ });
+ }
+ }
+ }
+ }
+
+ return dScanData;
+ };
+
+ /**
+ * parse clipboard data for structures and update table
+ * @param systemData
+ * @param clipboard
+ * @param context
+ */
+ let updateStructureTableByClipboard = (systemData, clipboard, context) => {
+ let structureData = parseDscanString(systemData, clipboard);
+ if(structureData.length){
+ saveStructureData({
+ structures: structureData
+ }, context, callbackUpdateStructureRows);
+ }
+ };
+
+ /**
+ * init intel module
+ * @param moduleElement
+ * @param mapId
+ * @param systemData
+ */
+ let initModule = (moduleElement, mapId, systemData) => {
+
+ let structureTableElement = moduleElement.find('.' + config.systemStructuresTableClass);
+ let tableApi = structureTableElement.DataTable();
+
+ // init structure dialog --------------------------------------------------------------------------------------
+ moduleElement.find('.' + config.moduleHeadlineIconAddClass).on('click', function(e){
+ showStructureDialog(moduleElement, tableApi, systemData.systemId);
+ });
+
+ // init structure dialog --------------------------------------------------------------------------------------
+ moduleElement.find('.' + config.moduleHeadlineIconReaderClass).on('click', function(e){
+ showDscanReaderDialog(moduleElement, tableApi, systemData);
+ });
+
+ // init refresh button ----------------------------------------------------------------------------------------
+ moduleElement.find('.' + config.moduleHeadlineIconRefreshClass).on('click', function(e){
+ getStructureData({
+ mapId: mapId,
+ systemId: systemData.id
+ },{
+ moduleElement: moduleElement,
+ tableApi: tableApi,
+ removeMissing: true
+ }, callbackAddStructureRows);
+ });
+
+ // init listener for global "past" dScan into this page -------------------------------------------------------
+ moduleElement.on('pf:updateIntelModuleByClipboard', function(e, clipboard){
+ updateStructureTableByClipboard(systemData, clipboard, {
+ moduleElement: moduleElement,
+ tableApi: tableApi
+ });
+ });
+ };
+
+ return {
+ config: config,
+ getModule: getModule,
+ initModule: initModule
+ };
+
+});
\ No newline at end of file
diff --git a/js/app/ui/system_killboard.js b/js/app/ui/system_killboard.js
index b4cb4c0b..2a949d8c 100644
--- a/js/app/ui/system_killboard.js
+++ b/js/app/ui/system_killboard.js
@@ -3,7 +3,7 @@ define([
'app/init',
'app/util',
'morris'
-], function($, Init, Util, Morris) {
+], ($, Init, Util, Morris) => {
'use strict';
let config = {
@@ -38,7 +38,7 @@ define([
* @param options
* @returns {jQuery}
*/
- let getLabel = function(text, options){
+ let getLabel = (text, options) => {
let label = $('', {
class: ['label', options.type, options.align].join(' ')
}).text( text );
@@ -46,7 +46,12 @@ define([
return label;
};
- let showKillmails = function(moduleElement, killboardData){
+ /**
+ * show killMails
+ * @param moduleElement
+ * @param killboardData
+ */
+ let showKillmails = (moduleElement, killboardData) => {
// show number of killMails
let killMailCounterMax = 20;
@@ -384,7 +389,7 @@ define([
* minify the killboard graph element e.g. if no kills where found, or on error
* @param killboardGraphElement
*/
- let minifyKillboardGraphElement = function(killboardGraphElement){
+ let minifyKillboardGraphElement = (killboardGraphElement) => {
killboardGraphElement.velocity({
height: '20px',
marginBottom: '0px'
@@ -433,8 +438,9 @@ define([
/**
* get module element
* @param parentElement
+ * @param mapId
* @param systemData
- * @returns {*|jQuery|HTMLElement}
+ * @returns {jQuery}
*/
let getModule = (parentElement, mapId, systemData) => {
// create new module container
diff --git a/js/app/ui/system_route.js b/js/app/ui/system_route.js
index 391cad2a..3e779960 100644
--- a/js/app/ui/system_route.js
+++ b/js/app/ui/system_route.js
@@ -8,7 +8,7 @@ define([
'app/util',
'bootbox',
'app/map/util'
-], function($, Init, Util, bootbox, MapUtil) {
+], ($, Init, Util, bootbox, MapUtil) => {
'use strict';
let config = {
@@ -92,10 +92,15 @@ define([
* get a unique cache key name for "source"/"target"-name
* @param sourceName
* @param targetName
- * @returns {string}
+ * @returns {*}
*/
let getConnectionDataCacheKey = (sourceName, targetName) => {
- return [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
+ let key = false;
+ if(sourceName && targetName){
+ // names can be "undefined" in case system is currently on drag/drop
+ key = [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
+ }
+ return key;
};
/**
@@ -103,7 +108,7 @@ define([
* @param context
* @param routesData
*/
- let callbackAddRouteRow = (context, routesData) => {
+ let callbackAddRouteRows = (context, routesData) => {
if(routesData.length > 0){
for(let i = 0; i < routesData.length; i++){
@@ -170,7 +175,6 @@ define([
return rowElement;
};
-
/**
* requests route data from eveCentral API and execute callback
* @param requestData
@@ -210,7 +214,7 @@ define([
routeData.push( getRouteRequestDataFromRowData( this.data() ));
});
- getRouteData({routeData: routeData}, context, callbackAddRouteRow);
+ getRouteData({routeData: routeData}, context, callbackAddRouteRows);
};
/**
@@ -261,7 +265,7 @@ define([
mapSelectOptions: mapSelectOptions
};
- requirejs(['text!templates/dialog/route.html', 'mustache'], function(template, Mustache) {
+ requirejs(['text!templates/dialog/route.html', 'mustache'], (template, Mustache) => {
let content = Mustache.render(template, data);
@@ -326,7 +330,7 @@ define([
}]
};
- getRouteData(requestData, context, callbackAddRouteRow);
+ getRouteData(requestData, context, callbackAddRouteRows);
}
}
}
@@ -418,7 +422,7 @@ define([
routeData: requestRouteData
};
- getRouteData(requestData, contextData, callbackAddRouteRow);
+ getRouteData(requestData, contextData, callbackAddRouteRows);
}
};
@@ -432,7 +436,7 @@ define([
let showSettingsDialog = (dialogData, moduleElement, systemFromData, routesTable) => {
let promiseStore = MapUtil.getLocaleData('map', dialogData.mapId);
- promiseStore.then(function(dataStore) {
+ promiseStore.then(dataStore => {
// selected systems (if already stored)
let systemSelectOptions = [];
if(
@@ -902,7 +906,6 @@ define([
)
);
- // crate new route table
let table = $('', {
class: ['compact', 'stripe', 'order-column', 'row-border', config.systemInfoRoutesTableClass].join(' ')
});
@@ -919,7 +922,7 @@ define([
autoWidth: false,
rowId: 'systemTo',
language: {
- emptyTable: 'No routes added'
+ emptyTable: 'No routes added'
},
columnDefs: [
{
@@ -1039,7 +1042,7 @@ define([
routeData: [routeData]
};
- getRouteData(requestData, context, callbackAddRouteRow);
+ getRouteData(requestData, context, callbackAddRouteRows);
});
}
},{
@@ -1074,7 +1077,7 @@ define([
routeData: [routeData]
};
- getRouteData(requestData, context, callbackAddRouteRow);
+ getRouteData(requestData, context, callbackAddRouteRows);
});
}
},{
@@ -1122,10 +1125,10 @@ define([
});
for(let i = 0; i < animationRows.length; i++){
- $(animationRows[i]).pulseTableRow($(animationRows[i]).data('animationStatus'));
- $(animationRows[i]).removeData('animationStatus');
+ let animationRow = $(animationRows[i]);
+ animationRow.pulseTableRow(animationRow.data('animationStatus'));
+ animationRow.removeData('animationStatus');
}
-
},
initComplete: function(settings, json){
// click on "fake connection" -------------------------------------------------------------------------
@@ -1231,7 +1234,6 @@ define([
};
let routesTableElement = moduleElement.find('.' + config.systemInfoRoutesTableClass);
-
let routesTable = routesTableElement.DataTable();
// init refresh routes --------------------------------------------------------------------
diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js
index 9b55d8d6..a6506bd5 100644
--- a/js/app/ui/system_signature.js
+++ b/js/app/ui/system_signature.js
@@ -23,15 +23,12 @@ define([
moduleClass: 'pf-module', // class for each module
// system signature module
- moduleTypeClass: 'pf-sig-table-module', // module wrapper
+ moduleTypeClass: 'pf-signature-table-module', // module wrapper
// tables
tableToolsClass: 'pf-table-tools', // class for table toolbar
tableToolsActionClass: 'pf-table-tools-action', // class for table toolbar action
- // dialogs
- signatureReaderDialogId: 'pf-signature-reader-dialog', // id for signature reader dialog
-
// signature progress bar
signatureScannedProgressBarClass: 'pf-system-progress-scanned', // class for signature progress bar
@@ -340,10 +337,11 @@ define([
// and add "new" row
let changedRowElement = addSignatureRow(signatureTableApi, currentSystemData.systemData, signatureData[i], false);
- // highlight
- changedRowElement.pulseTableRow('changed');
-
- notificationCounter.changed++;
+ if(changedRowElement){
+ // highlight
+ changedRowElement.pulseTableRow('changed');
+ notificationCounter.changed++;
+ }
}
// remove signature data -> all left signatures will be added
@@ -383,13 +381,13 @@ define([
// and add "new" row
let newRowElement = addSignatureRow(signatureTableApi, currentSystemData.systemData, signatureData[k], false);
- // highlight
- newRowElement.pulseTableRow('added');
-
- notificationCounter.added++;
+ if(newRowElement){
+ // highlight
+ newRowElement.pulseTableRow('added');
+ notificationCounter.added++;
+ }
}
-
// show notification ------------------------------------------------------------------------------------------
if(
notificationCounter.added > 0 ||
@@ -399,9 +397,8 @@ define([
// update signature bar
moduleElement.updateScannedSignaturesBar({showNotice: true});
- // show Notification
let notification = notificationCounter.added + ' added
';
- notification += notificationCounter.changed + ' changed
';
+ notification += notificationCounter.changed + ' updated
';
notification += notificationCounter.deleted + ' deleted
';
Util.showNotify({title: 'Signatures updated', text: notification, type: 'success'});
@@ -499,7 +496,6 @@ define([
Util.showNotify({title: 'System is scanned', text: notification, type: 'success'});
}
}
-
}, 100);
};
@@ -508,36 +504,23 @@ define([
* @param systemData
*/
$.fn.showSignatureReaderDialog = function(systemData){
-
let moduleElement = $(this);
- let data = {
- id: config.signatureReaderDialogId
- };
-
- requirejs(['text!templates/dialog/signature_reader.html', 'mustache'], function(template, Mustache) {
-
- let content = Mustache.render(template, data);
-
+ requirejs(['text!templates/dialog/signature_reader.html', 'mustache'], (template, Mustache) => {
let signatureReaderDialog = bootbox.dialog({
title: 'Signature reader',
- message: content,
+ message: Mustache.render(template, {}),
buttons: {
close: {
label: 'cancel',
- className: 'btn-default',
- callback: function(){
- $(signatureReaderDialog).modal('hide');
- }
+ className: 'btn-default'
},
success: {
label: ' update signatures',
className: 'btn-success',
callback: function () {
- // get form Values
- let form = $('#' + config.signatureReaderDialogId).find('form');
- let formData = $(form).getFormValues();
-
+ let form = this.find('form');
+ let formData = form.getFormValues();
let signatureOptions = {
deleteOld: (formData.deleteOld) ? 1 : 0
};
@@ -554,8 +537,6 @@ define([
// set focus on sig-input textarea
signatureReaderDialog.find('textarea').focus();
});
-
-
});
};
@@ -607,10 +588,8 @@ define([
// check if copy&paste is enabled
if( !disableCopyFromClipboard ){
-
// parse input stream
let signatureData = parseSignatureString(systemData, clipboard);
-
if(signatureData.length > 0){
// valid signature data parsed
@@ -641,7 +620,7 @@ define([
};
/**
- * parses a copy&paste string from ingame scanning window and parses it
+ * parses a copy&paste string from ingame scanning window
* @param systemData
* @param clipboard
* @returns {Array}
@@ -656,9 +635,7 @@ define([
for(let i = 0; i < signatureRows.length; i++){
let rowData = signatureRows[i].split(/\t/g);
-
if(rowData.length === 6){
-
// check if sig Type = anomaly or combat site
if(validSignatureNames.indexOf( rowData[1] ) !== -1){
@@ -702,8 +679,6 @@ define([
}else{
invalidSignatures++;
}
- }else{
- invalidSignatures++;
}
}
@@ -875,7 +850,7 @@ define([
* @param options
* @returns {*|jQuery}
*/
- let getLabledButton = function(options){
+ let getLabeledButton = function(options){
let buttonClasses = ['btn', 'btn-sm', 'btn-labeled'];
@@ -1002,7 +977,7 @@ define([
let tableToolbar = $('', {
class: config.tableToolsClass
}).append(
- getLabledButton({
+ getLabeledButton({
type: 'primary',
label: 'add',
icon: 'fa-plus',
@@ -1026,7 +1001,7 @@ define([
}
})
).append(
- getLabledButton({
+ getLabeledButton({
type: 'primary',
label: 'signature reader',
icon: 'fa-paste',
@@ -1035,7 +1010,7 @@ define([
}
})
).append(
- getLabledButton({
+ getLabeledButton({
type: 'default',
label: 'select all',
icon: 'fa-check-square',
@@ -1063,7 +1038,7 @@ define([
value: 1,
}).attr('data-toggle', 'toggle')
).append(
- getLabledButton({
+ getLabeledButton({
type: 'danger',
classes: [config.sigTableClearButtonClass, 'pull-right'],
label: 'delete',
@@ -1812,7 +1787,7 @@ define([
// update connection conflicts
checkConnectionConflicts();
- Util.showNotify({title: 'Signature deleted', text: signatureCount + ' signatures deleted', type: 'success'});
+ Util.showNotify({title: 'Signature deleted', text: signatureCount + ' deleted', type: 'success'});
}
};
@@ -1843,25 +1818,25 @@ define([
* @param animate
* @returns {*}
*/
- let addSignatureRow = function(signatureTableApi, systemData, signatureData, animate){
- let newSignatureData = formatSignatureData(systemData, [signatureData], fullSignatureOptions);
+ let addSignatureRow = (signatureTableApi, systemData, signatureData, animate) => {
+ let newRowElement = null;
+ if(signatureTableApi){
+ let newSignatureData = formatSignatureData(systemData, [signatureData], fullSignatureOptions);
+ let newRowNode = signatureTableApi.row.add(newSignatureData.shift()).draw().nodes();
+ newRowElement = newRowNode.to$();
- let newRowNode = signatureTableApi.row.add(newSignatureData.shift()).draw().nodes();
- let newRowElement = newRowNode.to$();
-
- if(animate === true){
- newRowElement.hide();
-
- newRowElement.toggleTableRow(function(newRowElement){
- // make new row editable
+ if(animate === true){
+ newRowElement.hide();
+ newRowElement.toggleTableRow(newRowElement => {
+ // make new row editable
+ newRowElement.makeEditable(signatureTableApi, systemData);
+ // update scan progress bar
+ newRowElement.parents('.' + config.moduleClass).updateScannedSignaturesBar({showNotice: true});
+ });
+ }else{
newRowElement.makeEditable(signatureTableApi, systemData);
-
- // update scan progress bar
- newRowElement.parents('.' + config.moduleClass).updateScannedSignaturesBar({showNotice: true});
- });
- }else{
- newRowElement.makeEditable(signatureTableApi, systemData);
+ }
}
return newRowElement;
@@ -2270,20 +2245,22 @@ define([
let newRowElement = addSignatureRow(primaryTableApi, systemData, data.signatures[0], true);
- // highlight
- newRowElement.pulseTableRow('added');
+ if(newRowElement){
+ // highlight
+ newRowElement.pulseTableRow('added');
- // prepare "add signature" table for new entry -> reset -------------------
- let signatureData = formatSignatureData(systemData, [emptySignatureData], emptySignatureOptions);
- let newAddRowElement = secondaryTableApi.clear().row.add(signatureData.shift()).draw().nodes();
+ // prepare "add signature" table for new entry -> reset -------------------
+ let signatureData = formatSignatureData(systemData, [emptySignatureData], emptySignatureOptions);
+ let newAddRowElement = secondaryTableApi.clear().row.add(signatureData.shift()).draw().nodes();
- newAddRowElement.to$().makeEditable(secondaryTableApi, systemData);
+ newAddRowElement.to$().makeEditable(secondaryTableApi, systemData);
- Util.showNotify({
- title: 'Signature added',
- text: 'Name: ' + data.name,
- type: 'success'
- });
+ Util.showNotify({
+ title: 'Signature added',
+ text: 'Name: ' + data.name,
+ type: 'success'
+ });
+ }
}
});
});
diff --git a/js/app/util.js b/js/app/util.js
index b61764c7..83f8894d 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -15,7 +15,8 @@ define([
'easyPieChart',
'hoverIntent',
'bootstrapConfirmation',
- 'bootstrapToggle'
+ 'bootstrapToggle',
+ 'select2'
], ($, Init, SystemEffect, SignatureType, bootbox, localforage) => {
'use strict';
@@ -55,14 +56,19 @@ define([
mapWrapperClass: 'pf-map-wrapper', // wrapper div (scrollable)
mapClass: 'pf-map' , // class for all maps
+ // select2
+ select2Class: 'pf-select2', // class for all "Select2"
', { + text: 'Intel' + }) + ) + ); + + let table = $('
| ' + + ' | ' +
+ '' +
+ ' | ' +
+ '' + group.name + ' | ' + + '