Add Warehouse Location
{% if message %}
{{ message }}
@@ -81,7 +22,7 @@
Add Location
-
+
Import Locations from CSV
-
-
-
+
+
+
+
+
Warehouse Locations
+
+ Click on a row to select a location for printing
+
+
+
+
+ ID
+ Location Code
+ Size
+ Description
+
+
+
+ {% for loc in locations %}
+
+ {{ loc[0] }}
+ {{ loc[1] }}
+ {{ loc[2] or '' }}
+ {{ loc[3] or '' }}
+
+ {% endfor %}
+
+
+
+
+
+
+
+
Edit/Delete Selected Location
+
+ Select a location from the table to edit or delete it.
+
+
+ Selected:
+
+
+ ✏️ Edit Selected Location
+
+
+ 🗑️ Delete Selected Location
+
+
+
+ {% if session['role'] in ['administrator', 'management'] %}
+
+
Delete location from table
+
To delete a location, enter the ID of the location and press delete.
+
+
+
+ {% endif %}
+
Print Location Barcode
-
@@ -104,7 +109,6 @@
No location selected
-
-
-
- {% if session['role'] in ['administrator', 'management'] %}
-
-
Delete location from table
-
To delete a location, enter the ID of the location and press delete.
-
-
-
- {% endif %}
-
-
-
Warehouse Locations
-
- Click on a row to select a location for printing
+
+
+
+
+
+
+
+
Are you sure you want to delete the following location?
+
+ ID: Location Code: Size: Description:
+
+ Cancel
+ Delete Location
+
-
-
-
- ID
- Location Code
- Size
- Description
-
-
-
- {% for loc in locations %}
-
- {{ loc[0] }}
- {{ loc[1] }}
- {{ loc[2] }}
- {{ loc[3] }}
-
- {% endfor %}
-
-
@@ -369,6 +351,13 @@ document.addEventListener('DOMContentLoaded', function() {
const locationRows = document.querySelectorAll('.location-row');
const locationCodeDisplay = document.getElementById('location-code-display');
const printButton = document.getElementById('print-barcode-btn');
+ const editButton = document.getElementById('edit-location-btn');
+ const deleteButton = document.getElementById('delete-location-btn');
+ const noSelectionMessage = document.getElementById('no-selection-message');
+ const selectedLocationInfo = document.getElementById('selected-location-info');
+ const selectedLocationDisplay = document.getElementById('selected-location-display');
+
+ let selectedLocation = null;
locationRows.forEach(row => {
row.addEventListener('click', function() {
@@ -378,22 +367,49 @@ document.addEventListener('DOMContentLoaded', function() {
// Select this row
this.classList.add('selected');
- // Get location code
+ // Get location data
selectedLocationCode = this.dataset.locationCode;
+ selectedLocation = {
+ id: this.cells[0].textContent,
+ code: this.cells[1].textContent,
+ size: this.cells[2].textContent,
+ description: this.cells[3].textContent
+ };
// Update display
locationCodeDisplay.textContent = selectedLocationCode;
+ selectedLocationDisplay.textContent = `${selectedLocation.code} (ID: ${selectedLocation.id})`;
+
+ // Show/hide selection info
+ noSelectionMessage.style.display = 'none';
+ selectedLocationInfo.style.display = 'block';
// Generate barcode
generateLocationBarcode(selectedLocationCode);
- // Enable print button
+ // Enable buttons
printButton.disabled = false;
+ editButton.disabled = false;
+ deleteButton.disabled = false;
showNotification(`📍 Selected location: ${selectedLocationCode}`, 'info');
});
});
+ // Edit button functionality
+ editButton.addEventListener('click', function() {
+ if (selectedLocation) {
+ openEditModal(selectedLocation);
+ }
+ });
+
+ // Delete button functionality
+ deleteButton.addEventListener('click', function() {
+ if (selectedLocation) {
+ openDeleteModal(selectedLocation);
+ }
+ });
+
// Initialize QZ Tray
initializeQZTray();
});
@@ -519,5 +535,111 @@ async function testQZConnection() {
// Add test button functionality (for debugging - can be removed in production)
console.log('🔧 QZ Tray test function available: testQZConnection()');
+
+// Modal Functions for Edit/Delete
+function openEditModal(location) {
+ document.getElementById('edit-location-id').value = location.id;
+ document.getElementById('edit-location-code').value = location.code;
+ document.getElementById('edit-size').value = location.size || '';
+ document.getElementById('edit-description').value = location.description || '';
+ document.getElementById('edit-modal').style.display = 'flex';
+}
+
+function closeEditModal() {
+ document.getElementById('edit-modal').style.display = 'none';
+}
+
+function openDeleteModal(location) {
+ document.getElementById('delete-confirm-id').textContent = location.id;
+ document.getElementById('delete-confirm-code').textContent = location.code;
+ document.getElementById('delete-confirm-size').textContent = location.size || '-';
+ document.getElementById('delete-confirm-description').textContent = location.description || '-';
+ document.getElementById('delete-modal').style.display = 'flex';
+}
+
+function closeDeleteModal() {
+ document.getElementById('delete-modal').style.display = 'none';
+}
+
+// Handle edit form submission
+document.getElementById('edit-form').addEventListener('submit', function(e) {
+ e.preventDefault();
+
+ const formData = new FormData(this);
+ const data = {
+ location_id: formData.get('location_id'),
+ location_code: formData.get('location_code'),
+ size: formData.get('size'),
+ description: formData.get('description')
+ };
+
+ // Send update request
+ fetch('/update_location', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(data)
+ })
+ .then(response => response.json())
+ .then(result => {
+ if (result.success) {
+ showNotification('✅ Location updated successfully!', 'success');
+ closeEditModal();
+ // Reload page to show changes
+ setTimeout(() => window.location.reload(), 1000);
+ } else {
+ showNotification('❌ Error updating location: ' + result.error, 'error');
+ }
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ showNotification('❌ Error updating location: ' + error.message, 'error');
+ });
+});
+
+// Handle delete confirmation
+function confirmDelete() {
+ const locationId = document.getElementById('delete-confirm-id').textContent;
+
+ // Send delete request
+ fetch('/delete_location', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ location_id: locationId })
+ })
+ .then(response => response.json())
+ .then(result => {
+ if (result.success) {
+ showNotification('✅ Location deleted successfully!', 'success');
+ closeDeleteModal();
+ // Reload page to show changes
+ setTimeout(() => window.location.reload(), 1000);
+ } else {
+ showNotification('❌ Error deleting location: ' + result.error, 'error');
+ }
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ showNotification('❌ Error deleting location: ' + error.message, 'error');
+ });
+}
+
+// Close modals when clicking outside
+window.addEventListener('click', function(event) {
+ const editModal = document.getElementById('edit-modal');
+ const deleteModal = document.getElementById('delete-modal');
+
+ if (event.target === editModal) {
+ closeEditModal();
+ }
+ if (event.target === deleteModal) {
+ closeDeleteModal();
+ }
+});
+
+
{% endblock %}
diff --git a/py_app/app/templates/login.html b/py_app/app/templates/login.html
index d09fab4..343ccd5 100755
--- a/py_app/app/templates/login.html
+++ b/py_app/app/templates/login.html
@@ -2,6 +2,10 @@
{% block title %}Login{% endblock %}
+{% block head %}
+
diff --git a/py_app/app/warehouse.py b/py_app/app/warehouse.py
index 43e80e8..e897312 100755
--- a/py_app/app/warehouse.py
+++ b/py_app/app/warehouse.py
@@ -218,3 +218,59 @@ def generate_location_label_pdf():
except Exception as e:
print(f"Error generating location label PDF: {e}")
return jsonify({'error': str(e)}), 500
+
+def update_location(location_id, location_code, size, description):
+ """Update an existing warehouse location"""
+ try:
+ conn = get_db_connection()
+ cursor = conn.cursor()
+
+ # Check if location exists
+ cursor.execute("SELECT id FROM warehouse_locations WHERE id = ?", (location_id,))
+ if not cursor.fetchone():
+ conn.close()
+ return {"success": False, "error": "Location not found"}
+
+ # Check if location code already exists for different location
+ cursor.execute("SELECT id FROM warehouse_locations WHERE location_code = ? AND id != ?", (location_code, location_id))
+ if cursor.fetchone():
+ conn.close()
+ return {"success": False, "error": "Location code already exists"}
+
+ # Update location
+ cursor.execute(
+ "UPDATE warehouse_locations SET location_code = ?, size = ?, description = ? WHERE id = ?",
+ (location_code, size if size else None, description, location_id)
+ )
+ conn.commit()
+ conn.close()
+
+ return {"success": True, "message": "Location updated successfully"}
+
+ except Exception as e:
+ print(f"Error updating location: {e}")
+ return {"success": False, "error": str(e)}
+
+def delete_location_by_id(location_id):
+ """Delete a warehouse location by ID"""
+ try:
+ conn = get_db_connection()
+ cursor = conn.cursor()
+
+ # Check if location exists
+ cursor.execute("SELECT location_code FROM warehouse_locations WHERE id = ?", (location_id,))
+ location = cursor.fetchone()
+ if not location:
+ conn.close()
+ return {"success": False, "error": "Location not found"}
+
+ # Delete location
+ cursor.execute("DELETE FROM warehouse_locations WHERE id = ?", (location_id,))
+ conn.commit()
+ conn.close()
+
+ return {"success": True, "message": f"Location '{location[0]}' deleted successfully"}
+
+ except Exception as e:
+ print(f"Error deleting location: {e}")
+ return {"success": False, "error": str(e)}
diff --git a/py_app/instance/external_server.conf b/py_app/instance/external_server.conf
index a03a8b9..271cc7b 100755
--- a/py_app/instance/external_server.conf
+++ b/py_app/instance/external_server.conf
@@ -1,5 +1,5 @@
server_domain=localhost
port=3602
-database_name=recticel
-username=sa
-password=12345678
+database_name=trasabilitate_database
+username=trasabilitate
+password=Initial01!