Skip to content

Commit

Permalink
add datatables to dev pages
Browse files Browse the repository at this point in the history
  • Loading branch information
peterstadler committed Dec 9, 2021
1 parent 1bf610d commit 22bbeb2
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 10 deletions.
6 changes: 6 additions & 0 deletions modules/dev/dev-app.xqm
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,9 @@ declare
lang:get-language-string($model?newID-docType, $model?lang)
}
};

declare
%templates:wrap
function dev-app:datatables($node as node(), $model as map(*)) as map() {
map {'api-base' : config:api-base()}
};
10 changes: 10 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"bootstrap-remote-data": "peterstadler/bootstrap-remote-data#master",
"bravura": "https://github.com/steinbergmedia/bravura",
"csLink": "correspSearch/csLink",
"datatables.net": "^1.11.3",
"datatables.net-bs4": "^1.11.3",
"datatables.net-buttons": "^2.1.1",
"datatables.net-buttons-bs4": "^2.1.1",
"fittextjs": "^1.2.0",
"flip": "nnattawat/flip",
"font-awesome": "^4.7.0",
Expand All @@ -24,6 +28,7 @@
"jquery": "^3.5.0",
"jquery-ui": "^1.13.0",
"jquery-ui-themes": "^1.12.0",
"jszip": "^3.7.1",
"moment": "^2.10.2",
"openseadragon": "^2.4.0",
"select2": "^4",
Expand All @@ -47,6 +52,10 @@
"bootstrap/{build,dist,js,scss}",
"bravura",
"csLink/dist",
"datatables.net",
"datatables.net-bs4",
"datatables.net-buttons",
"datatables.net-buttons-bs4",
"fittextjs",
"flip/dist",
"font-awesome",
Expand All @@ -55,6 +64,7 @@
"jquery/dist/",
"jquery-ui",
"jquery-ui-themes",
"jszip",
"moment/min",
"openseadragon/build/openseadragon/",
"select2/dist/",
Expand Down
32 changes: 32 additions & 0 deletions resources/js/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -1152,3 +1152,35 @@ $('.copy-to-clipboard').on('click', function() {
});
$('#newID-result span').tooltip('show');
});

$('#datatables')
.on('xhr.dt', function ( e, settings, json, xhr ) {
//console.log(xhr.getAllResponseHeaders());
json.recordsTotal = xhr.getResponseHeader('totalRecordCount')
json.recordsFiltered = xhr.getResponseHeader('filteredrecordcount')
} )
.DataTable( {
"processing": true,
"serverSide": true,
"ajax": {
url: $('#datatables').attr('data-api-base') + "/repositories/items?siglum=D-B",
cache: true,
dataSrc: '',
data: function(d) {
//console.log(d)
return {
limit: d.length,
offset: d.start +1,
orderby: d.columns[d.order[0].column].name,
orderdir: d.order[0].dir
}
}
},
"columns": [
{ "data": "docID", "name": "docID", "orderable": true, "render": function(data, type, row, meta) { return '<a href="https://dev.weber-gesamtausgabe.de/' + data + '">' + data + '</a>'; } },
{ "data": "authors", "name": "author", "orderable": false, "render": "[; ].name" },
{ "data": "date", "name": "sortdate", "orderable": true },
{ "data": "title", "name": "title", "orderable": true },
{ "data": "idno", "name": "idno", "orderable": true }
]
} );
33 changes: 33 additions & 0 deletions templates/dev/datatables.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<div xmlns="http://www.w3.org/1999/xhtml" data-template="templates:surround" data-template-with="templates/page.html" data-template-at="content">
<div class="header">
<div class="container">
<div class="row">
<div class="col-md-12">
<h1 class="document">Datatables</h1>
</div>
</div>
</div>
</div>
<div class="container-fluid" data-template="dev-app:datatables">
<table id="datatables" class="table table-hover table-striped" data-template="app:inject-api-base" style="width:100%">
<thead>
<tr>
<th>WeGA-ID</th>
<th>Verfasser</th>
<th>Datum</th>
<th>Titel</th>
<th>Signatur</th>
</tr>
</thead>
<tfoot>
<tr>
<th>WeGA-ID</th>
<th>Verfasser</th>
<th>Datum</th>
<th>Titel</th>
<th>Signatur</th>
</tr>
</tfoot>
</table>
</div>
</div>
7 changes: 7 additions & 0 deletions templates/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
<link rel="stylesheet" type="text/css" href="$resources/lib/google-code-prettify/bin/prettify.min.css"/>
<link rel="stylesheet" type="text/css" href="$resources/lib/jquery-ui-themes/themes/overcast/jquery-ui.min.css"/>
<link rel="stylesheet" type="text/css" href="$resources/lib/ion-rangeslider/css/ion.rangeSlider.min.css"/>
<link rel="stylesheet" type="text/css" href="$resources/lib/datatables.net-bs4/css/dataTables.bootstrap4.min.css" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<link rel="stylesheet" type="text/css" href="$resources/lib/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>

<script type="application/ld+json" data-template="app-shared:output" data-template-key="jsonld-metadata" data-template-wrap="yes"/>

Expand Down Expand Up @@ -284,6 +286,11 @@ <h3 class="item-title">
<script type="text/javascript" src="$resources/lib/openseadragon/openseadragon/openseadragon.min.js"/>
<script type="text/javascript" src="$resources/js/greedynav.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/js/greedynav-min.js" data-template="app-shared:if-not-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/lib/jszip/dist/jszip.min.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/lib/datatables.net/js/jquery.dataTables.min.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/lib/datatables.net-bs4/js/dataTables.bootstrap4.min.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/lib/datatables.net-buttons/js/dataTables.buttons.min.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/lib/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/js/init.js" data-template="app-shared:if-matches" data-template-key="environment" data-template-value="development"/>
<script type="text/javascript" src="$resources/js/init-min.js" data-template="app-shared:if-not-matches" data-template-key="environment" data-template-value="development"/>

