fixes

main.py

@@ -34,7 +34,9 @@ def get_db():
         db.close()
 
 def calculate_voltage_drop(voltage, load, length, resistance):
-    voltage_drop = load * length * resistance
+
+    resistance_in_ohms = resistance / 1000  # Convert mΩ/m to Ω/m
+    voltage_drop = load * 2*length * resistance_in_ohms
     final_voltage = voltage - voltage_drop
     if final_voltage < 0:
         final_voltage = 0

static/cg.js

@@ -1,10 +1,8 @@
 document.addEventListener('DOMContentLoaded', function() {
-    // Handle form submission for Crystal Grid calculator
     const cgForm = document.getElementById('cg-calculator-form');
-    const cgCalculateButton = document.querySelector('.btn-cg-calculate'); // Select the calculate button
-    
+    const cgCalculateButton = document.querySelector('.btn-cg-calculate');
+
     if (cgForm && cgCalculateButton) {
-        // Check form validity and toggle the calculate button state
         function checkFormValidity() {
             const isValid = cgForm.checkValidity();
             if (isValid) {
@@ -16,19 +14,14 @@ document.addEventListener('DOMContentLoaded', function() {
             }
         }
 
-        // Initial check on page load
         checkFormValidity();
-
-        // Add event listener to check form validity on input change
         cgForm.addEventListener('input', checkFormValidity);
 
-        // Handle form submission
         cgForm.addEventListener('submit', async function(event) {
-            event.preventDefault();  // Prevent the default form submission
+            event.preventDefault();
 
             const formData = new FormData(cgForm);
-            
-            // Get the selected LED type, which includes both voltage and power
+
             const [voltage, ledPower] = formData.get('led_type').split(',').map(Number);
             const cableLength = parseFloat(formData.get('cable_length')) || 3;
             const awg = formData.get('awg') || null;
@@ -38,69 +31,69 @@ document.addEventListener('DOMContentLoaded', function() {
 
             if (awg && voltage && cableLength) {
                 try {
-                    const response = await fetch(`/get_resistance/${awg}`);
-                    if (response.ok) {
-                        const { resistance } = await response.json();
-
-                        let resultsHtml = '';
-                        const totalLEDs = levels && ledsPerLevel ? levels * ledsPerLevel : null;
-                        const levelHeight = fixtureHeight && levels ? fixtureHeight / levels : null;
-
-                        if (totalLEDs !== null && levelHeight !== null) {
-                            const totalPower = totalLEDs * ledPower;
-                            const current = totalPower / voltage;
-                            let remainingVoltage = voltage;
-                            const initialVoltage = voltage; // Store the initial voltage for percentage calculation
-                            let finalVoltage = voltage; // Track final voltage for drop percentage
-
-                            // Total LEDs
-                            resultsHtml += `<p>Total LEDs: ${totalLEDs} pcs</p>`;
-                            resultsHtml += `<p>&nbsp;</p>`;  // non-breaking space,
-
-                            // Calculate and display voltage for each level
-                            for (let i = 1; i <= levels; i++) {
-                                const length = i * levelHeight + cableLength;
-                                const voltageDrop = calculateVoltageDrop(current, length, resistance);
+                    const resistanceResponse = await fetch(`/get_resistance/${awg}`);
+                    if (resistanceResponse.ok) {
+                        const { resistance } = await resistanceResponse.json();
+
+                        const totalLEDs = levels * ledsPerLevel;
+                        const initialCurrent = (totalLEDs * ledPower) / voltage;
+                        let remainingVoltage = voltage;
+                        const levelHeight = fixtureHeight / levels;
+
+                        let resultsHtml = `<p>Total LEDs: ${totalLEDs} pcs</p><br>`;
+
+                        let accumulatedLength = cableLength;
+                        let currentLoad = totalLEDs * ledPower;
+
+                        for (let i = 1; i <= levels; i++) {
+                            const ledsAtThisLevel = ledsPerLevel * (levels - i + 1);
+                            currentLoad = ledsAtThisLevel * ledPower;
+                            const current = currentLoad / remainingVoltage;
+
+                            const calculationResponse = await fetch('/calculate', {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json'
+                                },
+                                body: JSON.stringify({
+                                    cables: [{
+                                        voltage: remainingVoltage,
+                                        load: current,
+                                        length: accumulatedLength,
+                                        cable_type: awg
+                                    }]
+                                })
+                            });
+
+                            if (calculationResponse.ok) {
+                                const resultData = await calculationResponse.json();
+                                const voltageDrop = resultData[0].voltage_drop;
                                 remainingVoltage -= voltageDrop;
 
-                                // Ensure voltage doesn't go below 0
                                 if (remainingVoltage < 0) remainingVoltage = 0;
 
-                                // Determine the color based on the voltage drop percentage
                                 let colorClass = '';
-                                const currentDropPercentage = ((initialVoltage - remainingVoltage) / initialVoltage) * 100;
-                                if (currentDropPercentage > 10) {
+                                const voltageDropPercentage = ((voltage - remainingVoltage) / voltage) * 100;
+                                if (voltageDropPercentage > 10) {
                                     colorClass = 'red-text';
-                                } else if (currentDropPercentage > 5) {
+                                } else if (voltageDropPercentage > 5) {
                                     colorClass = 'orange-text';
                                 }
 
-                                resultsHtml += `<p class="${colorClass}">Level ${i} Voltage: ${remainingVoltage.toFixed(2)} V</p>`;
-                                finalVoltage = remainingVoltage; // Update final voltage after each level
-                            }
-
-                            // Calculate the percentage drop from initial voltage to final voltage
+                                resultsHtml += `<p class="${colorClass}">Level ${i}: Final Voltage: ${remainingVoltage.toFixed(2)} V</p>`;
 
-                            const voltageDropPercentage = ((initialVoltage - finalVoltage) / initialVoltage) * 100;
-                            
-                            // print the voltage drop percentage:
-                            //console.log(`Voltage Drop Percentage: ${voltageDropPercentage.toFixed(2)}%`);
-
-                            let colorClass = '';
-
-                            if (voltageDropPercentage > 10) {
-                                colorClass = 'red-text';
-                            } else if (voltageDropPercentage > 5) {
-                                colorClass = 'orange-text';
+                                // Add length for the next level
+                                accumulatedLength += levelHeight;
+                            } else {
+                                console.error("Error calculating voltage drop:", calculationResponse.statusText);
+                                document.getElementById('result').innerHTML = `<p>Error: Unable to calculate voltage drop.</p>`;
+                                return;
                             }
-                            resultsHtml += `<p>&nbsp;</p>`;             
-                            resultsHtml += `<p class="${colorClass}">Voltage Drop: ${voltageDropPercentage.toFixed(2)}%</p>`;
-                        } else {
-                            resultsHtml = `<p>Partial data provided. Calculation incomplete.</p>`;
                         }
+
                         document.getElementById('result').innerHTML = resultsHtml;
                     } else {
-                        console.error("Error fetching resistance:", response.statusText);
+                        console.error("Error fetching resistance:", resistanceResponse.statusText);
                         document.getElementById('result').innerHTML = `<p>Error: Unable to fetch cable resistance.</p>`;
                     }
                 } catch (error) {
@@ -108,13 +101,8 @@ document.addEventListener('DOMContentLoaded', function() {
                     document.getElementById('result').innerHTML = `<p>Error: An unexpected error occurred.</p>`;
                 }
             } else {
-                document.getElementById('result').innerHTML = `<p>Please provide at least the Number of Levels.</p>`;
+                document.getElementById('result').innerHTML = `<p>Please provide all required fields.</p>`;
             }
         });
     }
-
-    // Function to calculate voltage drop
-    function calculateVoltageDrop(current, length, resistance) {
-        return current * length * resistance;
-    }
 });

templates/edit_cables.html

@@ -19,7 +19,7 @@
                     <input type="text" id="type" name="type" required>
                 </div>
                 <div class="form-row">
-                    <label for="resistance">Resistance:</label>
+                    <label for="resistance">Resistance (mΩ/m):</label>
                     <input type="number" step="0.01" id="resistance" name="resistance" required>
                 </div>
                 <div class="form-group">
@@ -40,7 +40,7 @@
                         <input type="text" id="type" name="type" value="{{ cable.type }}" required>
                     </div>
                     <div class="form-row">
-                        <label for="resistance">Resistance (Ω/m):</label>
+                        <label for="resistance">Resistance (mΩ/m):</label>
                         <input type="number" step="0.00001" id="resistance" name="resistance" value="{{ cable.resistance }}" required>
                     </div>
                     <div class="btn-group">