Netsyms/PackageHelper
2
0
Fork 1
Code Issues 9 Pull Requests Releases 12 Wiki Activity

Display barcode on tracking page, fix some tracking bugs

Browse Source
This commit is contained in:
Skylar Ittner 2019-11-14 20:06:44 -07:00
parent c0e4a80d4f
commit 933a1f7df2
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/remove_bloat.sh
View File

@ -25,6 +25,11 @@ rm -rf src
rm -rf external
cd ..
cd jsbarcode
rm -rf .dockerignore .eslintignore .eslintrcautomation bin bower.json CONTRIBUTING.md docker-compose.yml Dockerfile example gulpfile.js jsbarcode.d.ts README.md src test .travis.yml
rm -rf dist/barcodes
rm -rf dist/JsBarcode.all.js
cd framework7
rm -rf components
rm -rf lazy-components

5
www/assets/js/toolbox_track.js
View File

@ -29,8 +29,9 @@ function timestampToDateTimeString(timestamp) {
var pm = date.getHours() >= 12;
var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
hours = (hours == 0 ? 12 : hours);
var minutes = date.getMinutes();
var time = hours + ":" + minutes + " " + (pm ? "PM" : "AM");
var time = hours + ":" + (minutes < 10 ? "0" + minutes : minutes) + " " + (pm ? "PM" : "AM");
return date.toLocaleDateString() + " " + time;
}
@ -79,6 +80,8 @@ function openTrackingHistory(trackingcode) {
infocontext.current.location.display = locationArrayToString(infocontext.current.location);
infocontext.current.date = timestampToDateTimeString(infocontext.current.date);
infocontext.current.status = trackingStatusToNiceString(infocontext.current.status, true);
infocontext.addresses.from = locationArrayToString(infocontext.addresses.from);
infocontext.addresses.to = locationArrayToString(infocontext.addresses.to);
for (var i = 0; i < infocontext.history.length; i++) {
infocontext.history[i].location.display = locationArrayToString(infocontext.history[i].location);

1
www/index.html
View File

@ -27,6 +27,7 @@
<script src="node_modules/jquery/dist/jquery.min.js"></script>
<script src="node_modules/leaflet/dist/leaflet.js"></script>
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
<script src="node_modules/jsbarcode/dist/JsBarcode.all.min.js"></script>
<script src="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
<script src="settings.js"></script>

1
www/package.json
View File

@ -7,6 +7,7 @@
"@fortawesome/fontawesome-free": "^5.10.2",
"framework7": "^5.0.2",
"jquery": "^3.4.1",
"jsbarcode": "^3.11.0",
"leaflet": "^1.5.1",
"leaflet-geometryutil": "^0.9.1",
"leaflet.locatecontrol": "^0.67.0",

23
www/pages/toolbox/trackinginfo.html
View File

@ -19,7 +19,7 @@
<div class="page-content">
<div class="list media-list no-hairlines tablet-inset no-margin-top">
<ul>
<li class="item-divider">Current Status</li>
<li class="item-divider">Information</li>
<li>
<div class="item-content">
@ -32,19 +32,28 @@
<div class="item-text">{{details}}</div>
<div class="item-text"><b>{{location.display}}</b></div>
{{/with}}
<div class="item-text">{{carrier.name}} | {{service.name}}</div>
</div>
</div>
</li>
<li class="item-divider">Item Info</li>
<li>
<div class="item-content">
<div class="item-inner">
<div class="item-text">Tracking Code: {{code}}</div>
<div class="item-text">Carrier: {{carrier.name}} | {{service.name}}</div>
<div class="item-text">Carrier: {{carrier.name}}{{#if service.name}} {{service.name}}{{/if}}</div>
<div class="item-text">From: {{addresses.from}}</div>
<div class="item-text">To: {{addresses.to}}</div>
</div>
</div>
</li>
<li>
<div class="item-content" style="background-color: white; display: flex; justify-content: center; padding-left: 1rem; padding-right: 1rem;">
<svg class="barcode"
jsbarcode-format="code128"
jsbarcode-value="{{code}}"
jsbarcode-height="40"
jsbarcode-width="2">
</svg>
</div>
</li>
<li class="item-divider">History</li>
{{#each history}}
<li>
@ -67,4 +76,8 @@
</ul>
</div>
</div>
<script>
JsBarcode(".barcode").init();
</script>
</div>