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

- New map option for disabling "Abyss" jump tracking, closed #722

Browse Source
This commit is contained in:
Mark Friedrich
2019-10-02 19:09:13 +02:00
parent 1de67f8dbf
commit 3f724f66ce
5 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/controller/api/map.php
View File

@@ -1068,6 +1068,24 @@ class Map extends Controller\AccessController {
break;
}
// check for "abyss" systems =====================================================================
if(!$map->trackAbyssalJumps){
if(
$sourceSystem->isAbyss() ||
$targetSystem->isAbyss()
){
$addConnection = false;
if($sourceSystem->isAbyss()){
$addSourceSystem = false;
}
if($targetSystem->isAbyss()){
$addTargetSystem = false;
}
}
}
// save source system =============================================================================
if(
$addSourceSystem &&

7
app/main/model/pathfinder/mapmodel.php
View File

@@ -98,6 +98,12 @@ class MapModel extends AbstractMapTrackingModel {
'default' => 1,
'activity-log' => true
],
'trackAbyssalJumps' => [
'type' => Schema::DT_BOOL,
'nullable' => false,
'default' => 1,
'activity-log' => true
],
'logActivity' => [
'type' => Schema::DT_BOOL,
'nullable' => false,
@@ -223,6 +229,7 @@ class MapModel extends AbstractMapTrackingModel {
$mapData->deleteEolConnections = $this->deleteEolConnections;
$mapData->persistentAliases = $this->persistentAliases;
$mapData->persistentSignatures = $this->persistentSignatures;
$mapData->trackAbyssalJumps = $this->trackAbyssalJumps;
// map scope
$mapData->scope = (object) [];

8
js/app/ui/dialog/map_settings.js
View File

@@ -36,6 +36,7 @@ define([
deleteEolConnectionsId: 'pf-map-dialog-delete-connections-eol', // id for "deleteEOLConnections" checkbox
persistentAliasesId: 'pf-map-dialog-persistent-aliases', // id for "persistentAliases" checkbox
persistentSignaturesId: 'pf-map-dialog-persistent-signatures', // id for "persistentSignatures" checkbox
trackAbyssalJumpsId: 'pf-map-dialog-track-abyss-jumps', // id for "trackAbyssalJumps" checkbox
logHistoryId: 'pf-map-dialog-history', // id for "history logging" checkbox
logActivityId: 'pf-map-dialog-activity', // id for "activity" checkbox
@@ -159,6 +160,7 @@ define([
let deleteEolConnections = true;
let persistentAliases = true;
let persistentSignatures = true;
let trackAbyssalJumps = true;
let logActivity = true;
let logHistory = true;
@@ -197,6 +199,7 @@ define([
deleteEolConnections = mapData.config.deleteEolConnections;
persistentAliases = mapData.config.persistentAliases;
persistentSignatures = mapData.config.persistentSignatures;
trackAbyssalJumps = mapData.config.trackAbyssalJumps;
logActivity = mapData.config.logging.activity;
logHistory = mapData.config.logging.history;
@@ -255,10 +258,12 @@ define([
deleteEolConnectionsId : config.deleteEolConnectionsId,
persistentAliasesId : config.persistentAliasesId,
persistentSignaturesId : config.persistentSignaturesId,
trackAbyssalJumpsId : config.trackAbyssalJumpsId,
deleteExpiredConnections: deleteExpiredConnections,
deleteEolConnections: deleteEolConnections,
persistentAliases: persistentAliases,
persistentSignatures: persistentSignatures,
trackAbyssalJumps: trackAbyssalJumps,
logHistoryId: config.logHistoryId,
logActivityId: config.logActivityId,
@@ -398,6 +403,9 @@ define([
if( form.find('#' + config.persistentSignaturesId).length ){
formData.persistentSignatures = formData.hasOwnProperty('persistentSignatures') ? parseInt( formData.persistentSignatures ) : 0;
}
if( form.find('#' + config.trackAbyssalJumpsId).length ){
formData.trackAbyssalJumps = formData.hasOwnProperty('trackAbyssalJumps') ? parseInt( formData.trackAbyssalJumps ) : 0;
}
if( form.find('#' + config.logHistoryId).length ){
formData.logHistory = formData.hasOwnProperty('logHistory') ? parseInt( formData.logHistory ) : 0;
}

8
public/js/v1.5.4/app/ui/dialog/map_settings.js
View File

@@ -36,6 +36,7 @@ define([
deleteEolConnectionsId: 'pf-map-dialog-delete-connections-eol', // id for "deleteEOLConnections" checkbox
persistentAliasesId: 'pf-map-dialog-persistent-aliases', // id for "persistentAliases" checkbox
persistentSignaturesId: 'pf-map-dialog-persistent-signatures', // id for "persistentSignatures" checkbox
trackAbyssalJumpsId: 'pf-map-dialog-track-abyss-jumps', // id for "trackAbyssalJumps" checkbox
logHistoryId: 'pf-map-dialog-history', // id for "history logging" checkbox
logActivityId: 'pf-map-dialog-activity', // id for "activity" checkbox
@@ -159,6 +160,7 @@ define([
let deleteEolConnections = true;
let persistentAliases = true;
let persistentSignatures = true;
let trackAbyssalJumps = true;
let logActivity = true;
let logHistory = true;
@@ -197,6 +199,7 @@ define([
deleteEolConnections = mapData.config.deleteEolConnections;
persistentAliases = mapData.config.persistentAliases;
persistentSignatures = mapData.config.persistentSignatures;
trackAbyssalJumps = mapData.config.trackAbyssalJumps;
logActivity = mapData.config.logging.activity;
logHistory = mapData.config.logging.history;
@@ -255,10 +258,12 @@ define([
deleteEolConnectionsId : config.deleteEolConnectionsId,
persistentAliasesId : config.persistentAliasesId,
persistentSignaturesId : config.persistentSignaturesId,
trackAbyssalJumpsId : config.trackAbyssalJumpsId,
deleteExpiredConnections: deleteExpiredConnections,
deleteEolConnections: deleteEolConnections,
persistentAliases: persistentAliases,
persistentSignatures: persistentSignatures,
trackAbyssalJumps: trackAbyssalJumps,
logHistoryId: config.logHistoryId,
logActivityId: config.logActivityId,
@@ -398,6 +403,9 @@ define([
if( form.find('#' + config.persistentSignaturesId).length ){
formData.persistentSignatures = formData.hasOwnProperty('persistentSignatures') ? parseInt( formData.persistentSignatures ) : 0;
}
if( form.find('#' + config.trackAbyssalJumpsId).length ){
formData.trackAbyssalJumps = formData.hasOwnProperty('trackAbyssalJumps') ? parseInt( formData.trackAbyssalJumps ) : 0;
}
if( form.find('#' + config.logHistoryId).length ){
formData.logHistory = formData.hasOwnProperty('logHistory') ? parseInt( formData.logHistory ) : 0;
}

27
public/templates/dialog/map.html
View File

@@ -44,10 +44,10 @@
<form role="form" class="form-horizontal">
<div class="row">
<div class="col-xs-12 col-sm-6">
<div class="col-xs-12 col-sm-12 col-md-8">
<h4 class="pf-dynamic-area">Map options</h4>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="form-group">
<div class="col-xs-12 col-sm-12 checkbox">
<input id="{{deleteExpiredConnectionsId}}" name="deleteExpiredConnections" value="1" type="checkbox" {{#deleteExpiredConnections}}checked{{/deleteExpiredConnections}}>
@@ -58,7 +58,7 @@
</div>
</div>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="form-group">
<div class="col-xs-12 col-sm-12 checkbox" >
<input id="{{deleteEolConnectionsId}}" name="deleteEolConnections" value="1" type="checkbox" {{#deleteEolConnections}}checked{{/deleteEolConnections}}>
@@ -69,7 +69,7 @@
</div>
</div>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="form-group">
<div class="col-xs-12 col-sm-12 checkbox">
<input id="{{persistentAliasesId}}" name="persistentAliases" value="1" type="checkbox" {{#persistentAliases}}checked{{/persistentAliases}}>
@@ -80,7 +80,7 @@
</div>
</div>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="form-group">
<div class="col-xs-12 col-sm-12 checkbox">
<input id="{{persistentSignaturesId}}" name="persistentSignatures" value="1" type="checkbox" {{#persistentSignatures}}checked{{/persistentSignatures}}>
@@ -90,14 +90,25 @@
</div>
</div>
</div>
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="form-group">
<div class="col-xs-12 col-sm-12 checkbox">
<input id="{{trackAbyssalJumpsId}}" name="trackAbyssalJumps" value="1" type="checkbox" {{#trackAbyssalJumps}}checked{{/trackAbyssalJumps}}>
<label for="{{trackAbyssalJumpsId}}">Track "Abyssal" connections
<i class="fas fa-fw fa-question-circle pf-help-light" title="Jumps into 'Abyssal' sites are tracked on map"></i>
</label>
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="col-xs-12 col-sm-12 col-md-4">
<h4 class="pf-dynamic-area">Map logging</h4>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-12">
<div class="form-group">
<div class="col-xs-12 col-sm-12 col-xs-6 checkbox">
<input id="{{logHistoryId}}" name="logHistory" value="1" type="checkbox" {{#logHistory}}checked{{/logHistory}}>
@@ -108,7 +119,7 @@
</div>
</div>
<div class="col-xs-6 col-sm-12 col-md-6">
<div class="col-xs-6 col-sm-6 col-md-12">
<div class="form-group">
<div class="col-xs-12 col-sm-12 col-xs-6 checkbox">
<input id="{{logActivityId}}" name="logActivity" value="1" type="checkbox" {{#logActivity}}checked{{/logActivity}}>