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

Remove some papercuts from broken scanner feature

Browse Source
This commit is contained in:
Skylar Ittner 2019-11-30 18:59:23 -07:00
parent 9f5caa2593
commit 4c24d8fba8
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/assets/js/toolbox_scanner.js
View File

@ -1,4 +1,4 @@
/* /*
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@ -170,7 +170,7 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
if ($(this).data("form3849") == "1") { if ($(this).data("form3849") == "1") {
// TODO: make this not a hack // TODO: make this not a hack
app.dialog.prompt("Type in 3849 form", "3849 Form", function (formcode) { app.dialog.prompt("Key in 3849 form", "3849 Form", function (formcode) {
for (i in scannerCodes) { for (i in scannerCodes) {
saveScanCode({ saveScanCode({
code: scannerCodes[i], code: scannerCodes[i],
@ -181,7 +181,7 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
} }
app.toast.show({ app.toast.show({
text: 'Information recorded successfully!', text: 'Information recorded successfully!',
position: "bottom", position: "center",
destroyOnClose: true, destroyOnClose: true,
closeTimeout: 1000 * 3 closeTimeout: 1000 * 3
}); });
@ -200,10 +200,16 @@ $("#app").on("click", "ul li.eventtypebutton", function () {
} }
app.toast.show({ app.toast.show({
text: 'Information recorded successfully!', text: 'Information recorded successfully!',
position: "bottom", position: "center",
destroyOnClose: true, destroyOnClose: true,
closeTimeout: 1000 * 3 closeTimeout: 1000 * 3
}); });
resetScanner(); resetScanner();
} }
});
$("#brokenscannerinput").on('keypress', function (e) {
if (e.which == 13) {
brokenScannerAddTextEntry();
}
}); });

2
www/pages/toolbox/scanner/entries.html
View File

@ -23,7 +23,7 @@
<div class="page-content"> <div class="page-content">
{{#if entries}} {{#if entries}}
<div class="list media-list"> <div class="list media-list no-margin-top no-hairlines">
<ul> <ul>
{{#each entries}} {{#each entries}}
<li style="padding-top: 2rem; padding-bottom: 2rem;"> <li style="padding-top: 2rem; padding-bottom: 2rem;">

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

@ -49,9 +49,15 @@
</div> </div>
<div class="popup" id="scanEventPopup" style="background-color: var(--f7-page-bg-color);"> <div class="popup" id="scanEventPopup" style="background-color: var(--f7-page-bg-color);">
<div class="block"> <div class="navbar">
<p>Select Event</p> <div class="navbar-bg"></div>
<div class="list tablet-inset"> <div class="navbar-inner">
<div class="title">Select Event</div>
</div>
</div>
<div class="block no-margin-top padding-bottom" style="height: calc(100% - var(--f7-navbar-height)); overflow-y: auto;">
<div class="list tablet-inset no-hairlines no-margin-top">
<ul class="eventlist"> <ul class="eventlist">
</ul> </ul>
@ -66,8 +72,15 @@
</div> </div>
<div class="popup" id="scanEventTypePopup" style="background-color: var(--f7-page-bg-color);"> <div class="popup" id="scanEventTypePopup" style="background-color: var(--f7-page-bg-color);">
<div class="block"> <div class="navbar">
<div class="list tablet-inset"> <div class="navbar-bg"></div>
<div class="navbar-inner">
<div class="title">Event Type</div>
</div>
</div>
<div class="block no-margin-top padding-bottom" style="height: calc(100% - var(--f7-navbar-height)); overflow-y: auto;">
<div class="list tablet-inset no-hairlines no-margin-top">
<ul class="eventlist"> <ul class="eventlist">
</ul> </ul>