ooke

packages/monitoring_repository/lib/src/models/evaporasi.dart

@@ -19,18 +19,27 @@ class Evaporasi {
   );
 
   factory Evaporasi.fromJson(Map<dynamic, dynamic> json) {
-    final int jam = (json['jam'] ?? 0) as int;
-    final int menit = (json['menit'] ?? 0) as int;
-
     final now = DateTime.now();
+    DateTime timestamp = now;
+
+    final waktuStr = json['waktu'] as String?;
+    if (waktuStr != null) {
+      final parts = waktuStr.split(':');
+      if (parts.length >= 2) {
+        final jam = int.tryParse(parts[0]) ?? 0;
+        final menit = int.tryParse(parts[1]) ?? 0;
+        final detik = parts.length >= 3 ? (int.tryParse(parts[2]) ?? 0) : 0;
+        timestamp = DateTime(now.year, now.month, now.day, jam, menit, detik);
+      }
+    }
 
     return Evaporasi(
       evaporasi: (json['evaporasi'] ?? 0).toDouble(),
-      suhu: (json['suhu'] ?? 0).toDouble(),
+      suhu: (json['suhu_air'] ?? 0).toDouble(),
       tinggiAir: (json['tinggi_air'] ?? 0).toDouble(),
 
       /// 🔥 bikin timestamp dari jam & menit
-      timestamp: DateTime(now.year, now.month, now.day, jam, menit),
+      timestamp: timestamp,
     );
   }
 }