Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Added showing of details of an element

This commit is contained in:
Robert von Burg 2016-04-08 19:57:03 +02:00
parent 454b36d659
commit c527a0e964
7 changed files with 111 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
li.strolch.planningwebapp/src/main/webapp/css/parts/main.css
View File

@ -6,7 +6,7 @@
* Basic
*/
html, body {
background: #f5f5f5;
background: #ffffff;
}
/*
@ -26,7 +26,7 @@ body {
position: absolute;
bottom: 0;
width: 100%;
background-color: #f5f5f5;
background-color: #ffffff;
}
.footer .information {
@ -46,3 +46,7 @@ body {
-ms-filter: blur(2px);
filter: blur(2px);
}
.row-action {
cursor: pointer;
}

1
li.strolch.planningwebapp/src/main/webapp/css/parts/nav.css
View File

@ -7,6 +7,7 @@
*/
.nav {
background: #ffffff;
border-bottom: solid #f5f5f5;
}
.nav-logo {

5
li.strolch.planningwebapp/src/main/webapp/index.jsp
View File

@ -1,5 +0,0 @@
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>

66
li.strolch.planningwebapp/src/main/webapp/js/functions.js
View File

@ -288,7 +288,7 @@ strolch.fn.dataTableDefaults = function () {
searchFieldId: null
};
};
strolch.fn.initDataTable = function (queryData, columns) {
strolch.fn.initDataTable = function (queryData, columns, columnDefs) {
var table = $('#' + queryData.tableId);
if ($.fn.dataTable.isDataTable(table)) {
@ -299,6 +299,7 @@ strolch.fn.initDataTable = function (queryData, columns) {
// init table
table.dataTable({
columns: columns,
columnDefs: columnDefs,
//lengthMenu: [[5, 10, 20, -1], [5, 10, 20, 'All']],
lengthMenu: [[10, 50, 100, -1], [10, 50, 100, 'All']],
processing: true,
@ -331,6 +332,19 @@ strolch.fn.initDataTable = function (queryData, columns) {
}
});
table.find('tbody').on('click', 'tr', function () {
var data = table.DataTable().row(this).data();
$(this).toggleClass('selected').toggleClass('table-active');
console.log('Selected ' + data['Id']);
});
table.find('tbody').on('click', 'tr span.row-action', function () {
var rowE = $(this).closest('tr');
var row = table.DataTable().row(rowE);
var data = row.data();
$('#jsonData').text(JSON.stringify(data, null, 2));
$('#modelElementDetailsModal').modal('show');
});
strolch.fn.initSearch(queryData);
};
@ -363,34 +377,6 @@ strolch.fn.searchDataTable = function (queryData) {
}
};
/*
* Part loading
*/
strolch.fn.loadParts = function (parts, domParent) {
var revision = '_=' + strolch.fn.revision();
$.each(strolch.const.partNames, function (index, value) {
var partName = value;
var urlHtml = 'parts/' + partName + '.html?' + revision;
var urlCss = 'css/parts/' + partName + '.css?' + revision;
var urlJs = 'js/parts/' + partName + '.js?' + revision;
// $('.content-loading, .loading-background').showLoading(true);
console.log('urlHtml: ' + urlHtml);
console.log('urlCss: ' + urlCss);
console.log('urlJs: ' + urlJs);
var script = document.createElement('script');
script.setAttribute('src', urlJs);
document.head.appendChild(script);
});
};
/*
* Utils
*/
@ -446,6 +432,28 @@ strolch.fn.logException = function (e) {
(console.error || console.log).call(console, e, e.stack || e);
};
strolch.fn.syntaxHighlightJson = function (json) {
if (typeof json != 'string') {
json = JSON.stringify(json, undefined, 2);
}
json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
var cls = 'number';
if (/^"/.test(match)) {
if (/:$/.test(match)) {
cls = 'key';
} else {
cls = 'string';
}
} else if (/true|false/.test(match)) {
cls = 'boolean';
} else if (/null/.test(match)) {
cls = 'null';
}
return '<span class="' + cls + '">' + match + '</span>';
});
};
/*
* hack for multiple modals over each other - until bootstrap fixes this
*/

9
li.strolch.planningwebapp/src/main/webapp/js/index.js
View File

