Update app.py

app.py

@@ -1,7 +1,6 @@
 import streamlit as st
 import pandas as pd
 import json
-import os
 import asyncio
 from datetime import datetime, timezone
 from utils import validate_input, make_certificates
@@ -20,7 +19,6 @@ async def main():
     </div>
     """, unsafe_allow_html=True)
     st.markdown("<h3 align='center'><i>Ro'yxatga olish formasi</i></h3>", unsafe_allow_html=True)
-
     st.markdown("---")
 
     with st.form("Birinchi formamiz", clear_on_submit=True):
@@ -54,11 +52,12 @@ async def main():
                     existing_data = []
 
                 # Ma'lumotlar mavjudligini tekshirish
-                exact_match = next((item for item in existing_data if item["F.I.SH"] == fish or item["Email"] == email or item["Telefon raqam"] == phone or item["Maqola mavzusi"] == maqola), None)
+                existing_item = next((item for item in existing_data if item["F.I.SH"] == fish or item["Email"] == email or item["Telefon raqam"] == phone), None)
+                maqola_match = next((item for item in existing_data if item["Maqola mavzusi"] == maqola), None)
                 
-                if exact_match:
-                    certificate_link = exact_match["Sertifikat manzili"]
-                    sertifikat_vaqt_utc = datetime.strptime(exact_match["Sertifikat olingan vaqt"], "%Y-%m-%d %H:%M:%S").replace(tzinfo=timezone.utc)
+                if existing_item and maqola_match:
+                    certificate_link = existing_item["Sertifikat manzili"]
+                    sertifikat_vaqt_utc = datetime.strptime(existing_item["Sertifikat olingan vaqt"], "%Y-%m-%d %H:%M:%S").replace(tzinfo=timezone.utc)
                     sertifikat_vaqt = sertifikat_vaqt_utc.astimezone(pytz.timezone('Asia/Tashkent'))
                     st.warning(f"Siz ro'yxatdan o'tgansiz! Pastda siz olgan sertifikat nusxasi mavjud. Sertifikat olgan sana: {sertifikat_vaqt.strftime('%Y-%m-%d %H:%M:%S')}", icon='⚠️')
                     st.markdown(f"[{fish}ning sertifikat fayli]({certificate_link})")
@@ -66,7 +65,7 @@ async def main():
                     sertifikat_vaqt = datetime.now(pytz.timezone('Asia/Tashkent')).strftime("%Y-%m-%d %H:%M:%S")
                     certificate_link = await make_certificates(fish, maqola)
                     st.success("Ma'lumotlar muvaffaqiyatli saqlandi", icon='💾')
-                    existing_data.append({
+                    new_entry = {
                         "F.I.SH": fish,
                         "Maqola mavzusi": maqola,
                         "Sho'ba": shuba,
@@ -74,7 +73,8 @@ async def main():
                         "Telefon raqam": phone,
                         "Sertifikat manzili": certificate_link,
                         "Sertifikat olingan vaqt": sertifikat_vaqt
-                    })
+                    }
+                    existing_data.append(new_entry)
                     with open('data.json', 'w') as f:
                         json.dump(existing_data, f, indent=4)
                     st.markdown(f"[{fish}ning sertifikat fayli]({certificate_link})")
@@ -105,4 +105,3 @@ async def main():
 
 if __name__ == "__main__":
     asyncio.run(main())
-