itkdb-gtk 0.10.10.dev8__py3-none-any.whl → 0.11.0__py3-none-any.whl

itkdb_gtk/CreateShipments.py

@@ -41,7 +41,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         self.attachment = None
         global gtk_runs
         if gtk_runs:
-            super().__init__(session=session, title="Upload AVS Data",
+            super().__init__(session=session, title="Create Shipment",
                              help_link=help_link, gtk_runs=gtk_runs)
             self.init_window()
 
@@ -358,6 +358,8 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
 def main():
     """Main entry."""
     # main entry of the program
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -366,7 +368,7 @@ def main():
         sys.exit()
 
     client.user_gui = dlg
-    IS = CreateShipments(client)
+    IS = CreateShipments(client, help_link="{}/createShipment.html".format(HELP_LINK))
     IS.set_accept_focus(True)
     IS.present()
     IS.connect("destroy", Gtk.main_quit)

itkdb_gtk/GetShipments.py

@@ -136,6 +136,12 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         btn.connect("clicked", self.receive_items)
         grid.attach(btn, 2, 3, 1, 1)
 
+        self.check_all = Gtk.ToggleButton(label="Check A_ll", use_underline=True)
+        self.check_all.set_active(1)
+        self.check_all.set_tooltip_text("If toggled, items will need to be `received`\none by one by unchecking the  check box.")
+        grid.attach(self.check_all, 3, 3, 1, 1)
+
+
         # Add a Separator
         self.mainBox.pack_start(Gtk.Separator(orientation=Gtk.Orientation.VERTICAL), False, True, 0)
 
@@ -186,14 +192,14 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             try:
                 txt = find_vtrx(self.session, txt)
             except ValueError as e:
-                self.write_message("Error: {}".format(e))
+                self.write_message("Error: {}\n".format(e))
                 return
 
         # search code in the list
         if self.store:
             lv_iter = self.store.get_iter_first()
             while lv_iter:
-                if (self.store.get_value(lv_iter, 0) == txt):
+                if self.store.get_value(lv_iter, 0) == txt:
                     self.write_message("...found\n")
                     self.store[lv_iter][3] = False
 
@@ -275,7 +281,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             valid_sender = True
             if self.institute is not None:
                 valid_sender = s['sender']['code'] == self.institute
-                
+
             if s["recipient"]["code"] == self.recipient and valid_sender:
                 store = self.get_tree_view_model()
                 cmb_store.append([s['name'], s['id']])
@@ -300,34 +306,46 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         else:
             self.cmb_shipment.set_active(-1)
             self.cmb_shipment.get_child().set_text("")
-            
-            
-        self.tree.set_model(Gtk.ListStore(str, str, str, bool))
+            self.tree.set_model(Gtk.ListStore(str, str, str, bool))
+
+    def mark_all_as_delivered(self):
+        """Mark all items in current shipment as delivered."""
+        if self.store is None:
+            return
+
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            val = self.store[lv_iter][3]
+            self.store[lv_iter][3] = not val
+            lv_iter = self.store.iter_next(lv_iter)
 
     def receive_items(self, *args):
         """Receive shipment items."""
         data = {}
         names = {}
+        if not self.store:
+            self.write_message("Empty list of items.\n")
+            return
 
-        # self.store is the model of the tree view
-        if self.store:
-            lv_iter = self.store.get_iter_first()
-            while lv_iter:
-                shpmnt = self.store.get_value(lv_iter, 2)
-                if shpmnt not in data:
-                    data[shpmnt] = create_shipment_status(shpmnt)
-                    names[shpmnt] = self.store.get_value(lv_iter, 4)
+        if not self.check_all.get_active():
+            self.mark_all_as_delivered()
 
-                item = {
-                    "code": self.store[lv_iter][5],
-                    "delivered": not self.store[lv_iter][3]
-                }
-                data[shpmnt]["shipmentItems"].append(item)
+        # self.store is the model of the tree view
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            shpmnt = self.store.get_value(lv_iter, 2)
+            if shpmnt not in data:
+                data[shpmnt] = create_shipment_status(shpmnt)
+                names[shpmnt] = self.store.get_value(lv_iter, 4)
+
+            item = {
+                "code": self.store[lv_iter][5],
+                "delivered": not self.store[lv_iter][3]
+            }
+            data[shpmnt]["shipmentItems"].append(item)
 
-                lv_iter = self.store.iter_next(lv_iter)
+            lv_iter = self.store.iter_next(lv_iter)
 
-        else:
-            self.write_message("Empty list of items.\n")
 
         for oid, S in data.items():
             # Check that all items are there
@@ -507,6 +525,8 @@ def create_shipment_status(shpmnt):
 
 def main():
     """Main entry."""
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/receiveShipments.html"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -515,7 +535,7 @@ def main():
         sys.exit()
 
     client.user_gui = dlg
-    IS = ReceiveShipments(client)
+    IS = ReceiveShipments(client, help_link=HELP_LINK)
     IS.set_accept_focus(True)
     IS.present()
     IS.connect("destroy", Gtk.main_quit)

itkdb_gtk/GlueWeight.py

@@ -8,13 +8,14 @@ from pathlib import Path
 
 try:
     import itkdb_gtk
-    
+
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, UploadMultipleTests
+HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -83,18 +84,17 @@ def remove_defaul_keys(data, default_value=-9999):
     return data
 
 
-class GlueWeight(Gtk.Window):
+class GlueWeight(dbGtkUtils.ITkDBWindow):
     """Upluead Glue Weight test."""
 
     def __init__(self, session, ifile=None, help_link=None):
         """Initialization.
-    
+
         Args:
             session: ITkDB session_
             ifile (optional): Input file. Defaults to None.
 
         """
-        global gtk_runs
         self.ifile = ifile
         self.session = session
         self.modules = []
@@ -112,34 +112,24 @@ class GlueWeight(Gtk.Window):
         self.skeleton = ITkDButils.get_test_skeleton(
             session, "MODULE", "GLUE_WEIGHT", defaults)
 
+        global gtk_runs
         if gtk_runs:
-            super().__init__(title="Upload Glue Weight", help_link=help_link)
+            super().__init__(session=session,
+                             title="Upload Glue Weight",
+                             help_link=help_link)
             self.init_window()
+        else:
+            self.pdb_user = ITkDButils.get_db_user(session)
 
     def init_window(self):
         """Initialize window."""
         #
         # Prepare HeaderBar
-        hb = Gtk.HeaderBar()
-        hb.set_show_close_button(True)
-        hb.props.title = "DB Upload Module Glue Weight"
-        self.set_titlebar(hb)
-
-        button = Gtk.Button()
-        icon = Gio.ThemedIcon(name="document-send-symbolic")
-        image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.BUTTON)
-        button.add(image)
-        button.set_tooltip_text("Click to upload test shown in notebook.")
-        button.connect("clicked", self.upload_current_test)
-        hb.pack_end(button)
-
-        self.userLabel = Gtk.Label()
-        self.userLabel.set_text(self.session.user.name)
-        hb.pack_start(self.userLabel)
-
-        # Create main content box
-        self.mainBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.add(self.mainBox)
+        self.set_border_width(10)
+
+        # Prepare HeaderBar
+        self.hb.props.title = "Glue height"
+
         # file entry and search button
         self.file_name = Gtk.FileChooserButton()
         self.file_name.connect("file-set", self.on_file_set)
