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

- switched "system search" Ajax endpoint data source from _SDE_ DB to new _eve_universe_ DB, closed #644

Browse Source
This commit is contained in:
Mark Friedrich
2018-06-23 16:30:38 +02:00
parent ae04715465
commit dacd8751a1
5 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,16 +317,16 @@ define([
mapIds: routeDialogData.mapIds,
systemFromData: dialogData.systemFromData,
systemToData: {
systemId: systemSelectData[0].systemId,
systemId: parseInt(systemSelectData[0].id),
name: systemSelectData[0].text
},
stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt( routeDialogData.wormholesFrigate ) : 0,
wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt(routeDialogData.stargates) : 0,
jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt(routeDialogData.jumpbridges) : 0,
wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt(routeDialogData.wormholes) : 0,
wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt(routeDialogData.wormholesReduced) : 0,
wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt(routeDialogData.wormholesCritical) : 0,
wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt(routeDialogData.wormholesFrigate) : 0,
wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt(routeDialogData.wormholesEOL) : 0
}]
};
@@ -354,7 +354,7 @@ define([
// init system select live search ------------------------------------------------
// -> add some delay until modal transition has finished
let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
systemTargetSelect.delay(240).initSystemSelect({key: 'id'});
});
// show dialog
@@ -498,7 +498,7 @@ define([
// init default system select -----------------------------------------------------
// -> add some delay until modal transition has finished
let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
systemTargetSelect.delay(240).initSystemSelect({key: 'name', maxSelectionLength: maxSelectionLength});
systemTargetSelect.delay(240).initSystemSelect({key: 'id', maxSelectionLength: maxSelectionLength});
});
// show dialog
@@ -518,8 +518,8 @@ define([
let tmpData = data[i];
formattedData.push({
name: tmpData.id,
systemId: parseInt( tmpData.hasOwnProperty('systemId') ? tmpData.systemId : tmpData.element.getAttribute('data-systemid') )
systemId: parseInt(tmpData.id),
name: tmpData.text
});
}

3
public/js/v1.3.6/app/map/map.js
View File

@@ -1560,8 +1560,7 @@ define([
let form = $('#' + config.systemDialogId).find('form');
let systemDialogData = $(form).getFormValues();
console.log(systemDialogData);
return false;
// validate form
form.validator('validate');

24
public/js/v1.3.6/app/ui/system_route.js
View File

@@ -317,16 +317,16 @@ define([
mapIds: routeDialogData.mapIds,
systemFromData: dialogData.systemFromData,
systemToData: {
systemId: systemSelectData[0].systemId,
systemId: parseInt(systemSelectData[0].id),
name: systemSelectData[0].text
},
stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt( routeDialogData.wormholesFrigate ) : 0,
wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt(routeDialogData.stargates) : 0,
jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt(routeDialogData.jumpbridges) : 0,
wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt(routeDialogData.wormholes) : 0,
wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt(routeDialogData.wormholesReduced) : 0,
wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt(routeDialogData.wormholesCritical) : 0,
wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt(routeDialogData.wormholesFrigate) : 0,
wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt(routeDialogData.wormholesEOL) : 0
}]
};
@@ -354,7 +354,7 @@ define([
// init system select live search ------------------------------------------------
// -> add some delay until modal transition has finished
let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
systemTargetSelect.delay(240).initSystemSelect({key: 'id'});
});
// show dialog
@@ -498,7 +498,7 @@ define([
// init default system select -----------------------------------------------------
// -> add some delay until modal transition has finished
let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
systemTargetSelect.delay(240).initSystemSelect({key: 'name', maxSelectionLength: maxSelectionLength});
systemTargetSelect.delay(240).initSystemSelect({key: 'id', maxSelectionLength: maxSelectionLength});
});
// show dialog
@@ -518,8 +518,8 @@ define([
let tmpData = data[i];
formattedData.push({
name: tmpData.id,
systemId: parseInt( tmpData.hasOwnProperty('systemId') ? tmpData.systemId : tmpData.element.getAttribute('data-systemid') )
systemId: parseInt(tmpData.id),
name: tmpData.text
});
}

10
public/templates/dialog/route.html
View File

@@ -18,11 +18,11 @@
<div class="col-sm-7">
<div class="form-group">
<label class="col-sm-1 col-xs-2 control-label" for="to_system">To</label>
<div class="col-sm-11 col-xs-10">
<label class="col-sm-2 col-xs-2 control-label" for="to_system">To</label>
<div class="col-sm-10 col-xs-10">
<div class="input-group">
<select id="to_system" name="systemToData" class="form-control {{selectClass}}" data-error="Choose a valid system" required/>
<span class="help-block with-errors">Search system name</span>
<span class="help-block with-errors"></span>
</div>
</div>
</div>
@@ -34,7 +34,7 @@
<h4 class="pf-dynamic-area">Search options</h4>
<div class="row">
<div class="col-sm-4">
<div class="col-sm-5">
<div class="form-group">
<div class="col-sm-offset-1 col-sm-11">
<div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include stargate connections">
@@ -50,7 +50,7 @@
</div>
</div>
<div class="col-sm-8">
<div class="col-sm-7">
<div class="form-group">
<label class="col-sm-2 control-label" for="{{mapSelectId}}">Maps</label>
<div class="col-sm-10">

2
public/templates/dialog/route_settings.html
View File

@@ -10,7 +10,7 @@
<label for="form_system"></label>
<select id="form_system" name="routeSystems[]" class="{{selectClass}}" multiple="multiple">
{{#systemSelectOptions}}
<option value="{{name}}" data-systemid="{{systemId}}" selected="selected">{{name}}</option>
<option value="{{systemId}}" selected="selected">{{name}}</option>
{{/systemSelectOptions}}
</select>
<span class="help-block with-errors">Set default systems (max {{maxSelectionLength}}) for route search</span>