Skip to content
Snippets Groups Projects
Commit e1adfb67 authored by hanfi's avatar hanfi
Browse files

Merge branch 'staging' into 'main' 

visual report to checkin

See merge request hanfi/bgp_worker!23
parents 9798e502 a9314436
No related branches found
No related tags found
1 merge request!23visual report to checkin
Expand all Hide whitespace changes
Inline Side-by-side
dist/bundle.js
+ 1
− 539
View file @ e1adfb67
This diff is collapsed.
dist/checkout.html
+ 1
− 1
View file @ e1adfb67
<!DOCTYPE html><html lang="de"><head><title>Paketshop: Checkout</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon shortcut" href="data:image/x-icon;," type="image/x-icon"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <h1>Checkout</h1> <div class="row"> <button onclick="lib.scanReceiver()" class="btn btn-primary">Scan Code</button> </div> <div class="row"> <input class="form-control" id="checkoutByTag" type="text" placeholder="tag"><button onclick="lib.checkoutByTag()" class="btn btn-primary">Checkout By Tag</button> </div> <div class="row"> <div id="reader" style="width: 500px; margin 0 auto;"></div> </div> <div class="row" onclick="lib.checkoutItem()"> <h2 id="storage"></h2> <div class="col-md-6"> <strong id="tag"></strong><br> <span id="uuid"></span> </div> <div class="col-md-6"> <strong id="addressee"></strong><br> <span id="team"></span> </div> </div> </div> <script src="./bundle.js"></script> <script>window.onload=function(){lib.onPageLoad(!1)};</script> </body></html>
\ No newline at end of file
<!DOCTYPE html><html lang="de"><head><title>Paketshop: Checkout</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="icon shortcut" href="data:image/x-icon;," type="image/x-icon"><link rel="stylesheet" type="text/css" href="/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="/bootstrap-icons.css"><link rel="stylesheet" type="text/css" href="/index.css"></head><body> <div class="container"> <h1>Checkout</h1> <div class="row"> <button onclick="lib.scanReceiver()" class="btn btn-primary">Scan Code</button> </div> <div class="row"> <input class="form-control" id="checkoutByTag" type="text" placeholder="tag"><button onclick="lib.checkoutByTag()" class="btn btn-primary">Checkout By Tag</button> </div> <div class="row"> <div id="reader" style="width: 500px; margin 0 auto;"></div> </div> <div id="item" class="alert alert-warning d-none row" onclick="lib.checkoutItem()"> <h2 id="storage"></h2> <div class="col-md-6"> <strong id="tag"></strong><br> <span id="uuid"></span> </div> <div class="col-md-6"> <strong id="addressee"></strong><br> <span id="team"></span> </div> </div> </div> <script src="./bundle.js"></script> <script>window.onload=function(){lib.onPageLoad(!1)};</script> </body></html>
\ No newline at end of file
src/js/main.js
+ 11
− 3
View file @ e1adfb67
......@@ -129,9 +129,7 @@ function updateItemsView() {
items.innerHTML = "";
for (var item in received_items) {
var li = document.createElement("li");
console.log(item);
console.log(received_items[item]);
li.innerHTML = "<div id=\"item_" + received_items[item].item.uuid + "\" class=\"alert alert-success\" role=\"alert\">" +
li.innerHTML = "<div id=\"item_" + received_items[item].item.uuid + "\" class=\"alert alert-warning\" role=\"alert\">" +
received_items[item].item.tag + " (" + received_items[item].item.addressee + ", " + received_items[item].item.team + ")" +
"&emsp;<span class=\"badge badge-light\">"+received_items[item].num+"</span>"+
"&emsp;<button class=\"btn btn-primary\" onclick=\"lib.increaseItemCount('" + received_items[item].item.uuid + "')\">+</button>" +
......@@ -359,6 +357,7 @@ export async function checkinItems() {
}
function updateCheckoutItem(tracking_item) {
document.querySelector("#item").classList.remove("d-none");
document.querySelector("#uuid").innerHTML = tracking_item.uuid;
document.querySelector("#tag").innerHTML = tracking_item.tag;
document.querySelector("#storage").innerHTML = tracking_item.storage;
......@@ -373,6 +372,15 @@ export async function checkoutItem() {
return;
}
var response = await fetchWithAuth(config.backend_url + "/checkout/" + document.querySelector("#uuid").innerHTML);
if (response.status == 200) {
document.querySelector("#item").classList.remove("alert-warning");
document.querySelector("#item").classList.add("alert-success");
await new Promise(r => setTimeout(r, 2000));
document.querySelector("#item").classList.add("d-none");
} else {
document.querySelector("#item").classList.remove("alert-warning");
document.querySelector("#item").classList.add("alert-error");
}
}
async function onRecevierScanSuccess(scannedCode) {
......
src/views/checkout.html
+ 1
− 1
View file @ e1adfb67
......@@ -17,7 +17,7 @@
<div class="row">
<div id="reader" style="width: 500px; margin 0 auto;"></div>
</div>
<div class="row" onclick="lib.checkoutItem()">
<div id="item" class="row alert alert-warning d-none" onclick="lib.checkoutItem()">
<h2 id="storage"></h2>
<div class="col-md-6">
<strong id="tag"></strong><br>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Impressum - Datenschutzerklärung