@@ -167,6 +157,11 @@ class GlueWeight(Gtk.Window):
             self.modules = self.parse_file(self.ifile)
             self.populate_notebook()
 
+
+
+        # The text view
+        self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
+
         # The button box
         btnBox = Gtk.ButtonBox(orientation=Gtk.Orientation.HORIZONTAL)
         self.buttons = []
@@ -183,19 +178,10 @@ class GlueWeight(Gtk.Window):
         self.buttons.append(btn)
         btnBox.add(btn)
 
-        btn = Gtk.Button(label="Quit")
-        btn.connect("clicked", self.quit)
-        btnBox.add(btn)
-
         self.mainBox.pack_start(btnBox, False, True, 0)
 
         self.show_all()
 
-    def quit(self, *args):
-        """Quits the application."""
-        self.hide()
-        self.destroy()
-
     def create_test_window(self, test_json, test_name, label):
         """Create the dialog for a DB test and add it to the notebook.
 
@@ -257,7 +243,7 @@ class GlueWeight(Gtk.Window):
 
     def read_file(self, path):
         """Parse file."""
-        with open(path, "r") as ifile:
+        with open(path, "r", encoding="UTF-8") as ifile:
             self.modules = self.parse_file(ifile)
 
     def parse_file(self, ifile, module_sep="MODULE_SN"):
@@ -346,22 +332,20 @@ class GlueWeight(Gtk.Window):
 
     def upload_tests(self):
         """Upload tests to DB."""
-        if len(self.test_list):
+        W = UploadMultipleTests.UploadMultipleTests(
+            self.session,
+            help_link="{}/uploadMultipleTests.html".format(HELP_LINK)
+        )
+        
+        if len(self.test_list)>0:
             for G in self.test_list:
                 m = G.values
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
+                
 
         else:
             for m in self.modules:
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
 
 
 def main():
@@ -386,7 +370,7 @@ def main():
 
     else:
         try:
-            ifile = open(options.files[0], 'r')
+            ifile = open(options.files[0], 'r') if len(options.files)>0 else None
 
         except Exception as e:
             print(e)
@@ -399,7 +383,7 @@ def main():
         print("Could not connect to DB with provided credentials.")
         sys.exit()
 
-    GW = GlueWeight(session, ifile)
+    GW = GlueWeight(session, ifile, help_link=HELP_LINK)
     if gtk_runs:
         GW.show_all()
         GW.set_accept_focus(True)

itkdb_gtk/ITkDButils.py

@@ -298,11 +298,11 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
 
         if data["runNumber"] in runN:
             # if the given runNumber is there, try to create a new one.
-            print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
+            #print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
             try:
                 irun = int(data["runNumber"])
                 for i in range(irun+1, 100):
-                    newRn = "{}".format(i+1)
+                    newRn = "{}".format(i)
                     if newRn not in runN:
                         data["runNumber"] = newRn
                         break

itkdb_gtk/PanelVisualInspection.py

@@ -21,7 +21,6 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, Gio, GObject
 
-HELP_LINK="https://itkdb-gtk.docs.cern.ch/panelVisualInspection.html"
 
 class TestJson(GObject.Object):
     """To store test JSOn."""
@@ -41,7 +40,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
     SN, ORDER, PASSED, N_FILES, F_LIST, TEST_J, ALL = range(7)
     F_DEFECT, F_NAME, F_PATH = range(3)
 
-    def __init__(self, session, title="PanelVisualInspection", help_link=HELP_LINK):
+    def __init__(self, session, title="PanelVisualInspection", help_link=None):
         super().__init__(title=title,
                          session=session,
                          show_search="Find object with given SN.",
@@ -564,6 +563,8 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 def main():
     """Main entry."""
     # DB login
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/panelVisualInspection.html"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -573,7 +574,7 @@ def main():
 
     client.user_gui = dlg
 
-    gTest = PanelVisualInspection(client)
+    gTest = PanelVisualInspection(client, help_link=HELP_LINK)
 
     gTest.present()
     gTest.connect("destroy", Gtk.main_quit)

itkdb_gtk/PetalReceptionTests.py

@@ -154,7 +154,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         """
         if institute is None:
             institute = self.institute
