From 35388d5f062e5b13db6d10492beba6cde08ab28c Mon Sep 17 00:00:00 2001
From: Ezra Peisach <ezra.peisach@rcsb.org>
Date: Tue, 20 Aug 2024 21:35:51 -0400
Subject: [PATCH] added table id

---
 wwpdb/apps/ann_tasks_v2/__init__.py              |  2 +-
 wwpdb/apps/ann_tasks_v2/utils/GetCovalentBond.py | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/wwpdb/apps/ann_tasks_v2/__init__.py b/wwpdb/apps/ann_tasks_v2/__init__.py
index ccabc82..7972448 100644
--- a/wwpdb/apps/ann_tasks_v2/__init__.py
+++ b/wwpdb/apps/ann_tasks_v2/__init__.py
@@ -2,4 +2,4 @@
 __author__ = "Ezra Peisach"
 __email__ = "ezra.peisach@rcsb.org"
 __license__ = "Apache 2.0"
-__version__ = "0.38"
+__version__ = "0.39"
diff --git a/wwpdb/apps/ann_tasks_v2/utils/GetCovalentBond.py b/wwpdb/apps/ann_tasks_v2/utils/GetCovalentBond.py
index 43a76a7..62853e0 100644
--- a/wwpdb/apps/ann_tasks_v2/utils/GetCovalentBond.py
+++ b/wwpdb/apps/ann_tasks_v2/utils/GetCovalentBond.py
@@ -95,6 +95,7 @@ def __processCloseContactContent(self, jsonObj):
         <br/>
         <table class="table table-bordered table-striped width100">
           <tr>
+            <th rowspan="2">Id</th>
             <th colspan="5">Atom1</th>
             <th colspan="5">Atom2</th>
             <th rowspan="2">Leaving<br/>atoms</th>
@@ -125,21 +126,21 @@ def __processCloseContactContent(self, jsonObj):
             if tupL[5]:
                 atom += "(" + tupL[5] + ")"
             #
-            tablerow += "<td>" + tupL[0] + "</td>" + "<td>" + tupL[1] + "</td>" + "<td>" + tupL[2] + tupL[3] + "</td>" + "<td>" + atom + "</td>" + "<td>" + tupL[6] + "</td>"
+            tablerow += "<td>" + tupL[16] + "</td><td>" + tupL[0] + "</td><td>" + tupL[1] + "</td><td>" + tupL[2] + tupL[3] + "</td><td>" \
+                      + atom + "</td><td>" + tupL[6] + "</td>"
             atom = tupL[11]
             if tupL[12]:
                 atom += "(" + tupL[12] + ")"
             #
-            tablerow += "<td>" + tupL[7] + "</td>" + "<td>" + tupL[8] \
-                + "</td>" + "<td>" + tupL[9] + tupL[10] + "</td>" + "<td>" \
-                + atom + "</td>" + "<td>" + tupL[13] + "</td>" + "<td>" \
-                + tupL[14] + "</td>"
+            tablerow += "<td>" + tupL[7] + "</td><td>" + tupL[8] + "</td><td>" + tupL[9] + tupL[10] + "</td><td>" + atom + "</td><td>" \
+                      + tupL[13] + "</td><td>" + tupL[14] + "</td>"
             #
             tupL[6] = tupL[6].replace("_", "-")
             tupL[13] = tupL[13].replace("_", "-")
             bond_id = "covalent_bond_" + str(count)
             #
-            tablerow += "<td>" + tupL[15] + '&nbsp; &nbsp; &nbsp; &nbsp; <input type="checkbox" id="' + bond_id + '" name="' + bond_id + '" value="' + "_".join(tupL) + '"/></td>'
+            tablerow += "<td>" + tupL[15] + '&nbsp; &nbsp; &nbsp; &nbsp; <input type="checkbox" id="' + bond_id + '" name="' + bond_id \
+                      + '" value="' + "_".join(tupL[:16]) + '"/></td>'
             #
             tablerow += "</tr>\n"
             count += 1