Expand Down
79 changes: 69 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Easy-Responsive-Tabs-to-Accordion@peterstadler/Easy-Responsive-Tabs-to-Accordion

"Junicode-New@https://github.com/psb1558/Junicode-New":
version "0.0.0"
resolved "https://github.com/psb1558/Junicode-New#539648d3bec6e7962612973e1a300cae5004a3d2"
resolved "https://github.com/psb1558/Junicode-New#091a35b6c8fd34b4b763e4f05c248ed1b147d206"

WeGA-ODD@edirom/WeGA-ODD#develop:
version "0.0.0"
Expand Down Expand Up @@ -419,9 +419,9 @@ constants-browserify@^1.0.0:
integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=

core-js-pure@^3.19.0:
version "3.19.2"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.2.tgz#26b5bfb503178cff6e3e115bc2ba6c6419383680"
integrity sha512-5LkcgQEy8pFeVnd/zomkUBSwnmIxuF1C8E9KrMAbOc8f34IBT9RGvTYeNDdp1PnvMJrrVhvk1hg/yVV5h/znlg==
version "3.19.3"
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.3.tgz#c69b2b36b58927317824994b532ec3f0f7e49607"
integrity sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==

core-js@^2.4.0, core-js@^2.5.0:
version "2.6.12"
Expand Down Expand Up @@ -509,6 +509,38 @@ damerau-levenshtein@^1.0.7:
resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==

datatables.net-bs4@>=1.11.3, datatables.net-bs4@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.11.3.tgz#04817c5d9457f1b9807a1330f12c37a541596328"
integrity sha512-UPT2F1nvZZzKJSSHb+3+bTeQy1ULLMT1BexBHCkh5PhMnAZNPbTEZD+6To1RCBfUF1rtPwIJTwJ+Jjjxy86xRw==
dependencies:
datatables.net ">=1.10.25"
jquery ">=1.7"

datatables.net-buttons-bs4@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-2.1.1.tgz#19a8279466f3c9e851f44b4b14de8c2c4245e24a"
integrity sha512-o2MrkGzg2IqZ5j7kXOqm4ukpwAyxqAB2ugTTnmjn7VXQwNbERrzmeA05pXcqw80fBUx5/Jn4arczXoInNQuBTw==
dependencies:
datatables.net-bs4 ">=1.11.3"
datatables.net-buttons ">=2.0.1"
jquery ">=1.7"

datatables.net-buttons@>=2.0.1, datatables.net-buttons@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.1.1.tgz#5969913415aac9013ed269dbb61d7f732399f06c"
integrity sha512-MLHKIOlwWfZ1I6vI+w7B0w7szWDkuelTVnwuNXGhh0nMV2hP9nL7t0zgfxPraOmbVXAmJnHQa4o7pd1PfKbJ3g==
dependencies:
datatables.net ">=1.11.3"
jquery ">=1.7"

datatables.net@>=1.10.25, datatables.net@>=1.11.3, datatables.net@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.3.tgz#80e691036efcd62467558ee64c07dd566cb761b4"
integrity sha512-VMj5qEaTebpNurySkM6jy6sGpl+s6onPK8xJhYr296R/vUBnz1+id16NVqNf9z5aR076OGcpGHCuiTuy4E05oQ==
dependencies:
jquery ">=1.7"

debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
Expand Down Expand Up @@ -873,6 +905,11 @@ ieee754@^1.1.4:
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==

immediate@~3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=

immutable@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
Expand Down Expand Up @@ -1051,7 +1088,7 @@ jquery-ui@^1.13.0:
dependencies:
jquery ">=1.8.0 <4.0.0"

jquery@>=1.6.2, "jquery@>=1.8.0 <4.0.0", jquery@^3.5.0, jquery@^3.5.1:
jquery@>=1.6.2, jquery@>=1.7, "jquery@>=1.8.0 <4.0.0", jquery@^3.5.0, jquery@^3.5.1:
version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
Expand All @@ -1064,6 +1101,16 @@ jsx-ast-utils@^3.2.1:
array-includes "^3.1.3"
object.assign "^4.1.2"

jszip@^3.7.1:
version "3.7.1"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
dependencies:
lie "~3.3.0"
pako "~1.0.2"
readable-stream "~2.3.6"
set-immediate-shim "~1.0.1"

language-subtag-registry@~0.3.2:
version "0.3.21"
resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz#04ac218bea46f04cb039084602c6da9e788dd45a"
Expand All @@ -1076,6 +1123,13 @@ language-tags@^1.0.5:
dependencies:
language-subtag-registry "~0.3.2"

lie@~3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
dependencies:
immediate "~3.0.5"

lodash@^4.17.15:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
Expand Down Expand Up @@ -1229,9 +1283,9 @@ object-assign@^4.1.1:
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

object-inspect@^1.11.0, object-inspect@^1.9.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
version "1.11.1"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"
integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==

object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
Expand Down Expand Up @@ -1274,7 +1328,7 @@ os-browserify@^0.3.0:
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=

pako@~1.0.5:
pako@~1.0.2, pako@~1.0.5:
version "1.0.11"
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
Expand Down Expand Up @@ -1409,7 +1463,7 @@ randomfill@^1.0.3:
randombytes "^2.0.5"
safe-buffer "^5.1.0"

readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
Expand Down Expand Up @@ -1524,6 +1578,11 @@ semver@^5.7.1:
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

set-immediate-shim@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=

setimmediate@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
Expand Down

0 comments on commit 22bbeb2

Please sign in to comment.