-            
+
         defaults = {
             "institution": institute,
             "runNumber": "1",
@@ -187,7 +187,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             self.dbObject = ITkDButils.get_DB_component(self.session, SN)
 
         except Exception as E:
-            self.write_message(str(E))
+            self.write_message(str(E)+'\n')
             dbGtkUtils.complain("Could not find object in DB", str(E))
             self.dbObject = None
             return
@@ -198,7 +198,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         """Add a new defect."""
         page = self.notebook.get_nth_page(self.notebook.get_current_page())
         values = dbGtkUtils.get_a_list_of_values("Insert new defect", ("Type", "Description/v"))
-        if len(values):
+        if len(values)>0:
             defect = {"name": values[0], "description": values[1]}
             page.dict_dialog.values["defects"].append(defect)
             page.dict_dialog.refresh()
@@ -280,6 +280,8 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
 def main():
     """Main entry."""
     # DB login
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/petalReceptionTests.html"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -289,7 +291,7 @@ def main():
 
     client.user_gui = dlg
 
-    gTest = PetalReceptionTests(client)
+    gTest = PetalReceptionTests(client, help_link=HELP_LINK)
 
     gTest.present()
     gTest.connect("destroy", Gtk.main_quit)

itkdb_gtk/UploadMultipleTests.py

@@ -468,73 +468,81 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             self.write_message("Something went wrong with the stages\n")
             return [None, None]
 
+    def add_test_data_to_view(self, data, ifile=None, folder=None):
+        """Add a test data to the  tree view."""
+        has_errors = False
+        default_site = None
+    
+        errors, missing = check_data(data)
+        if len(missing) > 0:
+            self.write_message("Some keys are missing in the JSon file.\n")
+            self.write_message("{}\n".format("\n".join(['\t'+line for line in missing])))
+
+            if "institution" in missing and len(missing) == 1:
+                if default_site is None:
+                    site, use_default = self.get_test_institute()
+                    if use_default:
+                        default_site = site
+                else:
+                    site = default_site
+
+                if site:
+                    data["institution"] = site
+                    self.write_message("Setting Institution to {}\n".format(data["institution"]))
+
+            else:
+                has_errors = True
+                dbGtkUtils.complain("Invalid JSON file\n{}".format('\n'.join(errors)),"--")
+
+        if not has_errors:
+            attachments = []
+            if "attachments" in data:
+                for att in data["attachments"]:
+                    path = Path(att["path"])
+                    if path.exists():
+                        path = path.expanduser().resolve()
+                    else:
+                        if folder is not None:
+                            path = folder / path.name
+
+                    if path.exists():
+                        attachments.append(ITkDButils.Attachment(path=path,
+                                                                 title=att["title"],
+                                                                 desc=att["description"]))
+                    else:
+                        self.write_message("Ignoring atachment {}".format(data["path"]))
+
+                # We need to delete this, which is "unofficial"
+                del data["attachments"]
+
+            model = self.tree.get_model()
+            comments = data.get("comments", [])
+            defects = data.get("defects", [])
+            the_date = handle_test_date(data["date"])
+            combo, currentStage = self.get_component_stages(data["component"])
+            if data["passed"]:
+                if data["problems"]:
+                    color = "orange"
+                else:
+                    color = self.def_color
+            else:
+                color = "firebrick"
+
+            model.append([data["component"], data["testType"], data["runNumber"], the_date,
+                            data["institution"], currentStage, currentStage,
+                            ifile, data, len(attachments), attachments,
+                            len(comments), comments, len(defects), defects, color])
+
     def add_tests_to_view(self, files):
         """Add the input fiels to the treeview."""
-        default_site = None
         for ifile in files:
             try:
-                has_errors = False
-                data = json.loads(open(ifile, 'r', encoding="UTF-8").read())
-                errors, missing = check_data(data)
-                if len(missing) > 0:
-                    self.write_message("{}\n".format(Path(ifile).name))
-                    self.write_message("Some keys are missing in the JSon file.\n")
-                    self.write_message("{}\n".format("\n".join(['\t'+line for line in missing])))
-
-                    if "institution" in missing and len(missing) == 1:
-                        if default_site is None:
-                            site, use_default = self.get_test_institute()
-                            if use_default:
-                                default_site = site
-                        else:
-                            site = default_site
-
-                        if site:
-                            data["institution"] = site
-                            self.write_message("Setting Institution to {}\n".format(data["institution"]))
+                self.write_message("{}\n".format(Path(ifile).name))
+                folder = Path(ifile).parent
 
-                    else:
-                        has_errors = True
-                        dbGtkUtils.complain("Invalid JSON file\n{}".format('\n'.join(errors)), ifile)
-
-                if not has_errors:
-                    attachments = []
-                    if "attachments" in data:
-                        folder = Path(ifile).parent
-                        for att in data["attachments"]:
-                            path = Path(att["path"])
-                            if path.exists():
-                                path = path.expanduser().resolve()
-                            else:
-                                path = folder / path.name
-
-                            if path.exists():
-                                attachments.append(ITkDButils.Attachment(path=path,
-                                                                         title=att["title"],
-                                                                         desc=att["description"]))
-                            else:
-                                self.write_message("Ignoring atachment {}".format(data["path"]))
-
-                        # We need to delete tis, which is "unofficial"
-                        del data["attachments"]
-
-                    model = self.tree.get_model()
-                    comments = data.get("comments", [])
-                    defects = data.get("defects", [])
-                    the_date = handle_test_date(data["date"])
-                    combo, currentStage = self.get_component_stages(data["component"])
-                    if data["passed"]:
-                        if data["problems"]:
-                            color = "orange"
-                        else:
-                            color = self.def_color
-                    else:
-                        color = "firebrick"
+                data = json.loads(open(ifile, 'r', encoding="UTF-8").read())
+                self.add_test_data_to_view(data, ifile=ifile, folder=folder)
 
-                    model.append([data["component"], data["testType"], data["runNumber"], the_date,
-                                  data["institution"], currentStage, currentStage,
-                                  ifile, data, len(attachments), attachments,
-                                  len(comments), comments, len(defects), defects, color])
 
             except Exception as E:
                 self.write_message("Cannot load file {}\n".format(ifile))
@@ -677,7 +685,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
 
 def main():
-    """Main entry."""
+    """Main entry."""    
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/uploadMultipleTests.html"
     # DB login
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
@@ -689,7 +698,7 @@ def main():
     client.user_gui = dlg
 
     # Start GUI
-    UpT = UploadMultipleTests(client)
+    UpT = UploadMultipleTests(client, help_link=HELP_LINK)
 
     if gtk_runs:
         UpT.present()

itkdb_gtk/UploadTest.py

@@ -211,7 +211,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                     ifile = Path(self.payload).expanduser().resolve().as_posix()
                     self.testF.set_filename(ifile)
                     self.on_test_file(self.testF)
-                    self.write_message("Loaded {}".format(the_path.name))
+                    self.write_message("Loaded {}\n".format(the_path.name))
 
                 else:
                     print("Input file does not exists: {}".format(self.payload))
@@ -452,12 +452,13 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
             dbGtkUtils.complain("Failed uploading test", msg)
 
         else:
-            self.write_message("Upload successfull")
+            self.write_message("Upload successfull\n")
             dbGtkUtils.ask_for_confirmation("Upload successfull", "")
 
 
 def main():
     """Main entry."""
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/uploadSingleTest.html"
     parser = argparse.ArgumentParser()
 
     parser.add_argument("--test-file", help="Name of json file with test data")
@@ -483,6 +484,7 @@ def main():
     # Start GUI
     UpT = UploadTest(client,
                      payload=args.test_file,
+                     help_link=HELP_LINK,
                      attachment=ITkDButils.Attachment(path=args.attachment,
                                                       title=args.attach_title,
                                                       desc=args.attach_desc))

itkdb_gtk/VisualInspection.py

@@ -21,8 +21,6 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio
 
-HELP_LINK="https://itkdb-gtk.docs.cern.ch/moduleVisualInspection.html"
-
 
 module_type = re.compile("20USE(M[0-5]{1}|[345]{1}[LR]{1})[0-9]{7}")
 sensor_type = re.compile("20USES[0-5]{1}[0-9]{7}")
@@ -31,7 +29,7 @@ sensor_type = re.compile("20USES[0-5]{1}[0-9]{7}")
 class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
     """Module/Sensor Visual Inspection."""
 
-    def __init__(self, session, title="Visual Inspection", help_link=HELP_LINK):
+    def __init__(self, session, title="Visual Inspection", help_link=None):
         super().__init__(title=title,
                          session=session,
                          show_search="Find object with given SN.",
@@ -68,7 +66,7 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
         lbl.set_xalign(0)
         grid.attach(lbl, 0, irow, 1, 1)
         grid.attach(receiver, 1, irow, 1, 1)
-        
+
         self.obj_type = None
         self.obj_type_label = Gtk.Label()
         self.obj_type_label.set_xalign(0)
@@ -273,6 +271,8 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
 
 def main():
     """Main entry."""
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/moduleVisualInspection.html"
+
     # DB login
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
@@ -283,7 +283,7 @@ def main():
 
     client.user_gui = dlg
 
-    gTest = ModuleVisualInspection(client)
+    gTest = ModuleVisualInspection(client, help_link=HELP_LINK)
 
     gTest.present()
     gTest.connect("destroy", Gtk.main_quit)

itkdb_gtk/WireBondGui.py

@@ -935,6 +935,16 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             skeleton["comments"].append(msg)
             skeleton["passed"] = False
             self.write_message("{}\n".format(msg))
+            for key in skeleton["results"]["FAILED_HYBRID_TO_PB"]:
+                defect = {
+                    "description": "Unbonded: Hybrid to PB",
+                    "name": "UNBODED",
+                    "properties": {
+                        "wire_number": range_to_list(key)
+                    }
+                }
+                skeleton["defects"].append(defect)
+
 
     def compute_module_to_frame(self, skeleton):
         """Compute number of failures and repairs."""
@@ -945,6 +955,15 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             skeleton["comments"].append(msg)
             skeleton["passed"] = False
             self.write_message("{}\n".format(msg))
+            for key in skeleton["results"]["FAILED_MODULE_TO_FRAME"]:
+                defect = {
+                    "description": "Unbonded: Module to Frame",
+                    "name": "UNBODED",
+                    "properties": {
+                        "wire_number": range_to_list(key)
+                    }
+                }
+                skeleton["defects"].append(defect)
 
     def compute_unconnected(self, results):
         """Compute number of unconnected."""
@@ -956,6 +975,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         M = ModuleHoles(param=param, win=self)
 
+        defects = []
         for test, values in results.items():
             if test.find("FAILED") < 0:
                 continue
@@ -972,6 +992,17 @@ class WireBond(dbGtkUtils.ITkDBWindow):
                     H.add_channel(irow, out)
                     H.holes[irow] = find_holes(H.channels[irow])
 
+            # add defects
+            defects.append(
+                {
+                    "description": "Unbonded Channel",
+                    "name": "UNBONDED",
+                    "properties": {
+                        "front_end_row": irow,
+                        "wire_number": out
+                    }
+                }
+            )
 
         # Now get sensor strips.
         M.ready()
@@ -981,7 +1012,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         out = {}
         out["comments"] = []
-        out["defects"] = []
+        out["defects"] = defects
         for irow in range(4):
             key = "MAX_CONT_UNCON_ROW{}".format(irow+1)
             out[key] = mx_consecutive[irow]

itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.10.dev8"
+__version__ = "0.11.0"
 
 
 def dash_board():

itkdb_gtk/dashBoard.py

@@ -60,7 +60,6 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     PETAL_CORE_THERMAL = 12
     PETAL_INFORMATION = 13
 
-
     def __init__(self, session):
         """Initialization."""
         super().__init__(title="ITkDB Dashboard", session=session, help_link=HELP_LINK)
@@ -119,7 +118,6 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnModVI.connect("clicked", self.module_VI)
         grid.attach(btnModVI, 0, irow, 1, 1)
 
-
         if HAS_PETALQC:
             irow +=1
             btnPetalInfo = Gtk.Button(label="AVS Petal Info")
@@ -135,7 +133,6 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             btnPetalThermal.connect("clicked", self.petal_thermal)
             grid.attach(btnPetalThermal, 1, irow, 1, 1)
 
-
         irow += 1
         grid.attach(Gtk.Label(), 0, irow, 1, 1)
 
@@ -166,7 +163,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadTest.UploadTest(self.session, help_link=HELP_LINK)
+        W = UploadTest.UploadTest(
+            self.session,
+            help_link="{}/uploadSingleTest.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def upload_multiple_tests(self, *args):
@@ -177,7 +177,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadMultipleTests.UploadMultipleTests(self.session, help_link=HELP_LINK)
+        W = UploadMultipleTests.UploadMultipleTests(
+            self.session,
+            help_link="{}/uploadMultipleTests.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def create_shipment(self, *args):
@@ -188,7 +191,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = CreateShipments.CreateShipments(self.session, help_link=HELP_LINK)
+        W = CreateShipments.CreateShipments(
+            self.session,
+            help_link="{}/createShipment.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def receive_shipment(self, *args):
@@ -199,7 +205,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = GetShipments.ReceiveShipments(self.session, help_link=HELP_LINK)
+        W = GetShipments.ReceiveShipments(
+            self.session,
+            help_link="{}/receiveShipments.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def petal_gnd(self, *args):
@@ -210,7 +219,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = PetalReceptionTests.PetalReceptionTests(self.session, help_link=HELP_LINK)
+        W = PetalReceptionTests.PetalReceptionTests(
+            self.session,
+            help_link="{}/petalReceptionTests.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def glue_weight(self, *args):
@@ -232,7 +244,10 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = UploadModuleIV.IVwindow(self.session, help_link=HELP_LINK)
+        W = UploadModuleIV.IVwindow(
+            self.session,
+            help_link="{}/uploadModuleIV.html".format(HELP_LINK)
+        )
         W.connect("destroy", self.app_closed, bitn)
 
     def wire_bond(self, *args):
@@ -243,7 +258,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = WireBondGui.WireBond(session=self.session, title="Wirebond", help_link=HELP_LINK)
+        W = WireBondGui.WireBond(
+            session=self.session,
+            title="Wirebond",
+            help_link="{}//wirebondTest.html".format(HELP_LINK),
+        )
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
@@ -255,9 +274,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = PanelVisualInspection.PanelVisualInspection(session=self.session,
-                                                        title="Panel Visual Inspection",
-                                                        help_link=HELP_LINK)
+        W = PanelVisualInspection.PanelVisualInspection(
+            session=self.session,
+            title="Panel Visual Inspection",
+            help_link="{}/panelVisualInspection.html".format(HELP_LINK),
+        )
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
@@ -269,13 +290,14 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
             return
 
         self.mask |= bt
-        W = VisualInspection.ModuleVisualInspection(session=self.session,
-                                                          title="Module/Sensor Visual Inspection",
-                                                          help_link=HELP_LINK)
+        W = VisualInspection.ModuleVisualInspection(
+            session=self.session,
+            title="Module/Sensor Visual Inspection",
+            help_link="{}/moduleVisualInspection.html".format(HELP_LINK),
+        )
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
-
     def upload_petal_info(self, *srgs):
         """Upload petal Info."""
         if not HAS_PETALQC:
@@ -291,13 +313,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
 
-
     def petal_metrology(self, *args):
         """Do petal metrology"""
         if not HAS_PETALQC:
             return
 
-
         bitn = DashWindow.PETAL_CORE_METRO
         bt = 1 << bitn
         if self.mask & bt:
@@ -321,10 +341,13 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
         self.mask |= bt
         opt = IRPetalParam()
+        opt.files = []
+        opt.golden = None
         opt.folder = None
         opt.out = None
         opt.alias = None
         opt.SN = None
+        opt.desy = False
         W = CoreThermal(opt, self.session, title="Petal Thermal Test.")
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()

{itkdb_gtk-0.10.10.dev8.dist-info → itkdb_gtk-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev8
+Version: 0.11.0
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

itkdb_gtk-0.11.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+itkdb_gtk/CreateShipments.py,sha256=eiVjw7zGLGAoqWxThBc6IVvXLUFXmtQ-_hpZzfDOKx0,13249
+itkdb_gtk/GetShipments.py,sha256=b3TECQhHlK0kGXH6KjQs06yuzIfTN5tjtiu6wnEOuJ8,19172
+itkdb_gtk/GlueWeight.py,sha256=IHgvbN2DlT8Ou-DMi-n3Z-3xSrPr0tlrkkEH10AshrA,11587
+itkdb_gtk/ITkDB.desktop,sha256=v_K4mHsDxb912J1XGo6mOlbW2TkHvYNGrKmiOnsBQqM,172
+itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
+itkdb_gtk/ITkDBlogin.py,sha256=40tipm_j5eUS4dnZnBT8VyL6Bu_8csuqS9TPWKxvKSY,10038
+itkdb_gtk/ITkDButils.py,sha256=p1r1HqY0hP47Y0fRRweLPNR6rbPRebWS8d9y_vdj_lk,19586
+itkdb_gtk/PanelVisualInspection.py,sha256=ktAcYbdLBS7Zbxq9XsxB_AWTgAfFLa42NFTEsxnBn98,20531
+itkdb_gtk/PetalReceptionTests.py,sha256=N9_lBvao-HeHPwccjycUL7p3R3V_nPur1WibXbcqjgI,9992
+itkdb_gtk/SensorUtils.py,sha256=fYWF9TeutAbore53dLWNlZnVn9P3OsKYcFLNGOs8cnI,15426
+itkdb_gtk/ShowAttachments.py,sha256=KExxPCdbcb04XS8JSUkg5xF1McvlB8e9btwctDCKNXU,8498
+itkdb_gtk/ShowComments.py,sha256=OiMTFLnhGbbKRj5x61D517BYHAt-qY5Y1lvR3EQz3c0,3151
+itkdb_gtk/ShowDefects.py,sha256=aVAHeaE5IztmAPEuHwhi06KWo_pi9xX2J1fTLhKyAPI,3530
+itkdb_gtk/UploadModuleIV.py,sha256=sqh52bSxANBwlmVWZlDqFXpqRGf0rV0QsjJWC-tY_qI,17792
+itkdb_gtk/UploadMultipleTests.py,sha256=TFEqcRd2ZZAVhK3P3Qn2vg81NouOCjkjqn9PhoHYhPM,24125
+itkdb_gtk/UploadTest.py,sha256=ukgJ5-IG12bqa1QIp3bXIV8hkdXCv5UDxh1lQswN_ko,16832
+itkdb_gtk/VisualInspection.py,sha256=i2i_9ttetMzGFRcBFm_ow7aziksTgvZzVLUxZhwiyBg,9850
+itkdb_gtk/WireBondGui.py,sha256=WFTLOw4l5JxSbvh4vZMxcF65fqlwvNw0fOyEru9ijqQ,39850
+itkdb_gtk/__init__.py,sha256=T-1R2QGY5NH5Yc1rSoWlZ4NwEtokbXv1TQfg_r_c8gA,1263
+itkdb_gtk/dashBoard.py,sha256=VtD7w9FqexYEdihXCw6rxIZrjChQPyJ1LT4DsT3-K2k,11073
+itkdb_gtk/dbGtkUtils.py,sha256=THW-IT5UJB1YluvUVIfpy6oIY2faSHChNKGTpY5qzag,30480
+itkdb_gtk/readGoogleSheet.py,sha256=Lzm_oPWwDqZZzKoBUgsp277F9-wCfr_BA0X4VD2Eolo,2673
+itkdb_gtk/untrash_component.py,sha256=VrN46-f-kF7voOxtoh7OL-bZSWAaIFb7-Xbx6_WT7K8,757
+itkdb_gtk-0.11.0.dist-info/METADATA,sha256=fQrQBCNU8wtqG-e8HDm7PHGm-f6soglsHvqH6uWZRuM,3150
+itkdb_gtk-0.11.0.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+itkdb_gtk-0.11.0.dist-info/entry_points.txt,sha256=51wi4BRW1vYuLNySWC6bsmQPo7XPI7cvPFAaBD49Ib0,489
+itkdb_gtk-0.11.0.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
+itkdb_gtk-0.11.0.dist-info/RECORD,,

{itkdb_gtk-0.10.10.dev8.dist-info → itkdb_gtk-0.11.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

itkdb_gtk-0.10.10.dev8.dist-info/RECORD

@@ -1,28 +0,0 @@
-itkdb_gtk/CreateShipments.py,sha256=6m66OsURF_c2IgpfYfvSwu3hlhlQV8vVv7EqQQQNzds,13147
-itkdb_gtk/GetShipments.py,sha256=8E0QG-sH2gygqCAJFhpXJnH3QAjO_62havm9hJuX-Uk,18414
-itkdb_gtk/GlueWeight.py,sha256=tyF5-EAc6QkOLo9ZRp807Xx6zK6yYBGElvfmpUYeuUA,12284
-itkdb_gtk/ITkDB.desktop,sha256=v_K4mHsDxb912J1XGo6mOlbW2TkHvYNGrKmiOnsBQqM,172
-itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
-itkdb_gtk/ITkDBlogin.py,sha256=40tipm_j5eUS4dnZnBT8VyL6Bu_8csuqS9TPWKxvKSY,10038
-itkdb_gtk/ITkDButils.py,sha256=WYjE_DOnFJdxhhQ5ylVTupIOjrp2r83jQALa0Gc2xZg,19587
-itkdb_gtk/PanelVisualInspection.py,sha256=EO0bsPnzD7aT2iBs2SShOAfbixvYcDrByLpjVOEk4MM,20510
-itkdb_gtk/PetalReceptionTests.py,sha256=Ta3gGa_pFcOSroF2xpPyAT5nfhXAouBHcfDgPXCvwJI,9903
-itkdb_gtk/SensorUtils.py,sha256=fYWF9TeutAbore53dLWNlZnVn9P3OsKYcFLNGOs8cnI,15426
-itkdb_gtk/ShowAttachments.py,sha256=KExxPCdbcb04XS8JSUkg5xF1McvlB8e9btwctDCKNXU,8498
-itkdb_gtk/ShowComments.py,sha256=OiMTFLnhGbbKRj5x61D517BYHAt-qY5Y1lvR3EQz3c0,3151
-itkdb_gtk/ShowDefects.py,sha256=aVAHeaE5IztmAPEuHwhi06KWo_pi9xX2J1fTLhKyAPI,3530
-itkdb_gtk/UploadModuleIV.py,sha256=sqh52bSxANBwlmVWZlDqFXpqRGf0rV0QsjJWC-tY_qI,17792
-itkdb_gtk/UploadMultipleTests.py,sha256=8LgbIE7g6zdx4zAqM_Y3DungVnxyStiexhOvjruc4H0,24190
-itkdb_gtk/UploadTest.py,sha256=HVAdMRpicxG5Qr5Hj9LL5tVsSz1tTGaGbeolz-BaFrE,16717
-itkdb_gtk/VisualInspection.py,sha256=-7f1YdUdkHk62OQVn3JwNlCcRMyfUHgUEC4wb4yK2Ok,9838
-itkdb_gtk/WireBondGui.py,sha256=8kA5S6MCl_DUeszdBn9z9kR3kRHe0sI0wRU_akBJqDo,38711
-itkdb_gtk/__init__.py,sha256=Ru68gP4mR4_UX8wslF97Q2vW9doIWE3j-9TAniKmDRM,1269
-itkdb_gtk/dashBoard.py,sha256=ZGeG0su0C7LGzXrcBu8KKfzeneuqkVLieF-6s6yGCgc,10563
-itkdb_gtk/dbGtkUtils.py,sha256=THW-IT5UJB1YluvUVIfpy6oIY2faSHChNKGTpY5qzag,30480
-itkdb_gtk/readGoogleSheet.py,sha256=Lzm_oPWwDqZZzKoBUgsp277F9-wCfr_BA0X4VD2Eolo,2673
-itkdb_gtk/untrash_component.py,sha256=VrN46-f-kF7voOxtoh7OL-bZSWAaIFb7-Xbx6_WT7K8,757
-itkdb_gtk-0.10.10.dev8.dist-info/METADATA,sha256=IJWXO0Tqdy2yyGy_n5su68d3du-XQcISTe5gmNhVlYo,3156
-itkdb_gtk-0.10.10.dev8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-itkdb_gtk-0.10.10.dev8.dist-info/entry_points.txt,sha256=51wi4BRW1vYuLNySWC6bsmQPo7XPI7cvPFAaBD49Ib0,489
-itkdb_gtk-0.10.10.dev8.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
-itkdb_gtk-0.10.10.dev8.dist-info/RECORD,,