@ -30,9 +30,6 @@ strolch.index.init = function () {
return;
}
// multiple Modal hack
strolch.fn.multipleModalsHack();
// re-auth modal form handler
strolch.fn.onModalShow('#reauthFormModal', strolch.fn.logout);
strolch.fn.onModalFormSubmit('#reauthFormModal', '#reauthForm', function () {
@ -57,6 +54,12 @@ strolch.index.start = function () {
strolch.index.loadParts();
strolch.index.registerHandlers();
strolch.fn.translateI18n();
// multiple Modal hack
strolch.fn.multipleModalsHack();
};
strolch.index.registerHandlers = function () {

36
li.strolch.planningwebapp/src/main/webapp/js/parts/model.js
View File

@ -60,8 +60,18 @@ strolch.parts.model.prepareResourceTable = function () {
columns.push({title: 'Id', width: 50, data: 'Id'});
columns.push({title: 'Name', data: 'Name'});
columns.push({title: 'Type', data: 'Type'});
columns.push({title: '', data: null, orderable: false});
strolch.fn.initDataTable(data, columns);
var columnDefs = [
{
render: function (data, type, row) {
return '<span class="fa fa-th-list row-action" data-function="action" data-type="details" />';
},
targets: columns.length - 1
}
];
strolch.fn.initDataTable(data, columns, columnDefs);
};
strolch.parts.model.prepareOrderTable = function () {
@ -79,8 +89,18 @@ strolch.parts.model.prepareOrderTable = function () {
columns.push({title: 'State', data: 'State'});
columns.push({title: 'Date', data: 'Date'});
columns.push({title: 'Type', data: 'Type'});
columns.push({title: '', data: null, orderable: false});
strolch.fn.initDataTable(data, columns);
var columnDefs = [
{
render: function (data, type, row) {
return '<span class="fa fa-th-list row-action" data-function="action" data-type="details" />';
},
targets: columns.length - 1
}
];
strolch.fn.initDataTable(data, columns, columnDefs);
};
strolch.parts.model.prepareActivityTable = function () {
@ -96,6 +116,16 @@ strolch.parts.model.prepareActivityTable = function () {
columns.push({title: 'Id', width: 50, data: 'Id'});
columns.push({title: 'Name', data: 'Name'});
columns.push({title: 'Type', data: 'Type'});
columns.push({title: '', data: null, orderable: false});
strolch.fn.initDataTable(data, columns);
var columnDefs = [
{
render: function (data, type, row) {
return '<span class="fa fa-th-list row-action" data-function="action" data-type="details" />';
},
targets: columns.length - 1
}
];
strolch.fn.initDataTable(data, columns, columnDefs);
};

32
li.strolch.planningwebapp/src/main/webapp/parts/model.html
View File

@ -29,7 +29,7 @@
</div>
<div class="row">
<div class="col-sm-12">
<table id="modelResourceTable" class="table table-striped table-bordered hover"
<table id="modelResourceTable" class="table table-hover"
cellspacing="0" width="100%">
<caption>The resources for the current user's realm</caption>
@ -52,7 +52,7 @@
</div>
</div>
<div class="row">
<table id="modelOrderTable" class="table table-striped table-bordered hover" cellspacing="0"
<table id="modelOrderTable" class="table table-hover" cellspacing="0"
width="100%">
<caption>The orders for the current user's realm</caption>
@ -74,7 +74,7 @@
</div>
</div>
<div class="row">
<table id="modelActivityTable" class="table table-striped table-bordered hover" cellspacing="0"
<table id="modelActivityTable" class="table table-hover" cellspacing="0"
width="100%">
<caption>The activities for the current user's realm</caption>
@ -85,4 +85,28 @@
</div>
</div>
</div>
</div>
</div>
<div id="modelElementDetailsModal" class="modal fade" tabindex="-1" role="dialog" data-dismiss="modal">
<div class="modal-dialog" role="form">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" aria-label="Close" data-dismiss="modal">
<span aria-hidden="true">&times;</span> <span class="sr-only">Cancel</span>
</button>
<h4 class="modal-title">Details</h4>
</div>
<div class="modal-body">
<form>
<fieldset class="form-group">
<label for="jsonData">Json Data</label>
<textarea class="form-control" id="jsonData" rows="20"></textarea>
</fieldset>
</form>
</div>
<div class="modal-footer">
<button type="button" data-dismiss="modal" class="btn btn-secondary">Close</button>
</div>
</div>
</div>
</div>