telemetry re-format

app.py

@@ -60,6 +60,8 @@ def sync_captures():
             for c in captures_data:
                 # Explicitly log that these are device coordinates being forwarded
                 print(f"  [DEVICE SYNC] Capture {c.get('id')}:")
+                print(f"    - Fisherman: {c.get('fishermanName')} ({c.get('idCard')})")
+                print(f"    - Port: {c.get('port')}")
                 print(f"    - Latitude: {c.get('latitude')} (captured on device)")
                 print(f"    - Longitude: {c.get('longitude')} (captured on device)")
                 print(f"    - Place: {c.get('placeName')}")

models.py

@@ -72,6 +72,18 @@ class Capture:
     fishingMethod: str
     depth: float
     synced: bool
+    # New fields from user request
+    fishermanName: Optional[str] = None
+    idCard: Optional[str] = None
+    phone: Optional[str] = None
+    association: Optional[str] = None
+    port: Optional[str] = None
+    boatDetails: Optional[str] = None
+    engineDetails: Optional[str] = None
+    fishingGear: Optional[str] = None
+    salePrice: Optional[float] = None
+    buyer: Optional[str] = None
+    
     userId: Optional[str] = None
     placeName: Optional[str] = None
     syncedAt: Optional[datetime] = None
@@ -90,6 +102,16 @@ class Capture:
             'fishingMethod': self.fishingMethod,
             'depth': self.depth,
             'synced': self.synced,
+            'fishermanName': self.fishermanName,
+            'idCard': self.idCard,
+            'phone': self.phone,
+            'association': self.association,
+            'port': self.port,
+            'boatDetails': self.boatDetails,
+            'engineDetails': self.engineDetails,
+            'fishingGear': self.fishingGear,
+            'salePrice': self.salePrice,
+            'buyer': self.buyer,
             'userId': self.userId,
             'placeName': self.placeName,
             'syncedAt': self.syncedAt.isoformat() if self.syncedAt and isinstance(self.syncedAt, datetime) else self.syncedAt,
@@ -125,6 +147,19 @@ class Capture:
             fishingMethod=data.get('fishingMethod'),
             depth=data.get('depth'),
             synced=data.get('synced', False),
+            
+            # New fields
+            fishermanName=data.get('fishermanName'),
+            idCard=data.get('idCard'),
+            phone=data.get('phone'),
+            association=data.get('association'),
+            port=data.get('port'),
+            boatDetails=data.get('boatDetails'),
+            engineDetails=data.get('engineDetails'),
+            fishingGear=data.get('fishingGear'),
+            salePrice=data.get('salePrice'),
+            buyer=data.get('buyer'),
+
             userId=data.get('userId'),
             placeName=data.get('placeName'),
             syncedAt=syncedAt,

static/js/components/capture-form.js

