Updated website dockers creation scripts

Author: ltrudu

.gitignore

@@ -39,3 +39,5 @@ logcat.txt
 screenshot.png
 AI_MultiBarcodes_Capture/release/
 screenshot2.png
+WebInterface/DOCKER_CLEANUP_SAFETY.md
+WebInterface/SYMBOLOGY_MAPPING_RULES.md

AI_MultiBarcodes_Capture/src/main/AndroidManifest.xml

@@ -85,6 +85,8 @@
     <uses-permission android:name="com.symbol.emdk.permission.EMDK" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.CAMERA" />
 

AI_MultiBarcodes_Capture/src/main/java/com/zebra/ai_multibarcodes_capture/java/CapturedBarcodesActivity.java

@@ -68,6 +68,13 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import android.net.wifi.WifiManager;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkInfo;
 
 public class CapturedBarcodesActivity extends AppCompatActivity {
 
@@ -736,6 +743,11 @@ private String convertSessionDataToJson(SessionData sessionData) {
         rootObject.addProperty("device_info", deviceHostname);
         android.util.Log.d("CapturedBarcodes", "Device hostname: " + deviceHostname);
 
+        // Add device IP address
+        String deviceIP = getDeviceIPAddress();
+        rootObject.addProperty("device_ip", deviceIP);
+        android.util.Log.d("CapturedBarcodes", "Device IP address: " + deviceIP);
+
         Gson gson = new Gson();
         String jsonResult = gson.toJson(rootObject);
         android.util.Log.d("CapturedBarcodes", "JSON conversion completed successfully");
@@ -764,6 +776,48 @@ private String getDeviceHostname() {
         }
     }
 
+    private String getDeviceIPAddress() {
+        try {
+            android.util.Log.d("CapturedBarcodes", "Getting device IP address");
+
+            // First try to get WiFi IP address
+            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager != null && wifiManager.isWifiEnabled()) {
+                int ipAddress = wifiManager.getConnectionInfo().getIpAddress();
+                if (ipAddress != 0) {
+                    String wifiIP = String.format(Locale.US, "%d.%d.%d.%d",
+                            (ipAddress & 0xff),
+                            (ipAddress >> 8 & 0xff),
+                            (ipAddress >> 16 & 0xff),
+                            (ipAddress >> 24 & 0xff));
+                    android.util.Log.d("CapturedBarcodes", "WiFi IP address: " + wifiIP);
+                    return wifiIP;
+                }
+            }
+
+            // If WiFi not available, try to get IP from network interfaces
+            for (NetworkInterface networkInterface : Collections.list(NetworkInterface.getNetworkInterfaces())) {
+                for (InetAddress inetAddress : Collections.list(networkInterface.getInetAddresses())) {
+                    if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) {
+                        String hostAddress = inetAddress.getHostAddress();
+                        // Check if it's IPv4
+                        if (hostAddress != null && hostAddress.indexOf(':') < 0) {
+                            android.util.Log.d("CapturedBarcodes", "Network interface IP address: " + hostAddress);
+                            return hostAddress;
+                        }
+                    }
+                }
+            }
+
+            android.util.Log.w("CapturedBarcodes", "No valid IP address found");
+            return "0.0.0.0";
+
+        } catch (Exception e) {
+            android.util.Log.e("CapturedBarcodes", "Error getting device IP address", e);
+            return "0.0.0.0";
+        }
+    }
+
     private boolean performHttpPost(String endpointUrl, String jsonData) throws IOException {
         android.util.Log.d("CapturedBarcodes", "performHttpPost() called");
         android.util.Log.d("CapturedBarcodes", "Endpoint URL: " + endpointUrl);

WebInterface/.env

@@ -37,7 +37,7 @@ EXPOSE_MYSQL=false
 # =========================================================
 
 # Database Connection Settings
-DB_HOST=db
+DB_HOST=127.0.0.1
 DB_NAME=barcode_wms
 DB_USER=wms_user
 DB_PASS=wms_password

WebInterface/database/init.sql

@@ -2,16 +2,77 @@
 CREATE DATABASE IF NOT EXISTS barcode_wms;
 USE barcode_wms;
 
+-- Symbology Reference Table - SINGLE SOURCE OF TRUTH
+DROP TABLE IF EXISTS symbologies;
+CREATE TABLE symbologies (
+    id INT PRIMARY KEY,
+    name VARCHAR(50) NOT NULL,
+    UNIQUE KEY unique_id (id),
+    UNIQUE KEY unique_name (name)
+);
+
+-- Insert EXACT values from Android enum EBarcodesSymbologies.java
+INSERT INTO symbologies (id, name) VALUES
+(-1, 'UNKNOWN'),
+(0, 'EAN 8'),
+(1, 'EAN 13'),
+(2, 'UPC A'),
+(3, 'UPC E'),
+(4, 'AZTEC'),
+(5, 'CODABAR'),
+(6, 'CODE128'),
+(7, 'CODE39'),
+(8, 'I2OF5'),
+(9, 'GS1 DATABAR'),
+(10, 'DATAMATRIX'),
+(11, 'GS1 DATABAR EXPANDED'),
+(12, 'MAILMARK'),
+(13, 'MAXICODE'),
+(14, 'PDF417'),
+(15, 'QRCODE'),
+(16, 'DOTCODE'),
+(17, 'GRID MATRIX'),
+(18, 'GS1 DATAMATRIX'),
+(19, 'GS1 QRCODE'),
+(20, 'MICROQR'),
+(21, 'MICROPDF'),
+(22, 'USPOSTNET'),
+(23, 'USPLANET'),
+(24, 'UK POSTAL'),
+(25, 'JAPANESE POSTAL'),
+(26, 'AUSTRALIAN POSTAL'),
+(27, 'CANADIAN POSTAL'),
+(28, 'DUTCH POSTAL'),
+(29, 'US4STATE'),
+(30, 'US4STATE FICS'),
+(31, 'MSI'),
+(32, 'CODE93'),
+(33, 'TRIOPTIC39'),
+(34, 'D2OF5'),
+(35, 'CHINESE 2OF5'),
+(36, 'KOREAN 3OF5'),
+(37, 'CODE11'),
+(38, 'TLC39'),
+(39, 'HANXIN'),
+(40, 'MATRIX 2OF5'),
+(41, 'UPCE1'),
+(42, 'GS1 DATABAR LIM'),
+(43, 'FINNISH POSTAL 4S'),
+(44, 'COMPOSITE AB'),
+(45, 'COMPOSITE C');
+
 -- Table to store barcode capture sessions
 CREATE TABLE IF NOT EXISTS capture_sessions (
     id INT AUTO_INCREMENT PRIMARY KEY,
     session_timestamp DATETIME NOT NULL,
     device_info VARCHAR(500),
+    device_ip VARCHAR(45),
     total_barcodes INT DEFAULT 0,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     INDEX idx_session_timestamp (session_timestamp),
-    INDEX idx_created_at (created_at)
+    INDEX idx_created_at (created_at),
+    INDEX idx_device_ip (device_ip)
 );
 
 -- Table to store individual barcode data
@@ -35,89 +96,36 @@ CREATE TABLE IF NOT EXISTS barcodes (
     INDEX idx_processed (processed)
 );
 
--- Table to store barcode symbology mappings (based on Android app constants)
-CREATE TABLE IF NOT EXISTS symbology_types (
-    id INT PRIMARY KEY,
-    name VARCHAR(100) NOT NULL UNIQUE,
-    description VARCHAR(200),
-    active BOOLEAN DEFAULT TRUE
-);
-
--- Insert symbology types based on Android app EBarcodesSymbologies
-INSERT INTO symbology_types (id, name, description) VALUES
-(0, 'UNKNOWN', 'Unknown symbology type'),
-(1, 'AUSTRALIAN_POSTAL', 'Australian Postal barcode'),
-(2, 'AZTEC', 'Aztec 2D barcode'),
-(3, 'CANADIAN_POSTAL', 'Canadian Postal barcode'),
-(4, 'CHINESE_2OF5', 'Chinese 2 of 5 barcode'),
-(5, 'CODABAR', 'Codabar barcode'),
-(6, 'CODE11', 'Code 11 barcode'),
-(7, 'CODE39', 'Code 39 barcode'),
-(8, 'CODE93', 'Code 93 barcode'),
-(9, 'CODE128', 'Code 128 barcode'),
-(10, 'COMPOSITE_AB', 'Composite AB barcode'),
-(11, 'COMPOSITE_C', 'Composite C barcode'),
-(12, 'D2OF5', 'Discrete 2 of 5 barcode'),
-(13, 'DATAMATRIX', 'Data Matrix 2D barcode'),
-(14, 'DOTCODE', 'DotCode 2D barcode'),
-(15, 'DUTCH_POSTAL', 'Dutch Postal barcode'),
-(16, 'EAN_8', 'EAN-8 barcode'),
-(17, 'EAN_13', 'EAN-13 barcode'),
-(18, 'FINNISH_POSTAL_4S', 'Finnish Postal 4-State barcode'),
-(19, 'GRID_MATRIX', 'Grid Matrix 2D barcode'),
-(20, 'GS1_DATABAR', 'GS1 DataBar barcode'),
-(21, 'GS1_DATABAR_EXPANDED', 'GS1 DataBar Expanded barcode'),
-(22, 'GS1_DATABAR_LIM', 'GS1 DataBar Limited barcode'),
-(23, 'GS1_DATAMATRIX', 'GS1 Data Matrix barcode'),
-(24, 'GS1_QRCODE', 'GS1 QR Code barcode'),
-(25, 'HANXIN', 'Han Xin Code 2D barcode'),
-(26, 'I2OF5', 'Interleaved 2 of 5 barcode'),
-(27, 'JAPANESE_POSTAL', 'Japanese Postal barcode'),
-(28, 'KOREAN_3OF5', 'Korean 3 of 5 barcode'),
-(29, 'MAILMARK', 'Royal Mail Mailmark barcode'),
-(30, 'MATRIX_2OF5', 'Matrix 2 of 5 barcode'),
-(31, 'MAXICODE', 'MaxiCode 2D barcode'),
-(32, 'MICROPDF', 'MicroPDF417 barcode'),
-(33, 'MICROQR', 'Micro QR Code barcode'),
-(34, 'MSI', 'MSI barcode'),
-(35, 'PDF417', 'PDF417 2D barcode'),
-(36, 'QRCODE', 'QR Code 2D barcode'),
-(37, 'TLC39', 'TLC-39 barcode'),
-(38, 'TRIOPTIC39', 'Trioptic Code 39 barcode'),
-(39, 'UK_POSTAL', 'UK Postal barcode'),
-(40, 'UPC_A', 'UPC-A barcode'),
-(41, 'UPC_E', 'UPC-E barcode'),
-(42, 'UPCE1', 'UPC-E1 barcode'),
-(43, 'USPLANET', 'USPS PLANET barcode'),
-(44, 'USPOSTNET', 'USPS POSTNET barcode'),
-(45, 'US4STATE', 'USPS 4-State barcode'),
-(46, 'US4STATE_FICS', 'USPS 4-State FICS barcode');
 
 -- Create view for easy barcode data retrieval with symbology names
+DROP VIEW IF EXISTS barcode_details;
 CREATE VIEW barcode_details AS
 SELECT
     b.id,
     b.session_id,
     b.value,
     b.symbology,
-    COALESCE(st.name, 'UNKNOWN') as symbology_name,
+    COALESCE(s.name, 'UNKNOWN') as symbology_name,
     b.quantity,
     b.timestamp,
     b.processed,
     b.notes,
     b.created_at,
     cs.session_timestamp,
-    cs.device_info
+    cs.device_info,
+    cs.device_ip
 FROM barcodes b
-LEFT JOIN symbology_types st ON b.symbology = st.id
+LEFT JOIN symbologies s ON b.symbology = s.id
 LEFT JOIN capture_sessions cs ON b.session_id = cs.id;
 
 -- Create view for session statistics
+DROP VIEW IF EXISTS session_statistics;
 CREATE VIEW session_statistics AS
 SELECT
     cs.id,
     cs.session_timestamp,
     cs.device_info,
+    cs.device_ip,
     cs.created_at,
     COUNT(b.id) as total_barcodes,
     COUNT(DISTINCT b.symbology) as unique_symbologies,
@@ -128,7 +136,7 @@ SELECT
     COUNT(CASE WHEN b.processed = FALSE THEN 1 END) as pending_count
 FROM capture_sessions cs
 LEFT JOIN barcodes b ON cs.id = b.session_id
-GROUP BY cs.id, cs.session_timestamp, cs.device_info, cs.created_at;
+GROUP BY cs.id, cs.session_timestamp, cs.device_info, cs.device_ip, cs.created_at;
 
 -- Sample data for testing (optional)
 -- INSERT INTO capture_sessions (session_timestamp, device_info, total_barcodes)

WebInterface/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   multibarcode-webinterface:
     build: