Update main.py

main.py

@@ -427,29 +427,53 @@ def get_admin_overview():
                 email = auth_user.email
             except:
                 email = "Deleted User"
+            
             users_list.append({
                 'uid': uid,
                 'email': email,
                 'daily_cash': user_data.get('daily_cash', 0),
                 'remaining_cash': user_data.get('remaining_cash', 0),
-                'last_reset': user_data.get('last_reset'),
+                'last_reset': last_reset,
                 'is_admin': user_data.get('is_admin', False)
             })
-
+            
         transactions_ref = db.reference('transactions')
         all_transactions = transactions_ref.get() or {}
-        transactions_list = [{'id': tid, **data} for tid, data in all_transactions.items()]
-
+        
+        transactions_list = []
+        for tid, tx_data in all_transactions.items():
+            tx_item = tx_data.copy()
+            tx_item['id'] = tid
+            
+            # Format date if it exists
+            if 'date' in tx_item:
+                try:
+                    # Parse the date and convert to ISO format
+                    parsed_date = pd.to_datetime(tx_item['date'], errors='coerce')
+                    if pd.notnull(parsed_date):
+                        tx_item['date'] = parsed_date.isoformat()
+                    else:
+                        tx_item['date'] = '2000-01-01T00:00:00'
+                except:
+                    # Default date if parsing fails
+                    tx_item['date'] = '2000-01-01T00:00:00'
+                    
+            transactions_list.append(tx_item)
+        
+        # Replace NaN with None for JSON serialization
+        transactions_list = pd.DataFrame(transactions_list).replace({np.nan: None}).to_dict(orient='records') if transactions_list else []
+        
         return jsonify({
             'users': users_list,
             'transactions': transactions_list,
             'analytics': {
                 'total_users': len(users_list),
                 'total_transactions': len(transactions_list),
-                'total_spent': sum(t['total'] for t in transactions_list)
+                'total_spent': sum(t.get('total', 0) for t in transactions_list)
             }
         })
     except Exception as e:
+        print(f"Error in admin overview: {e}")
         return jsonify({'error': str(e)}), 500
 
 @app.route('/api/admin/users', methods=['POST'])