@@ -25,6 +25,58 @@ const CaptureFormComponent = {
                 </div>
                 
                 <form id="capture-form" onsubmit="CaptureFormComponent.submit(event)">
+                    <!-- Datos Personales -->
+                    <div class="card">
+                        <h3>👤 Datos del Pescador</h3>
+                        <div class="form-group">
+                            <label for="fisherman-name">Nombre Completo</label>
+                            <input type="text" id="fisherman-name" name="fisherman-name" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="id-card">Cédula</label>
+                            <input type="text" id="id-card" name="id-card" placeholder="000-0000000-0">
+                        </div>
+                        <div class="form-group">
+                            <label for="phone">Teléfono</label>
+                            <input type="tel" id="phone" name="phone">
+                        </div>
+                        <div class="form-group">
+                            <label for="association">Asociación/Cooperativa</label>
+                            <input type="text" id="association" name="association">
+                        </div>
+                    </div>
+
+                    <!-- Datos de la Embarcación y Arte -->
+                    <div class="card">
+                        <h3>🚤 Embarcación y Equipo</h3>
+                        <div class="form-group">
+                            <label for="port">Puerto / Desembarcadero</label>
+                            <input type="text" id="port" name="port" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="boat-details">Nombre/Matrícula Embarcación</label>
+                            <input type="text" id="boat-details" name="boat-details">
+                        </div>
+                        <div class="form-group">
+                            <label for="engine-details">Motor (HP/Marca)</label>
+                            <input type="text" id="engine-details" name="engine-details">
+                        </div>
+                        <div class="form-group">
+                            <label for="fishing-gear">Arte de Pesca Principal</label>
+                            <select id="fishing-gear" name="fishing-gear" required>
+                                <option value="">Seleccionar...</option>
+                                <option value="Línea de mano">Línea de mano</option>
+                                <option value="Nasa">Nasa</option>
+                                <option value="Red de enmalle">Red de enmalle</option>
+                                <option value="Palangre">Palangre</option>
+                                <option value="Buceo">Buceo</option>
+                                <option value="Otros">Otros</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <!-- Detalles de Captura por Especie -->
+                    <h3>🐟 Captura Específica</h3>
                     ${selectedSpecies.map((speciesId, index) => `
                         <div class="card">
                             ${speciesId === 'otro' ? `
@@ -42,7 +94,6 @@ const CaptureFormComponent = {
                             `}
                             
                             <div class="form-group">
-...
                                 <label for="quantity-${index}">Cantidad</label>
                                 <input 
                                     type="number" 
@@ -65,8 +116,9 @@ const CaptureFormComponent = {
                     `).join('')}
                     
                     <div class="card">
+                        <h3>📉 Otros Detalles</h3>
                         <div class="form-group">
-                            <label for="fishing-method">Método de Pesca</label>
+                            <label for="fishing-method">Método de Pesca (General)</label>
                             <select id="fishing-method" name="fishing-method" required>
                                 <option value="">Seleccionar...</option>
                                 <option value="Línea de mano">Línea de mano</option>
@@ -89,10 +141,20 @@ const CaptureFormComponent = {
                                 required
                             >
                         </div>
+
+                        <div class="form-group">
+                            <label for="sale-price">Precio de Venta Total (RD$)</label>
+                            <input type="number" id="sale-price" name="sale-price" min="0" step="0.01">
+                        </div>
+
+                        <div class="form-group">
+                            <label for="buyer">Comprador / Destino</label>
+                            <input type="text" id="buyer" name="buyer">
+                        </div>
                     </div>
                     
                     <button type="submit" class="btn-primary btn-full">
-                        Guardar Captura
+                        Guardar Registro de Pesca
                     </button>
                 </form>
             </div>
@@ -179,6 +241,19 @@ const CaptureFormComponent = {
             items: items,
             fishingMethod: document.getElementById('fishing-method').value,
             depth: parseFloat(document.getElementById('depth').value),
+
+            // New fields
+            fishermanName: document.getElementById('fisherman-name').value,
+            idCard: document.getElementById('id-card').value,
+            phone: document.getElementById('phone').value,
+            association: document.getElementById('association').value,
+            port: document.getElementById('port').value,
+            boatDetails: document.getElementById('boat-details').value,
+            engineDetails: document.getElementById('engine-details').value,
+            fishingGear: document.getElementById('fishing-gear').value,
+            salePrice: parseFloat(document.getElementById('sale-price').value) || 0,
+            buyer: document.getElementById('buyer').value,
+
             totalWeight: items.reduce((sum, item) => sum + (item.unit === 'lbs' ? item.quantity : 0), 0),
             captureSource: 'device-gps',
             synced: 0

static/js/components/confirmation.js

@@ -42,6 +42,21 @@ const ConfirmationComponent = {
                     <h3>Resumen de Captura</h3>
                     
                     <dl>
+                        <dt>👤 Pescador</dt>
+                        <dd>
+                            <strong>${capture.fishermanName}</strong><br>
+                            ${capture.idCard ? `Cédula: ${capture.idCard}<br>` : ''}
+                            ${capture.phone ? `Tel: ${capture.phone}<br>` : ''}
+                            ${capture.association ? `Asociación: ${capture.association}` : ''}
+                        </dd>
+
+                        <dt>🚤 Embarcación y Arte</dt>
+                        <dd>
+                            <strong>Puerto: ${capture.port}</strong><br>
+                            ${capture.boatDetails ? `Barco: ${capture.boatDetails}<br>` : ''}
+                            ${capture.fishingGear ? `Arte: ${capture.fishingGear}` : ''}
+                        </dd>
+
                         <dt>📅 Fecha y Hora</dt>
                         <dd>${this.formatDate(capture.timestamp)}</dd>
                         
@@ -59,10 +74,15 @@ const ConfirmationComponent = {
                                 ${item.quantity} ${item.unit === 'lbs' ? 'libras' : 'unidades'}
                             `).join('<br>')}
                         </dd>
-                        
-                        <dt>🎣 Método de Pesca</dt>
-                        <dd>${capture.fishingMethod}</dd>
-                        
+
+                        ${capture.salePrice ? `
+                            <dt>💰 Venta</dt>
+                            <dd>
+                                RD$ ${capture.salePrice.toLocaleString()}<br>
+                                ${capture.buyer ? `Comprador: ${capture.buyer}` : ''}
+                            </dd>
+                        ` : ''}
+
                         <dt>📏 Profundidad</dt>
                         <dd>${capture.depth} brazadas</dd>
                     </dl>

static/js/components/history.js

@@ -40,9 +40,12 @@ const HistoryComponent = {
             .map(capture => `
                 <li class="history-item ${capture.synced === 1 ? 'synced' : 'unsynced'}">
                     <h3>
-                        ${this.formatDate(capture.timestamp)}
-                        ${capture.synced === 1 ? '✅' : '⏳'}
+                        ${capture.fishermanName || 'Pescador'} @ ${capture.port || 'Puerto'}
+                        <span style="float: right;">${capture.synced === 1 ? '✅' : '⏳'}</span>
                     </h3>
+                    <p style="font-size: 0.9rem; color: #444; margin-bottom: 5px;">
+                        ${this.formatDate(capture.timestamp)}
+                    </p>
                     
                     <p>
                         <strong>Especies:</strong> 
@@ -52,7 +55,7 @@ const HistoryComponent = {
                     </p>
                     
                     <p>
-                        <strong>Método:</strong> ${capture.fishingMethod} | 
+                        <strong>Arte:</strong> ${capture.fishingGear || capture.fishingMethod} | 
                         <strong>Profundidad:</strong> ${capture.depth} brazadas
                     </p>