From 4da1739da4ef83fce4d4717972315cd2d1a3278c Mon Sep 17 00:00:00 2001
From: jerick <jerick00201@gmail.com>
Date: Sat, 29 Nov 2025 21:33:52 -0500
Subject: [PATCH] Fixed Reset Button

---
 __pycache__/main.cpython-311.pyc | Bin 15905 -> 15151 bytes
 main.py                          |  27 ---------------------------
 static/dashboard.js              |  14 +++++++++++---
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/__pycache__/main.cpython-311.pyc b/__pycache__/main.cpython-311.pyc
index d9a846e45b5f27728791afe13e2221df5ea500fa..a905f86f467afddd24bbfb957a951ea262f43f0a 100644
GIT binary patch
delta 511
zcmZ2jv%ZXPIWI340}xDT)Xu!1GLcV$anVNgC{|vEEC-M<2rO`%JdszaKFTS@A=N3~
z86wEQkj@b00>rMF3{h?=3{mb(4DJjmjx7u+PN_^;9xzqQm>C#W12F_dc``AidZsw1
zI<0Y8#sriBVyKK)s#lgbjF;lt!mtd;Sq&3lh?4b5af|Xzac^OW@=Ntk@yG^iEph}J
z$ek51`J<c|TU20b;DR8aV?|hiqJES2uqg`$!%Rq3OYuzcTH`(W1DhnH&t@+60M*Tp
z^ma3<&IGC`nhqp1Ic~8hrliCt=cgC3!vu?FfLJppA2RS^e6X3{P@9o)?qq8tOQtUj
zlgo@u+2(<y7f;^EEzC6)!~_xdC!aHNV4OOc-}n^UDj@$S!{qzM+c*{gnVQT+D<;o1
z(PCQ%<osuteAXnDF=Vr`=>bNQTkM{BC8>EO#kbf~QqvMkb4rRpL2!#dH?_DpF+CON
zF0gzN+`&aNChM5X$bju#0aD7ES_U+r2xMo`S`e{ra*DYZ*Lfh55r~T|Ht#SuW@QxF
JENaWc2mmVBg5>}J

delta 1197
zcmZuxO>7%Q6rP#&U)D)X8Ygv|wn-X7vMIz(2nSFPahxVioTg0^RB0t-Z9P-V##vXh
zPAHWtn_{UPa-f<sYD%RPXb})2;Mg-lXpJn<?xAqx1mVC1B*dGwHc;TL-shS3ef#Fy
zx3)joyi@MH*U_OOh~(R2IXZHyGlrjhHlq7QmlB(p-oXgnhinB+)X)wr?|TKLPcxKH
zc-!q6af@_|fy0q;JxOO+GCk{2S)`waoXa77o+AAWLGy?vYlzM=l3x%{{0A>C62uni
zX_kC2w?p6%$X4hnmdY=AJ39X#6KCleeVH!QkbaJxr;D$<ck%@E3+Gpa(a{^wFR%;S
ztJ0kxLHV4h28K?oc`ey<G)0#loZV62SjbjjMDePd+H(Ed!1>{xYh7{UN-oZs#Y*Wc
zFK%41GDsw1QT($=boYpF2BKj~4tWj44+F#MEPAc?IxgdF;?1Ul(bmB-qRPGyfhc&L
zP*f(=cM5Lb3IXr`7q0-Xczh}7or1t(89hBQupXen9N5=F%h#fYW#zIaqb<)BYdmii
zO<scz&NG*Jj+wOZW_q2iUt-*HI-gcM9n56wf73y0Ba>m4wWj%;wnEXMX}4KHHuGl+
z%-~L&Wo$CHtoit=Byg6`!6#n<uqr;l0SJCva_#>dCw~u0kEH5jfS=&1qTd3j?SOq?
zv=P#pA*~wS3!rf1ovT~p->d!Ksr?Ogu&EC2Axzp`sIELB%FU4*BX4OntqPZ`w<DlB
zE(J#~x(Kq^k?NrBi#AA)O?p~gD^0cErT<q0PDt1e4{lF2@Msf{+IaLwwfo&QJJe_6
zzWSl(AL8M=;G5q8&_YhopfsH+X1RP>Zjrw)S9isqFD&6d>Z$P)7~d0b#9t;6EOz5B
z4SgVK`RF_@;aLfCO8mA5zYF!`G`=lTC%+DS4#g-IeG^}VK7ysD@LlnEVl40#Yz|}5
zHp%d-_2T41Tyf{>1Q*N_GfS2er0lY>Q7G|GLFq)+;e8re23B33?>~cU*Xe?9x=GW#
zcqwP5b0%e19c89iYI)j~9sFz)`f}-qe<?va;A4{N%))O)d^mMVeGFUqS7I6UU#4F4
okM$zrzZts`v(=*we5{F&?U8PLWDf!Ssvy$8Uzw~Az0!{V0taa}1^@s6

diff --git a/main.py b/main.py
index 0d5f1dc..e5cdf08 100644
--- a/main.py
+++ b/main.py
@@ -209,33 +209,6 @@ async def api_bot_control(req: BotControl):
     return {"status": "ok", "bot_running": STATE.bot_running}
 
 
-# ============================================================
-# Reset Groups Endpoint
-# ============================================================
-
-@app.post("/api/reset_groups")
-async def reset_groups():
-	# Load existing data
-	data = load_json("assigned_groups.json")
-
-	# Clear group assignments
-	for g in data["groups"].values():
-		g.clear()
-
-	# Reset friendly assigned_group
-	for f in data["friendly_members"]:
-		f["assigned_group"] = None
-
-	# Reset enemy assigned_group
-	for e in data["enemy_members"]:
-		e["assigned_group"] = None
-
-	# Save back to file
-	save_json("assigned_groups.json", data)
-
-	return { "success": True }
-
-
 # ============================================================
 # Discord Bot Setup
 # ============================================================
diff --git a/static/dashboard.js b/static/dashboard.js
index 3b55950..23711dc 100644
--- a/static/dashboard.js
+++ b/static/dashboard.js
@@ -226,16 +226,24 @@ async function clearAssignmentsOnServer() {
 // ---------------------------
 function ensureMainListContains(member, kind) {
     const container = kind === "friendly" ? friendlyContainer : enemyContainer;
-    // If member is not in any group zone, ensure it's in the main list (append if not present)
     const parent = member.domElement?.parentElement;
-    const isInDropZone = parent && parent.classList && parent.classList.contains("drop-zone");
-    if (!isInDropZone) {
+
+    // Detect group zone: ids like "group-1-friendly" or "group-2-enemy"
+    const isInGroupZone = parent && typeof parent.id === "string" && /^group-\d+-/.test(parent.id);
+
+    // If member has no parent yet, or is in a group zone, ensure it ends up in the main list
+    if (!parent || isInGroupZone) {
+        // If it's already in the right container, nothing to do
         if (member.domElement && member.domElement.parentElement !== container) {
+            // remove from previous parent (if any) and append to main list
+            const prev = member.domElement.parentElement;
+            if (prev) prev.removeChild(member.domElement);
             container.appendChild(member.domElement);
         }
     }
 }
 
+
 function applyAssignmentsToDOM(assignments) {
     if (!assignments) return;