Update app.py

app.py

@@ -1,129 +1,134 @@
 import streamlit as st
 import pandas as pd
-import json
 import os
-import datetime
 
-# ──────────────── CONFIG ────────────────
+# ---------- Constants ----------
 CONTACT_FILE = "contacts.xlsx"
 MATRIX_FILE = "channel_matrix.xlsx"
-SAVE_FILE = "saved_lists.json"
+SAVED_LISTS_FILE = "saved_lists.csv"
 
-st.set_page_config(page_title="Skype Tool + Channel Matrix", layout="wide")
-st.markdown("<style>div[data-testid='stDataFrame'] div[contenteditable='true']{pointer-events: none;}</style>", unsafe_allow_html=True)
+TAGS = ["+mini", "+hdy", "+smx", "+pmx", "+cape", "+med", "+atl", "+rsea", "+safr", "+pg", "+wci", "+eci", "+seas", "+feast", "+nopac", "+aus", "+indo"]
 
-tabs = st.tabs(["Contact Filter", "Channel Matrix Checker"])
-
-# ──────────────── LOAD CONTACTS ────────────────
+# ---------- Load Contacts ----------
 @st.cache_data
 def load_contacts():
     df = pd.read_excel(CONTACT_FILE)
-    df["display_name"] = df["display_name"].astype(str).str.strip()
     if "country" not in df.columns:
         df["country"] = "N/A"
+    df["display_name"] = df["display_name"].astype(str)
+    df["checkbox"] = False
     return df
 
-# ──────────────── LOAD MATRIX ────────────────
-@st.cache_data
-def load_matrix():
-    return pd.read_excel(MATRIX_FILE)
-
-# ──────────────── LOAD SAVED LISTS ────────────────
+# ---------- Load Saved Lists ----------
 def load_saved_lists():
-    if os.path.exists(SAVE_FILE):
-        with open(SAVE_FILE, "r") as f:
-            return json.load(f)
-    return {}
-
-def save_lists(data):
-    with open(SAVE_FILE, "w") as f:
-        json.dump(data, f, indent=2)
-
-# ──────────────── TAB 1 ────────────────
-with tabs[0]:
-    st.title("📒 Skype Contact Filter Tool")
-
-    TAGS = ["+mini", "+hdy", "+smx", "+pmx", "+cape", "+med", "+atl", "+rsea",
-            "+safr", "+pg", "+wci", "+eci", "+seas", "+feast", "+nopac", "+aus", "+aust"]
+    if os.path.exists(SAVED_LISTS_FILE):
+        return pd.read_csv(SAVED_LISTS_FILE)
+    return pd.DataFrame(columns=["list_name", "contacts", "tags", "timestamp"])
+
+def save_list(list_name, selected_contacts, tags):
+    existing = load_saved_lists()
+    contacts_str = ";".join(selected_contacts)
+    tags_str = ";".join(tags)
+    timestamp = pd.Timestamp.now().strftime("%Y-%m-%d %H:%M:%S")
+    new_row = pd.DataFrame([{
+        "list_name": list_name,
+        "contacts": contacts_str,
+        "tags": tags_str,
+        "timestamp": timestamp
+    }])
+    updated = pd.concat([existing, new_row], ignore_index=True)
+    updated.to_csv(SAVED_LISTS_FILE, index=False)
+
+# ---------- UI: Filter + Tick ----------
+def contact_filter_ui():
+    st.markdown("### 🔍 Filter Contacts")
+    st.markdown("Use the checkboxes below to filter by tags. Use AND / OR logic to combine tags.")
+
+    logic = st.radio("Matching logic:", ["AND", "OR"], horizontal=True)
+    selected_tags = st.multiselect("Filter by Tags", options=TAGS)
 
     df = load_contacts()
-    df["checkbox"] = False
 
-    selected_tags = st.multiselect("Filter by Tags:", TAGS)
-    filter_logic = st.radio("Logic for Tags", ["AND", "OR"], horizontal=True)
+    # Tag filtering
+    if selected_tags:
+        if logic == "AND":
+            mask = df["tags"].apply(lambda x: all(tag in str(x).split() for tag in selected_tags))
+        else:
+            mask = df["tags"].apply(lambda x: any(tag in str(x).split() for tag in selected_tags))
+        df = df[mask]
+
+    # Display
+    st.markdown("### ✅ Tick Contacts to Save in a List")
+    edited_df = st.data_editor(
+        df[["display_name", "country", "checkbox"]],
+        use_container_width=True,
+        key="editor"
+    )
 
-    query = st.text_input("🔍 Search Contact Name (optional):").lower()
+    ticked = edited_df[edited_df["checkbox"] == True]["display_name"].tolist()
 
-    def tag_match(row):
-        if not selected_tags:
-            return True
-        row_tags = [tag for tag in TAGS if tag in str(row)]
-        if filter_logic == "AND":
-            return all(tag in row_tags for tag in selected_tags)
+    st.markdown("---")
+    st.markdown("### 💾 Save Current Selection")
+    list_name = st.text_input("List Name")
+    if st.button("Save List"):
+        if not list_name:
+            st.error("Please enter a name for the list.")
+        elif not ticked:
+            st.warning("No contacts selected.")
         else:
