This commit is contained in:
Matteo Gheza 2021-02-25 11:18:38 +01:00
parent 51aa7aeec4
commit 2c7f5687e2
5 changed files with 11 additions and 4 deletions

View File

@ -44,6 +44,7 @@ $baseConfig = [
vendor/twig/twig/src/Node/Expression/Test
vendor/twig/twig/src/Test
vendor/tracy/tracy/tools
vendor
*.lock
',
'before' => [

View File

@ -22,6 +22,8 @@ $(document).on('pjax:start', function() {
document.getElementById("topNavBar").className = "topnav";
}
old_data = "null";
fillTable = undefined;
table_engine = "datatables";
if(window.loadTable_interval !== undefined){
clearInterval(window.loadTable_interval);
window.loadTable_interval = undefined;
@ -99,13 +101,13 @@ var offline = false;
var loadTable_interval = undefined;
var old_data = "null";
var table_engine = "datatables";
if ('connection' in navigator && navigator.connection.saveData) {
table_engine = "default";
}
var fillTable = undefined;
async function loadTable(table_page, set_interval=true, interval=10000, onlineReload=false, use_custom_table_engine=false){
if (typeof fillTable === "undefined"){
if ('connection' in navigator && navigator.connection.saveData) {
table_engine = "default";
}
if(use_custom_table_engine !== false){
table_engine = use_custom_table_engine;
}

View File

@ -4,6 +4,8 @@ import pdfMake from "pdfmake/build/pdfmake";
import pdfFonts from "pdfmake/build/vfs_fonts";
pdfMake.vfs = pdfFonts.pdfMake.vfs;
import 'datatables.net-bs4/js/dataTables.bootstrap4.min.js';
import 'moment';
import 'datatables.net-plugins/sorting/date-moment.js';
import 'datatables.net-bs4/css/dataTables.bootstrap4.min.css';
import 'datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js';
import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css';
@ -55,6 +57,7 @@ export default async function fillTable(data, replaceLatLngWithMap=false){
console.log(error);
loadedLanguage = {};
}
$.fn.dataTable.moment('dd/mm/YYYY hh:ii:ss');
let table = $('#table').DataTable({
responsive: true,
language: loadedLanguage,

View File

@ -66,6 +66,7 @@ module.exports = {
],
},
plugins: [
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
new CleanWebpackPlugin(),
new CopyPlugin({
patterns: [

View File

@ -2,7 +2,7 @@
{% block head %}
{{ parent() }}
<link rel="prefetch" href="{{ urlsoftware }}/resources/dist/{{ resource('table_engine_default.js') }}">
<link rel="prefetch" href="{{ urlsoftware }}/resources/dist/{{ resource('table_engine_default-js.js') }}">
{% endblock %}
{% block menu %}