';
+ value = '
';
}
return value;
}
@@ -734,20 +812,26 @@ define([
}
},{
targets: 3,
+ name: 'mass',
title: 'mass',
className: ['text-right'].join(' ') ,
data: 'ship.mass',
render: {
- _: function(data, type, row){
- let value = data;
+ _: (cellData, type, rowData, meta) => {
+ let value = cellData;
if(type === 'display'){
value = Util.formatMassValue(value);
+ if(!rowData.active){
+ // log is "deleted"
+ value = '' + value + '';
+ }
}
return value;
}
}
},{
targets: 4,
+ name: 'created',
title: 'log',
width: 55,
className: ['text-right', config.tableCellCounterClass].join(' '),
@@ -755,6 +839,108 @@ define([
createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
$(cell).initTimestampCounter('d');
}
+ },{
+ targets: 5,
+ name: 'edit',
+ title: '',
+ orderable: false,
+ searchable: false,
+ width: 10,
+ className: ['text-center', config.tableCellActionClass, config.moduleHeadlineIconClass].join(' '),
+ data: null,
+ render: {
+ display: data => {
+ let icon = '';
+ if(data.active){
+ icon = '';
+ }
+ return icon;
+ }
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ let tableApi = this.api();
+
+ if($(cell).is(':empty')){
+ $(cell).removeClass(config.tableCellActionClass + ' ' + config.moduleHeadlineIconClass);
+ }else{
+ $(cell).on('click', function(e){
+ showLogDialog(moduleElement, connectionElement, connectionData, rowData);
+ });
+ }
+ }
+ },{
+ targets: 6,
+ name: 'delete',
+ title: '',
+ orderable: false,
+ searchable: false,
+ width: 10,
+ className: ['text-center', config.tableCellActionClass].join(' '),
+ data: 'active',
+ render: {
+ display: data => {
+ let val = '';
+ if(data){
+ val = '';
+ }
+ return val;
+ }
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ let tableApi = this.api();
+
+ if(rowData.active){
+ let confirmationSettings = {
+ container: 'body',
+ placement: 'left',
+ btnCancelClass: 'btn btn-sm btn-default',
+ btnCancelLabel: 'cancel',
+ btnCancelIcon: 'fas fa-fw fa-ban',
+ title: 'delete jump log',
+ 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();
+
+ connectionElement.find('table').showLoadingAnimation();
+
+ request('DELETE', 'log', rowData.id, {}, {
+ connectionElement: connectionElement
+ }, requestAlways)
+ .then(
+ payload => {
+ addConnectionsData(moduleElement, enrichConnectionsData([connectionData], payload.data));
+ },
+ Util.handleAjaxErrorResponse
+ );
+ }
+ };
+
+ // init confirmation dialog
+ $(cell).confirmation(confirmationSettings);
+ }else {
+ $(cell).on('click', function(e){
+ connectionElement.find('table').showLoadingAnimation();
+
+ let requestData = {
+ active: 1
+ };
+
+ request('PATCH', 'log', rowData.id, requestData, {
+ connectionElement: connectionElement
+ }, requestAlways)
+ .then(
+ payload => {
+ addConnectionsData(moduleElement, enrichConnectionsData([connectionData], payload.data));
+ },
+ Util.handleAjaxErrorResponse
+ );
+ });
+ }
+ }
}
],
drawCallback: function(settings){
@@ -772,27 +958,34 @@ define([
},
footerCallback: function(row, data, start, end, display ){
-
- let api = this.api();
- let sumColumnIndexes = [3];
+ let tableApi = this.api();
+ let sumColumnIndexes = ['mass:name', 'delete:name'];
// column data for "sum" columns over this page
- let pageTotalColumns = api
+ let pageTotalColumns = tableApi
.columns( sumColumnIndexes, { page: 'all'} )
.data();
// sum columns for "total" sum
- pageTotalColumns.each((colData, index) => {
- pageTotalColumns[index] = colData.reduce((a, b) => {
- return parseInt(a) + parseInt(b);
+ pageTotalColumns.each((colData, colIndex) => {
+ pageTotalColumns[colIndex] = colData.reduce((sum, val, rowIndex) => {
+ // sum "mass" (colIndex 0) only if not "deleted" (colIndex 1)
+ if(colIndex === 0 && pageTotalColumns[1][rowIndex]){
+ return sum + parseInt(val);
+ }else{
+ return sum;
+ }
}, 0);
});
- $(sumColumnIndexes).each((index, value) => {
- $( api.column( value ).footer() ).text( Util.formatMassValue(pageTotalColumns[index]) );
+ sumColumnIndexes.forEach((colSelector, index) => {
+ // only "mass" column footer needs updates
+ if(colSelector === 'mass:name'){
+ $(tableApi.column(colSelector).footer()).text( Util.formatMassValue(pageTotalColumns[index]) );
- // save mass for further reCalculation of "info" table
- connectionElement.find('.' + config.connectionInfoTableCellMassLogClass).data('mass', pageTotalColumns[index]);
+ // save mass for further reCalculation of "info" table
+ connectionElement.find('.' + config.connectionInfoTableCellMassLogClass).data('mass', pageTotalColumns[index]);
+ }
});
// calculate "info" table -----------------------------------------------------
@@ -805,14 +998,186 @@ define([
logTable.on('order.dt search.dt', function(){
let pageInfo = logTable.page.info();
- logTable.column(0, {search:'applied', order:'applied'}).nodes().each((cell, i) => {
- let content = (pageInfo.recordsTotal - i) + '. ';
+ logTable.column('index:name', {search:'applied', order:'applied'}).nodes().each((cell, i) => {
+ let content = (pageInfo.recordsTotal - i) + '.';
$(cell).html(content);
});
});
}
};
+ let request = (action, entity, ids = [], data = {}, context = {}, always = null) => {
+
+ let requestExecutor = (resolve, reject) => {
+ let payload = {
+ action: 'request',
+ name: action.toLowerCase() + entity.charAt(0).toUpperCase() + entity.slice(1)
+ };
+
+ // build request url --------------------------------------------------------------------------------------
+ let url = Init.path.api + '/' + entity;
+
+ let path = '';
+ if(isNaN(ids)){
+ if(Array.isArray(ids)){
+ path += '/' + ids.join(',');
+ }
+ }else{
+ let id = parseInt(ids, 10);
+ path += id ? '/' + id : '';
+ }
+ url += path;
+
+ $.ajax({
+ type: action,
+ url: url,
+ data: JSON.stringify(data),
+ contentType: 'application/json; charset=utf-8',
+ dataType: 'json',
+ context: context
+ }).done(function(response){
+ payload.data = response;
+ payload.context = this;
+ resolve(payload);
+ }).fail(function(jqXHR, status, error){
+ payload.data = {
+ jqXHR: jqXHR,
+ status: status,
+ error: error
+ };
+ payload.context = this;
+ reject(payload);
+ }).always(function(){
+ if(always){
+ always(this);
+ }
+ });
+ };
+
+ return new Promise(requestExecutor);
+ };
+
+ /**
+ *
+ * @param context
+ */
+ let requestAlways = (context) => {
+ context.connectionElement.find('table').hideLoadingAnimation();
+ };
+
+ /**
+ * show jump log dialog
+ * @param moduleElement
+ * @param connectionElement
+ * @param connectionData
+ * @param logData
+ */
+ let showLogDialog = (moduleElement, connectionElement, connectionData, logData = {}) => {
+
+ let data = {
+ id: config.connectionDialogId,
+ typeSelectId: config.typeSelectId,
+ shipMassId: config.shipMassId,
+ characterSelectId: config.characterSelectId,
+ logData: logData,
+ massFormat: () => {
+ return (val, render) => {
+ return (parseInt(render(val) || 0) / 1000) || '';
+ };
+ }
+ };
+
+ requirejs(['text!templates/dialog/connection_log.html', 'mustache'], (template, Mustache) => {
+ let content = Mustache.render(template, data);
+
+ let connectionDialog = bootbox.dialog({
+ title: 'Jump log',
+ message: content,
+ show: false,
+ 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(logData, 'id') || 0;
+ formData.connectionId = Util.getObjVal(connectionData, 'id') || 0;
+ formData.shipTypeId = Util.getObjVal(formData, 'shipTypeId') || 0;
+ formData.shipMass = parseInt((Util.getObjVal(formData, 'shipMass') || 0) * 1000);
+ formData.characterId = Util.getObjVal(formData, 'characterId') || 0;
+
+ // we need some "additional" form data from the Select2 dropdown
+ // -> data is required on the backend side
+ let formDataShip = form.find('#' + config.typeSelectId).select2('data');
+ let formDataCharacter = form.find('#' + config.characterSelectId).select2('data');
+ formData.shipTypeName = formDataShip.length ? formDataShip[0].text : '';
+ formData.characterName = formDataCharacter.length ? formDataCharacter[0].text : '';
+
+ let method = formData.id ? 'PATCH' : 'PUT';
+
+ request(method, 'log', formData.id, formData, {
+ connectionElement: connectionElement,
+ formElement: form
+ }, requestAlways)
+ .then(
+ payload => {
+ addConnectionsData(moduleElement, enrichConnectionsData([connectionData], payload.data));
+ this.modal('hide');
+ },
+ Util.handleAjaxErrorResponse
+ );
+
+ }
+
+ return false;
+ }
+ }
+ }
+ });
+
+ connectionDialog.on('show.bs.modal', function(e){
+ let modalContent = $('#' + config.connectionDialogId);
+
+ // init type select live search
+ let selectElementType = modalContent.find('#' + config.typeSelectId);
+ selectElementType.initUniverseTypeSelect({
+ categoryIds: [6],
+ maxSelectionLength: 1,
+ selected: [Util.getObjVal(logData, 'ship.typeId')]
+ }).on('select2:select select2:unselecting', function(e){
+ // get ship mass from selected ship type and update mass input field
+ let shipMass = e.params.data ? e.params.data.mass / 1000 : '';
+ modalContent.find('#' + config.shipMassId).val(shipMass);
+ });
+
+ // init character select live search
+ let selectElementCharacter = modalContent.find('#' + config.characterSelectId);
+ selectElementCharacter.initUniverseSearch({
+ categoryNames: ['character'],
+ maxSelectionLength: 1
+ });
+
+ });
+
+ // show dialog
+ connectionDialog.modal('show');
+ });
+ };
+
/**
* remove connection Panel from moduleElement
* @param connectionElement
diff --git a/js/app/ui/module/system_intel.js b/js/app/ui/module/system_intel.js
index 64dcc35b..62b5caae 100644
--- a/js/app/ui/module/system_intel.js
+++ b/js/app/ui/module/system_intel.js
@@ -337,7 +337,7 @@ define([
data: statusData
});
- // init character counter
+ // init char counter
let textarea = modalContent.find('#' + config.descriptionTextareaId);
let charCounter = modalContent.find('.' + config.descriptionTextareaCharCounter);
Util.updateCounter(textarea, charCounter, maxDescriptionLength);
diff --git a/js/app/util.js b/js/app/util.js
index 5d2623eb..2204de10 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -8,6 +8,7 @@ define([
'conf/signature_type',
'bootbox',
'localForage',
+ 'lazyload',
'velocity',
'velocityUI',
'customScrollbar',
@@ -70,6 +71,7 @@ define([
// select2
select2Class: 'pf-select2', // class for all "Select2"