-            return any(tag in row_tags for tag in selected_tags)
-
-    filtered_df = df[df.apply(tag_match, axis=1)]
-    if query:
-        filtered_df = filtered_df[filtered_df["display_name"].str.contains(query)]
-
-    with st.expander("✅ Tick off contacts as you check them:", expanded=False):
-        edited_df = st.data_editor(filtered_df[["display_name", "country", "checkbox"]],
-                                   key="editor", use_container_width=True, num_rows="dynamic")
-
-    # Save ticked contacts
-    ticked_contacts = edited_df[edited_df["checkbox"] == True]
-    list_name = st.text_input("💾 Name this list:")
-    if st.button("Save List") and list_name:
-        saved_lists = load_saved_lists()
-        contact_names = ticked_contacts["display_name"].tolist()
-        tag_str = ", ".join(selected_tags)
-        saved_lists[list_name] = {
-            "contacts": contact_names,
-            "tags": tag_str,
-            "timestamp": str(datetime.datetime.now())
-        }
-        save_lists(saved_lists)
-        st.success(f"List '{list_name}' saved!")
+            save_list(list_name, ticked, selected_tags)
+            st.success(f"List '{list_name}' saved!")
 
     # Show saved lists
     st.markdown("---")
-    st.subheader("📂 Load or Manage Saved Lists")
-    saved_lists = load_saved_lists()
-    if saved_lists:
-        selected = st.selectbox("Select a list:", list(saved_lists.keys()))
-        if selected:
-            st.markdown(f"**Contacts in '{selected}':**")
-            st.write(saved_lists[selected]["contacts"])
-            col1, col2 = st.columns(2)
-            with col1:
-                if st.button("❌ Delete this list"):
-                    del saved_lists[selected]
-                    save_lists(saved_lists)
-                    st.success("List deleted.")
-            with col2:
-                if st.button("📝 Rename this list"):
-                    new_name = st.text_input("Enter new name:")
-                    if new_name:
-                        saved_lists[new_name] = saved_lists.pop(selected)
-                        save_lists(saved_lists)
-                        st.success("List renamed.")
-    else:
+    st.markdown("### 📂 Manage Saved Lists")
+    saved_df = load_saved_lists()
+    if saved_df.empty:
         st.info("No saved lists yet.")
+    else:
+        for _, row in saved_df.iterrows():
+            with st.expander(f"📋 {row['list_name']} ({row['timestamp']})"):
+                st.write("Tags:", row["tags"])
+                st.write("Contacts:")
+                for c in row["contacts"].split(";"):
+                    st.markdown(f"- {c}")
+
+# ---------- UI: Channel Matrix ----------
+def channel_matrix_ui():
+    st.markdown("## 🧭 Channel Matrix")
+    try:
+        matrix_df = pd.read_excel(MATRIX_FILE)
+        matrix_df = matrix_df.rename(columns={matrix_df.columns[0]: "Operator"})
+        charterers = list(matrix_df.columns[1:])
+    except Exception as e:
+        st.error("Could not load Channel Matrix. Check file formatting.")
+        st.exception(e)
+        return
+
+    selected_charterer = st.selectbox("Select a Charterer", charterers)
+
+    if selected_charterer:
+        yes_ops = matrix_df[matrix_df[selected_charterer].astype(str).str.upper() == "YES"]["Operator"]
+        no_ops = matrix_df[matrix_df[selected_charterer].astype(str).str.upper() == "NO"]["Operator"]
+
+        col1, col2 = st.columns(2)
+
+        with col1:
+            st.success(f"✅ Operators who work with us for {selected_charterer}'s cargoes:")
+            st.dataframe(yes_ops.reset_index(drop=True), use_container_width=True)
+
+        with col2:
+            st.error(f"❌ Operators who won't work with us for {selected_charterer}'s cargoes:")
+            st.dataframe(no_ops.reset_index(drop=True), use_container_width=True)
+
+# ---------- Main App ----------
+st.set_page_config(page_title="Skype Contacts", layout="wide")
+st.title("📞 Skype Contacts & Channel Matrix Tool")
+
+tabs = st.tabs(["📇 Contact Filter", "📊 Channel Matrix"])
 
-# ──────────────── TAB 2 ────────────────
-with tabs[1]:
-    st.title("🔄 Channel Matrix Checker")
-
-    matrix_df = load_matrix()
-    charterers = list(matrix_df.columns)[1:]
-    charterer = st.selectbox("Select a Charterer:", charterers)
-
-    yes_df = matrix_df[matrix_df[charterer].str.upper() == "YES"]
-    no_df = matrix_df[matrix_df[charterer].str.upper() == "NO"]
-
-    st.markdown(f"### ✅ Operators who work with us for **{charterer}**'s cargoes:")
-    st.dataframe(yes_df.iloc[:, [0]], use_container_width=True)
+with tabs[0]:
+    contact_filter_ui()
 
-    st.markdown(f"### ❌ Operators who won't work with us for **{charterer}**'s cargoes:")
-    st.dataframe(no_df.iloc[:, [0]], use_container_width=True)
+with tabs[1]:
+    channel_matrix_ui()