itkdb-gtk 0.9.1.dev1__tar.gz → 0.10.0.dev2__tar.gz

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.9.1.dev1
+Version: 0.10.0.dev2
 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.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/CreateShipments.py

@@ -5,6 +5,7 @@ Items can be added via a QR reader.
 """
 import pathlib
 import sys
+import re
 
 try:
     import itkdb_gtk
@@ -17,7 +18,6 @@ except ImportError:
 from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
 
 import gi
-import serial
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio, GLib
 
@@ -50,7 +50,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         self.set_border_width(10)
 
         # intercept keyboard
-        self.setup_scanner()
+        dbGtkUtils.setup_scanner(self.get_qrcode)
 
         # Prepare HeaderBar
         self.hb.props.title = "Create Shipment"
@@ -97,8 +97,8 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.mainBox.pack_start(box, False, False, 0)
 
-        dbGtkUtils.add_button_to_container(box, "Add Item",
-                                           "Click to add a new item.",
+        dbGtkUtils.add_button_to_container(box, "Add Items",
+                                           "Click to add a new items.\nAdd SNs separated by\n\tnew line,\n\ttab\n\tespace or\n\tcomma.",
                                            self.add_item)
 
         dbGtkUtils.add_button_to_container(box, "Remove Item",
@@ -176,43 +176,46 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
 
     def add_item(self, *args):
         """Add new item."""
-        # We will get the input either from a Dialog or from the QR reder.
+        # We will get the input either from a Dialog or from the QR reader.
         # For the later we get the SN in the argument list.
         if isinstance(args[0], Gtk.Button):
-            SN = dbGtkUtils.get_a_value("Enter item SN")
+            txt = dbGtkUtils.get_a_value("Enter item SN", is_tv=True)
+            tmp = re.split(';|,| |\n|\t', txt)
+            SNlist = [s.strip() for s in tmp if len(s.strip())>0]
         else:
-            SN = args[0]
-
-        try:
-            # Check that the object exists and get some information about it.
-            rc = ITkDButils.get_DB_component(self.session, SN)
-            if 'inTransit' in rc and rc['inTransit']:
-                dbGtkUtils.complain("Item {} is already in transit".format(SN),
-                                    "This item is already in transit to {}".format(rc['shipmentDestination']['code']))
-                return
-            nick = rc['alternativeIdentifier']
-            id = rc['id']
-            obj = rc['componentType']['name']
-            loc = rc['currentLocation']['code']
-
-            # Check tha tthe input is not already there
-            model = self.tree.get_model()
-            iter = model.get_iter_first()
-            while iter:
-                if model.get_value(iter, 0) == SN:
-                    dbGtkUtils.complain("Duplicated item.",
-                                        "Object {} is already in the list".format(SN))
-                    return
-
-                iter = model.iter_next(iter)
-
-            # Add the item in the liststore.
-            model.append([SN, nick, obj, loc, id])
+            SNlist = [args[0]]
 
-        except Exception:
-            dbGtkUtils.complain("Error querying DB",
-                                "object {} does not exist.".format(SN))
-            print(ITkDButils.get_db_response())
+        for SN in SNlist:
+            try:
+                # Check that the object exists and get some information about it.
+                rc = ITkDButils.get_DB_component(self.session, SN)
+                if 'inTransit' in rc and rc['inTransit']:
+                    dbGtkUtils.complain("Item {} is already in transit".format(SN),
+                                        "This item is already in transit to {}".format(rc['shipmentDestination']['code']))
+                    return
+                nick = rc['alternativeIdentifier']
+                id = rc['id']
+                obj = rc['componentType']['name']
+                loc = rc['currentLocation']['code']
+
+                # Check tha tthe input is not already there
+                model = self.tree.get_model()
+                iter = model.get_iter_first()
+                while iter:
+                    if model.get_value(iter, 0) == SN:
+                        dbGtkUtils.complain("Duplicated item.",
+                                            "Object {} is already in the list".format(SN))
+                        return
+
+                    iter = model.iter_next(iter)
+
+                # Add the item in the liststore.
+                model.append([SN, nick, obj, loc, id])
+
+            except Exception:
+                dbGtkUtils.complain("Error querying DB",
+                                    "object {} does not exist.".format(SN))
+                print(ITkDButils.get_db_response())
 
     def remove_item(self, *args):
         """Remove selected item."""
@@ -289,26 +292,9 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         else:
             self.write_message("No attachment found\n")
 
-    def setup_scanner(self):
-        """Setup scanner."""
-        for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
-            P = pathlib.Path(fnam)
-            if P.exists():
-                rdr = serial.Serial(fnam, 9600)
-                GLib.unix_fd_add_full(GLib.PRIORITY_DEFAULT, rdr.fileno(), GLib.IOCondition.IN, self.get_qrcode, rdr)
-                break
-
     def get_qrcode(self, fd, state, reader):
         """Gets data from QR scanner."""
-        available = reader.in_waiting
-        while True:
-            delta = reader.in_waiting - available
-            if not delta:
-                break
-
-        # Get data from serial device passed in via
-        data = reader.read_until(expected='\r', size=reader.in_waiting).strip()
-        txt = data.decode('utf-8')
+        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("{}\n".format(txt))
 
         # Try to add item to the list

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/GetShipments.py

@@ -54,7 +54,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         self.set_border_width(10)
 
         # intercept keyboard
-        self.setup_scanner()
+        dbGtkUtils.setup_scanner(self.get_qrcode)
 
         # Prepare HeaderBar
         self.hb.props.title = "{} shipments".format(self.recipient)
@@ -154,26 +154,9 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
         return scrolled
 
-    def setup_scanner(self):
-        """Setup scanner."""
-        for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
-            P = pathlib.Path(fnam)
-            if P.exists():
-                rdr = serial.Serial(fnam, 9600)
-                GLib.unix_fd_add_full(GLib.PRIORITY_DEFAULT, rdr.fileno(), GLib.IOCondition.IN, self.get_qrcode, rdr)
-                break
-
     def get_qrcode(self, fd, state, reader):
         """Gets data from QR scanner."""
-        available = reader.in_waiting
-        while True:
-            delta = reader.in_waiting - available
-            if not delta:
-                break
-
-        # Get data from serial device passed in via
-        data = reader.read_until(expected='\r', size=reader.in_waiting).strip()
-        txt = data.decode('utf-8')
+        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("{}\n".format(txt))
 
         # search code in the list

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/GlueWeight.py

@@ -113,7 +113,7 @@ class GlueWeight(Gtk.Window):
             session, "MODULE", "GLUE_WEIGHT", defaults)
 
         if gtk_runs:
-            super().__init__(title="Upload Glue Weight", help=help)
+            super().__init__(title="Upload Glue Weight")
             self.init_window()
 
     def init_window(self):

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/ITkDButils.py

@@ -228,10 +228,19 @@ def set_object_stage(client, SN, stage):
 def get_DB_component(client, SN):
     """Get ta component by its serial number."""
     global db_response
+
     try:
-        db_response = client.get('getComponent', json={'component': SN})
+        db_response = client.get("getComponent", json={"component": SN})
         return db_response
 
+    except Exception as e:
+        db_response = str(e)
+
+    try:
+        out = client.get('getComponent', json={'component': SN, "alternativeIdentifier":True})
+        db_response = out
+        return out
+
     except Exception as e:
         db_response = str(e)
         return None
@@ -409,16 +418,19 @@ def from_full_test_to_test_data(full_test):
     for P in full_test["properties"]:
         test["properties"][P["code"]] = P['value']
 
-    for P in full_test["results"]:
-        test["results"][P["code"]] = P['value']
+    if full_test["results"]:
+        for P in full_test["results"]:
+            test["results"][P["code"]] = P['value']
 
-    for C in full_test["comments"]:
-        test["comments"].append(C["comment"])
+    if full_test["comments"]:
+        for C in full_test["comments"]:
+            test["comments"].append(C["comment"])
 
-    for D in full_test["defects"]:
-        test["defects"].append({"name": D["name"],
-                                "description": D["description"],
-                                "properties": D["properties"]})
+    if full_test["defects"]:
+        for D in full_test["defects"]:
+            test["defects"].append({"name": D["name"],
+                                    "description": D["description"],
+                                    "properties": D["properties"]})
 
     return test
 
@@ -498,12 +510,12 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
     }
 
     # Set default values
-    for key in skltn.keys():
+    for key, val in skltn.items():
         if key in userdef:
-            if isinstance(skltn[key], dict):
+            if isinstance(val, dict):
                 continue
 
-            skltn[key] = userdef[key]
+            val = userdef[key]
 
     def get_default(vin, default=None):
         # print(json.dumps(vin, indent=1))

itkdb_gtk-0.10.0.dev2/itkdb_gtk/PanelVisualInspection.py

@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+"""PB/Hybrid panel Visual inspection GUI.."""
+import json
+import sys
+
+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
+
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gdk, Gio
+
+HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
+class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
+    """PB/Hybryd panel visual inspection GUI."""
+    SN, PASSED, ALL = range(3)
+
+    def __init__(self, session, help=HELP_LINK):
+        super().__init__(title="ITkDB Dashboard",
+                         session=session,
+                         show_search="Find object with given SN.",
+                         help=help)
+
+        # action button in header
+        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 ALL tests.")
+        button.connect("clicked", self.upload_tests)
+        self.hb.pack_end(button)
+
+        grid = Gtk.Grid(column_spacing=5, row_spacing=1)
+        self.mainBox.pack_start(grid, False, False, 5)
+
+        lbl = Gtk.Label(label="Serial Number")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 0, 1, 1)
+
+        self.SN = dbGtkUtils.TextEntry()
+        self.SN.connect("text_changed", self.SN_ready)
+        self.SN.widget.set_tooltip_text("Enter SN of PWD or Hybrid panel.")
+        grid.attach(self.SN.widget, 1, 0, 1, 1)
+
+        self.panel_type = Gtk.Label(label="")
+        grid.attach(self.panel_type, 2, 0, 1, 1)
+
+        # Paned object
+        paned = Gtk.Paned(orientation=Gtk.Orientation.VERTICAL)
+        paned.set_size_request(-1, 200)
+        self.mainBox.pack_start(paned, True, True, 5)
+
+        # the list of attachments
+        tree_view = self.create_tree_view()
+        paned.add1(tree_view)
+
+        # The text view
+        paned.add2(self.message_panel.frame)
+
+
+        self.show_all()
+
+        dbGtkUtils.setup_scanner(self.get_qrcode)
+
+    def create_tree_view(self, size=150):
+        """Create the TreeView with the children."""
+        model = Gtk.ListStore(str, bool)
+        self.tree = Gtk.TreeView(model=model)
+
+        scrolled = Gtk.ScrolledWindow()
+        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrolled.add(self.tree)
+        scrolled.set_size_request(-1, size)
+        
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("SN", renderer, text=PanelVisualInspection.SN)
+        self.tree.append_column(column)
+
+        renderer = Gtk.CellRendererToggle()
+        renderer.set_property("activatable", True)
+        renderer.set_property("radio", True)
+        renderer.set_padding(5, 0)
+        
+        x, y = renderer.get_alignment()
+        renderer.set_alignment(0, y)
+        # renderer.set_property("inconsistent", True)
+        renderer.connect("toggled", self.btn_toggled)
+        
+        column = Gtk.TreeViewColumn("Passed", renderer, active=PanelVisualInspection.PASSED)
+        self.tree.append_column(column)
+
+        return scrolled
+
+    def btn_toggled(self, renderer, path, *args):
+        """Toggled."""
+        model = self.tree.get_model()
+        val = not model[path][PanelVisualInspection.PASSED]
+        model[path][PanelVisualInspection.PASSED] = val
+        
+
+    def button_pressed(self, tree, event):
+        """Button pressed on tree view."""
+        # double click shows attachments
+        if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
+            select = self.tree.get_selection()
+            model, iter = select.get_selected()
+            if not iter:
+                return
+
+            self.on_show_json(None, (model, iter, model[iter]))
+            # self.on_show_attachments(None, (model, iter, model[iter]))
+            return
+
+        if event.button != 3:
+            return
+
+        # Create popup menu
+        select = self.tree.get_selection()
+        model, iter = select.get_selected()
+        values = None
+        if iter:
+            values = model[iter]
+
+        if not iter:
+            P = tree.get_path_at_pos(event.x, event.y)
+            if P:
+                print(P[0].to_string())
+                iter = model.get_iter(P[0])
+                values = model[iter]
+
+        if not values:
+            return
+
+
+    def SN_ready(self, *args):
+        """SN is ready in the TextEnttry."""
+        SN = self.SN.get_text()
+        if not SN.startswith("20U") or len(SN)!=14:
+            dbGtkUtils.complain("Invalid Serial Number",
+                                    "{}: wrong SN".format(SN))
+            return
+
+        if "USED" in SN:
+            # Powerboard Carrier
+            if not SN[6].isdigit():
+                dbGtkUtils.complain("Not a Powerboard Carrier",
+                                    "{}: wrong SN for a powerboard carrier".format(SN))
+                self.SN.widget.set_text("")
+                return
+
+            self.panel_type.set_text("PWB carrier")
+
+        elif "USET" in SN:
+            # Hybrid test panel
+            if not SN[6].isdigit or int(SN[6])>5:
+                dbGtkUtils.complain("Not a Hybrid Test Panel",
+                                    "{}: wrong SN for a hybrid test panel".format(SN))
+                self.SN.widget.set_text("")
+                return
+
+        else:
+            dbGtkUtils.complain("Invalid SN.",
+                "{}\nNot a PWB carrier not HYB test panel.".format(SN))
+            self.SN.widget.set_text("")
+            return
+
+        # GEt children.
+        panel = ITkDButils.get_DB_component(self.session, SN)
+        if panel is None:
+            self.write_message(ITkDButils.get_db_response())
+            return
+
+        children = []
+        for child in panel["children"]:
+            if child["component"] is not None:
+                if child["componentType"]["name"] == "Powerboard":
+                    children.append(child["component"]["serialNumber"])
+
+        model = Gtk.ListStore(str, bool)
+        for child in children:
+            model.append([SN, True])
+            
+        self.tree.set_model(model)
+
+
+    def upload_tests(self, *args):
+        """Upload the current test."""
+        SN = self.SN.get_text()
+
+    def get_qrcode(self, fd, state, reader):
+        """Read SN from scanner."""
+        txt = dbGtkUtils.scanner_get_line(reader)
+        self.write_message("SN: {}\n".format(txt))
+
+
+def main():
+    """Main entry."""
+    # DB login
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+    if client is None:
+        print("Could not connect to DB with provided credentials.")
+        dlg.die()
+        sys.exit()
+
+    client.user_gui = dlg
+
+    gTest = PanelVisualInspection(client)
+
+    gTest.present()
+    gTest.connect("destroy", Gtk.main_quit)
+    try:
+        Gtk.main()
+
+    except KeyboardInterrupt:
+        print("Arrrgggg!!!")
+
+    dlg.die()
+
+
+if __name__ == "__main__":
+    main()

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/PetalReceptionTests.py

@@ -8,7 +8,7 @@ try:
     
 except ImportError:
     from pathlib import Path
-    cwd = Path(sys.argv[0]).parent.parent
+    cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
 from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
@@ -35,7 +35,7 @@ def find_children(W):
 
 
 class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
-    """Dashboard class."""
+    """Petl Reception Test GUI."""
 
     def __init__(self, session, help=None):
         """Initialization."""

{itkdb_gtk-0.9.1.dev1 → itkdb_gtk-0.10.0.dev2}/itkdb_gtk/UploadModuleIV.py

@@ -56,7 +56,7 @@ def remove_files(W, flist):
 class IVwindow(dbGtkUtils.ITkDBWindow):
     """GUI for IV file handling."""
 
-    def __init__(self, session, title="IV window", options=None, help=help):
+    def __init__(self, session, title="IV window", options=None, help=None):
         """Initialization."""
         super().__init__(
             session=session, title=title, show_search=None, gtk_runs=gtk_runs, help=help