ge-aerospace/shopdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
046c11402f628b666a8cfce3e098e46174f4571b
shopdb/addusb.asp
cproudlock e382a3246e Fix dualpath propagation, getShopfloorPCs filtering, USB management, and printer features 
- Fix dualpath PC propagation direction (Equipment->PC) in api.asp and db_helpers.asp
- Fix early exit in CreatePCMachineRelationship preventing propagation
- Fix getShopfloorPCs to filter machinetypeid IN (33,34,35) instead of >= 33
- Fix getShopfloorPCs to show equipment numbers via GROUP_CONCAT subquery
- Add detailed PropagateDP logging for dualpath debugging
- Default "Show on Shopfloor Dashboard" checkbox to checked in addnotification.asp
- Add USB label batch printing, single USB labels, and USB history pages
- Add printer supplies tracking and toner report enhancements
- Add uptime map visualization page
- Add dashboard/lobby display SQL migration
- Update CLAUDE.md with IIS 401 workaround documentation
- Update TODO.md

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-03 10:44:55 -05:00

324 lines
13 KiB
Plaintext
Raw Blame History

<!DOCTYPE html>
<html lang="en">
<head>
<!--#include file="./includes/header.asp"-->
<!--#include file="./includes/sql.asp"-->
<!-- JsBarcode for barcode generation -->
<script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></script>
</head>
<%
theme = Request.Cookies("theme")
IF theme = "" THEN
theme="bg-theme1"
END IF
%>
<body class="bg-theme <%Response.Write(theme)%>">
<!-- start loader -->
<div id="pageloader-overlay" class="visible incoming"><div class="loader-wrapper-outer"><div class="loader-wrapper-inner" ><div class="loader"></div></div></div></div>
<!-- end loader -->
<!-- Start wrapper-->
<div id="wrapper">
<!--#include file="./includes/leftsidebar.asp"-->
<!--Start topbar header-->
<!--#include file="./includes/topbarheader.asp"-->
<!--End topbar header-->
<div class="clearfix"></div>
<div class="content-wrapper">
<div class="container-fluid">
<div class="row mt-3">
<div class="col-lg-8 offset-lg-2">
<div class="card">
<div class="card-body">
<div style="display:flex; justify-content:space-between; align-items:center; margin-bottom:20px;">
<h5 class="card-title" style="margin:0;">
<i class="zmdi zmdi-usb"></i> Add USB Device - Scan Serial Number
</h5>
<a href="./displayusb.asp" class="btn btn-sm btn-secondary">
<i class="zmdi zmdi-arrow-left"></i> Back to USB Devices
</a>
</div>
<div id="scanArea">
<%
' Check for error messages
Dim errorType, errorSerial, errorMsg
errorType = Request.QueryString("error")
errorSerial = Request.QueryString("serial")
errorMsg = Request.QueryString("msg")
If errorType <> "" Then
If errorType = "invalid" Then
Response.Write("<div class='alert alert-danger alert-dismissible fade show' role='alert' style='position:relative; padding:0.75rem 3rem 0.75rem 1.25rem;'><button type='button' class='close' data-dismiss='alert' aria-label='Close' style='position:absolute; top:50%; right:1rem; transform:translateY(-50%); line-height:1; font-size:1.5rem; opacity:0.5;'><span aria-hidden='true'>&times;</span></button><strong>Invalid!</strong> Serial number must be at least 3 characters.</div>")
ElseIf errorType = "db" Then
Response.Write("<div class='alert alert-danger alert-dismissible fade show' role='alert' style='position:relative; padding:0.75rem 3rem 0.75rem 1.25rem;'><button type='button' class='close' data-dismiss='alert' aria-label='Close' style='position:absolute; top:50%; right:1rem; transform:translateY(-50%); line-height:1; font-size:1.5rem; opacity:0.5;'><span aria-hidden='true'>&times;</span></button><strong>Database Error:</strong> " & Server.HTMLEncode(errorMsg) & "</div>")
End If
Else
Response.Write("<div class='alert alert-info' style='padding:0.75rem 1.25rem;'><i class='zmdi zmdi-info'></i> <strong>Ready to scan.</strong> Point your barcode scanner at the USB serial number barcode and scan, or enter manually.</div>")
End If
%>
<form id="scanForm" method="post" action="./saveusbdirect.asp">
<div class="form-group">
<label for="serialnumber">Serial Number</label>
<div class="input-group">
<input
type="text"
class="form-control form-control-lg"
id="serialnumber"
name="serialnumber"
placeholder="Scan barcode or type serial number..."
autocomplete="off"
autofocus
style="font-size: 24px; text-align: center; padding: 20px; font-family: monospace; letter-spacing: 2px;">
<div class="input-group-append">
<button type="button" class="btn btn-info btn-lg" id="generateBtn" title="Generate random 8-digit serial">
<i class="zmdi zmdi-refresh"></i> Generate
</button>
</div>
</div>
</div>
<div class="form-group">
<label for="alias">Name/Label (optional)</label>
<input
type="text"
class="form-control"
id="alias"
name="alias"
placeholder="e.g., Blue 32GB, Red Kingston..."
maxlength="50">
</div>
<div class="form-group">
<label for="businessunitid">Business Unit (optional)</label>
<select class="form-control" id="businessunitid" name="businessunitid">
<option value="">-- Select Business Unit --</option>
<%
Dim rsBU, strBUSQL
strBUSQL = "SELECT businessunitid, businessunit FROM businessunits WHERE isactive = 1 ORDER BY businessunit ASC"
Set rsBU = objConn.Execute(strBUSQL)
While Not rsBU.EOF
Response.Write("<option value='" & rsBU("businessunitid") & "'>" & Server.HTMLEncode(rsBU("businessunit") & "") & "</option>")
rsBU.MoveNext
Wend
rsBU.Close
Set rsBU = Nothing
%>
</select>
</div>
<div class="text-center" style="margin-top:20px;">
<button type="submit" class="btn btn-primary btn-lg">
<i class="zmdi zmdi-plus-circle"></i> Add USB Device
</button>
</div>
</form>
<!-- Barcode Preview Section -->
<div id="barcodeSection" style="display:none; margin-top:30px; border-top:1px solid #444; padding-top:20px;">
<h6><i class="zmdi zmdi-label"></i> Barcode Label Preview</h6>
<p class="text-muted small">Print this on a Uline sticker label. Click the barcode to print.</p>
<div id="barcodePreview" style="background:#fff; padding:10px; display:inline-block; border-radius:4px; cursor:pointer;" onclick="printBarcode()" title="Click to print">
<svg id="barcodeSvg"></svg>
</div>
<div style="margin-top:10px;">
<button type="button" class="btn btn-sm btn-outline-light" onclick="printBarcode()">
<i class="zmdi zmdi-print"></i> Quick Print
</button>
<a id="labelPageLink" href="#" target="_blank" class="btn btn-sm btn-outline-info" style="display:none;">
<i class="zmdi zmdi-label"></i> Print Label Page
</a>
</div>
</div>
</div>
<div id="successArea" style="display:none;">
<div class="alert alert-success" style="padding:0.75rem 1.25rem;">
<strong>USB device added successfully!</strong>
<div style="margin-top:10px; font-size:20px; font-family:monospace; letter-spacing:1px;" id="addedSerial"></div>
</div>
<div class="text-center" style="margin-top:20px;">
<p class="text-muted">Ready for next scan in <span id="countdown">2</span> seconds...</p>
<div class="spinner-border text-primary" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- End container-fluid-->
</div><!--End content-wrapper-->
<!--Start Back To Top Button-->
<a href="javaScript:void();" class="back-to-top"><i class="fa fa-angle-double-up"></i> </a>
<!--End Back To Top Button-->
<!--Start footer-->
<footer class="footer">
<div class="container">
<div class="text-center">
</div>
</div>
</footer>
<!--End footer-->
</div><!--End wrapper-->
<!-- Bootstrap core JavaScript-->
<script src="assets/js/jquery.min.js"></script>
<script src="assets/js/popper.min.js"></script>
<script src="assets/js/bootstrap.min.js"></script>
<!-- simplebar js -->
<script src="assets/plugins/simplebar/js/simplebar.js"></script>
<!-- sidebar-menu js -->
<script src="assets/js/sidebar-menu.js"></script>
<!-- Custom scripts -->
<script src="assets/js/app-script.js"></script>
<script>
$(document).ready(function() {
// Auto-focus on page load
$('#serialnumber').focus();
// Check if we just added a device (query string parameter)
var urlParams = new URLSearchParams(window.location.search);
var addedSerial = urlParams.get('added');
var hasError = urlParams.get('error');
if (addedSerial) {
// Show success message
$('#scanArea').hide();
$('#successArea').show();
$('#addedSerial').text(addedSerial);
// Countdown and reset
var countdownSeconds = 2;
$('#countdown').text(countdownSeconds);
var countdownInterval = setInterval(function() {
countdownSeconds--;
$('#countdown').text(countdownSeconds);
if (countdownSeconds <= 0) {
clearInterval(countdownInterval);
// Redirect back to clean page
window.location.href = './addusb.asp';
}
}, 1000);
} else if (hasError) {
// Clear the input field and refocus after error
$('#serialnumber').val('').focus();
}
// Generate random 8-digit serial number
$('#generateBtn').on('click', function() {
var serial = generateSerial();
$('#serialnumber').val(serial);
updateBarcode(serial);
});
// Update barcode when serial number changes
$('#serialnumber').on('input', function() {
var serial = $(this).val().trim();
if (serial.length >= 3) {
updateBarcode(serial);
} else {
$('#barcodeSection').hide();
}
});
// Validate form before submission
$('#scanForm').on('submit', function(e) {
var serial = $('#serialnumber').val().trim();
if (serial.length < 3) {
e.preventDefault();
alert('Serial number must be at least 3 characters');
$('#serialnumber').val('').focus();
return false;
}
});
});
// Generate random 8-digit serial number
function generateSerial() {
var min = 10000000; // 8 digits minimum
var max = 99999999; // 8 digits maximum
return Math.floor(Math.random() * (max - min + 1)) + min;
}
// Update barcode preview
function updateBarcode(serial) {
if (serial && serial.length >= 3) {
try {
JsBarcode("#barcodeSvg", serial, {
format: "CODE128",
width: 1.5,
height: 30,
displayValue: true,
fontSize: 12,
margin: 5,
textMargin: 2
});
$('#barcodeSection').show();
$('#labelPageLink').attr('href', './usbsingle.asp?serial=' + encodeURIComponent(serial)).show();
} catch (e) {
console.error('Barcode error:', e);
$('#barcodeSection').hide();
$('#labelPageLink').hide();
}
} else {
$('#barcodeSection').hide();
$('#labelPageLink').hide();
}
}
// Print barcode label
function printBarcode() {
var serial = $('#serialnumber').val().trim();
if (!serial) {
alert('Please enter a serial number first');
return;
}
// Create print window with just the barcode
var printWindow = window.open('', '_blank', 'width=300,height=200');
printWindow.document.write('<html><head><title>USB Label - ' + serial + '</title>');
printWindow.document.write('<style>');
printWindow.document.write('body { margin: 0; padding: 5px; font-family: Arial, sans-serif; }');
printWindow.document.write('.label { text-align: center; }');
printWindow.document.write('@media print { @page { size: 1in 0.5in; margin: 0; } }');
printWindow.document.write('</style>');
printWindow.document.write('<scr' + 'ipt src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></scr' + 'ipt>');
printWindow.document.write('</head><body>');
printWindow.document.write('<div class="label">');
printWindow.document.write('<svg id="printBarcode"></svg>');
printWindow.document.write('</div>');
printWindow.document.write('<scr' + 'ipt>');
printWindow.document.write('JsBarcode("#printBarcode", "' + serial + '", {');
printWindow.document.write(' format: "CODE128",');
printWindow.document.write(' width: 1.2,');
printWindow.document.write(' height: 25,');
printWindow.document.write(' displayValue: true,');
printWindow.document.write(' fontSize: 10,');
printWindow.document.write(' margin: 2,');
printWindow.document.write(' textMargin: 1');
printWindow.document.write('});');
printWindow.document.write('setTimeout(function() { window.print(); window.close(); }, 300);');
printWindow.document.write('</scr' + 'ipt>');
printWindow.document.write('</body></html>');
printWindow.document.close();
}
</script>
</body>
</html>
Reference in New Issue View Git Blame Copy Permalink