itkdb-gtk 0.0.17__tar.gz → 0.9.0__tar.gz

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.17
+Version: 0.9.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
@@ -57,7 +57,7 @@ Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## SendShipments.py
+## CreateShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/README.md

@@ -37,7 +37,7 @@ Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## SendShipments.py
+## CreateShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 

itkdb_gtk-0.0.17/itkdb_gtk/SendShipments.py → itkdb_gtk-0.9.0/itkdb_gtk/CreateShipments.py

@@ -25,14 +25,13 @@ from gi.repository import Gtk, Gio, GLib
 gtk_runs, gtk_args = Gtk.init_check()
 
 
-class SendShipments(dbGtkUtils.ITkDBWindow):
+class CreateShipments(dbGtkUtils.ITkDBWindow):
     """Create a shipment from input."""
 
     def __init__(self, session):
         """Initialization.
 
         Args:
-        ----
             session: ITkDB session.
 
         """
@@ -373,7 +372,7 @@ def main():
         sys.exit()
 
     client.user_gui = dlg
-    IS = SendShipments(client)
+    IS = CreateShipments(client)
     IS.set_accept_focus(True)
     IS.present()
     IS.connect("destroy", Gtk.main_quit)

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/GetShipments.py

@@ -29,7 +29,6 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         """Initialization.
 
         Args:
-        ----
             session: ITkDB session.
             recipient: default recipient
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/GlueWeight.py

@@ -33,12 +33,10 @@ def find_module(ifile, module_sn="MODULE_SN"):
     """Find the starting line of a module.
 
     Args:
-    ----
         ifile: the input file object.
         module_sn: tag t ostar t a new module.
 
-    Return:
-    ------
+    Returns:
         the SN of the module.
 
     """
@@ -67,12 +65,10 @@ def remove_defaul_keys(data, default_value=-9999):
     """Remove keys with deafault value.
 
     Args:
-    ----
         data: Input dictionary
         default_value: Defaultvalue. Defaults to -9999.
 
-    Returns
-    -------
+    Returns:
         data: trimmed dictionary
 
     """
@@ -92,9 +88,8 @@ class GlueWeight(Gtk.Window):
 
     def __init__(self, session, ifile=None):
         """Initialization.
-
+    
         Args:
-        ----
             session: ITkDB session_
             ifile (optional): Input file. Defaults to None.
 
@@ -205,13 +200,11 @@ class GlueWeight(Gtk.Window):
         """Create the dialog for a DB test and add it to the notebook.
 
         Args:
-        ----
             test_json: The JSon-like dict with the values
             test_name: The name of the test for internal indexing
             label: The label for the Notebook
 
-        Return:
-        ------
+        Returns:
             The box containing the data.
 
         """
@@ -271,12 +264,10 @@ class GlueWeight(Gtk.Window):
         """Parse a data file.
 
         Args:
-        ----
             ifile (): A file object.
             module_sep: tag to idenntify a new module.
 
-        Returns
-        -------
+        Returns:
             a list of tests (json)
 
         """

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/GroundVITests.py

@@ -135,7 +135,6 @@ class GroundingTest(dbGtkUtils.ITkDBWindow):
         """Create and add to notebook a test dialog.
 
         Args:
-        ----
             label: The label for the Notebook
             test_name: The DB name of the test
             institute: The institute.

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/ITkDB.svg

@@ -11,7 +11,10 @@
    sodipodi:docname="ITkDB.svg"
    width="75"
    height="60"
-   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   inkscape:export-filename="ITkDB.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -40,8 +43,13 @@
    showgrid="false"
    inkscape:zoom="10.143094"
    inkscape:cx="38.794869"
-   inkscape:cy="18.879841"
-   inkscape:current-layer="g10" />
+   inkscape:cy="18.929135"
+   inkscape:current-layer="g9542"
+   inkscape:window-width="1368"
+   inkscape:window-height="1087"
+   inkscape:window-x="0"
+   inkscape:window-y="44"
+   inkscape:window-maximized="0" />
 <g
    id="g142"
    transform="translate(14.828749,-1.5740459)">

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/ITkDBlogin.py

@@ -254,7 +254,6 @@ class ITkDBlogin(Gtk.Dialog):
         """Opens an error dialog.
 
         Args:
-        ----
             main_title: Main text in window
             second_text: Second text
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/ITkDButils.py

@@ -50,7 +50,6 @@ def get_db_date(timestamp=None):
     """Convert a date string into the expected DB format.
 
     Args:
-    ----
         timestamp: A date in string format
 
     """
@@ -81,13 +80,11 @@ def registerPetalCore(client, SN, alias, HC_id=None):
     """Register a Petal Core in the DB.
 
     Args:
-    ----
         SN: Serial Number
         alias: The alias of the Petal
         HC_id: Comma separated list of HC identifiers.
 
-    Returns
-    -------
+    Returns:
         _type_: _description_
 
     """
@@ -116,7 +113,6 @@ def create_component_attachment(client, SN, file_path, title=None, description="
     """Create an attachment to the given component.
 
     Args:
-    ----
         client: The DB client
         SN: The SN of the component.
         file_path: The pat to th efile to be attached.
@@ -167,7 +163,6 @@ def set_component_property(client, SN, property, value):
     """Set the value of an object property.
 
     Args:
-    ----
         client: The DB client
         SN: The object SN
         property: The property name
@@ -192,7 +187,6 @@ def assemble_component(client, parent, child):
     """Assemble child into parent.
 
     Args:
-    ----
         client: The DB client
         parent: The parent object or container.
         child: The child to be assembled.
@@ -214,7 +208,6 @@ def set_object_stage(client, SN, stage):
     """Set stage of object
 
     Args:
-    ----
         client: DB session
         SN: Serial number
         stage: Stage
@@ -247,13 +240,11 @@ def upload_test(client, data, attachments=None):
     """Upload a test to the DB.
 
     Args:
-    ----
         client: The DB client
         data (dict): A dictionary with all the elements of thee test.
-        attachments (Attachments): one or more (in a list) Attachments to the test
+        attachments ([Attachment]): one or more (in a list) Attachment to the test
 
     Return:
-    ------
         resp: The response of the DB session.
 
     """
@@ -288,12 +279,11 @@ def upload_test(client, data, attachments=None):
         return (str(e))
 
 
-def create_shipment(session, sender, recipient, items, name=None, send=False, type="domestic",
-                    attachment=None, comments=None):
+def create_shipment(session, sender, recipient, items, name=None, send=False, 
+                    type="domestic", attachment=None, comments=None):
     """Create a chipment.
 
     Args:
-    ----
         session : The itkdb session
         sender : The sender ID
         recipient : The recipient ID
@@ -301,7 +291,7 @@ def create_shipment(session, sender, recipient, items, name=None, send=False, ty
         name: the name of the shipment.
         send: If true, the status of the shipment is updated to inTransit
         type (optional): Type of shipment. Defaults to "domestic".
-        attachment (optional): Attachment object.
+        attachment (optional, :class:`Attachment`): :class:`Attachment` object.
         comments (optional): comments for the shipment
 
     """
@@ -437,7 +427,6 @@ def get_testrun(session, test_id, out_type="object"):
     """Retrieve information about a given test.
 
     Args:
-    ----
         session : The itkdb session
         test_id : The ID of the test.
         out_type (optional): Type of output (full or object). Defaults to "object".
@@ -456,7 +445,6 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
     """Get the skeleton of the given test.
 
     Args:
-    ----
         session: The DB session
         component: The component which is tested
         test_code: The test code

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/UploadModuleIV.py

@@ -574,8 +574,8 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         """Find module (SN) on database
 
         Args:
-        ----
-            SN (str): Module Serial number
+            SN (str): Module Serial number.
+            
         """
         md = ITkDButils.get_DB_component(self.session, SN)
         if md is None:

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/UploadMultipleTests.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 try:
     import itkdb_gtk
-    
+
 except ImportError:
     from pathlib import Path
     cwd = Path(sys.argv[0]).parent.parent
@@ -39,14 +39,12 @@ def all_files(root, patterns='*', single_level=False, yield_folders=False):
     """A generator that reruns all files in the given folder.
 
     Args:
-    ----
         root (file path): The folder
         patterns (str, optional): The pattern of the files. Defaults to '*'.
         single_level (bool, optional): If true, do not go into sub folders. Defaults to False.
         yield_folders (bool, optional): If True, return folders as well. Defaults to False.
 
-    Yields
-    ------
+    Yields:
         str: file path name
 
     """
@@ -67,17 +65,16 @@ def all_files(root, patterns='*', single_level=False, yield_folders=False):
 
 
 class TestList(object):
-    SN, TestType, RunNumber, Date, Institute, Path, Json, Nattch, Attachments, Ncomm, Comments, Ndef, Defects, ALL = range(14)
+    SN, TestType, RunNumber, Date, Institute, Stage, currentStage, Path, Json, Nattch, Attachments, Ncomm, Comments, Ndef, Defects, ALL = range(16)
 
 
 def check_data(data):
     """Checks validity of JSon data.
 
     Args:
-    ----
         data (): The json data
 
-    Returns
+    Returns:
     -------
         boolean: True if valid, False otherwise.
 
@@ -110,7 +107,6 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         """Initialization.
 
         Args:
-        ----
             session: ITkDB session
 
         """
@@ -177,7 +173,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
     def create_tree_view(self, size=150):
         """Creates the tree vew with the attachments."""
-        model = Gtk.ListStore(str, str, str, str, str, str, object, int, object, int, object, int, object)
+        model = Gtk.ListStore(str, str, str, str, str, str, str, str, object, int, object, int, object, int, object)
         self.tree = Gtk.TreeView(model=model)
         self.tree.connect("button-press-event", self.button_pressed)
         scrolled = Gtk.ScrolledWindow()
@@ -201,6 +197,10 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         column = Gtk.TreeViewColumn("Institute", renderer, text=TestList.Institute)
         self.tree.append_column(column)
 
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("Stage", renderer, text=TestList.Stage)
+        self.tree.append_column(column)
+
         renderer = Gtk.CellRendererText()
         column = Gtk.TreeViewColumn("N. att.", renderer, text=TestList.Nattch)
         self.tree.append_column(column)
@@ -257,6 +257,10 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         item_show.connect("activate", self.on_show_json, (model, iter, values))
         menu.append(item_show)
 
+        item_set_stage = Gtk.MenuItem(label="Set Stage")
+        item_set_stage.connect("activate", self.on_set_stage, (model, iter, values))
+        menu.append(item_set_stage)
+
         item_show_att = Gtk.MenuItem(label="Edit Attachments")
         item_show_att.connect("activate", self.on_show_attachments, (model, iter, values))
         menu.append(item_show_att)
@@ -289,7 +293,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             model.set_value(iter, TestList.RunNumber, payload["runNumber"])
             model.set_value(iter, TestList.Date, handle_test_date(payload["date"]))
             model.set_value(iter, TestList.Institute, handle_test_date(payload["institution"]))
-            
+
 
         dlg.hide()
         dlg.destroy()
@@ -367,6 +371,66 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         dlg.destroy()
         return out, use_default
 
+    def on_set_stage(self, item, data):
+        """Set the test stage."""
+        model, iter, val = data
+        SN = val[TestList.SN]
+        combo, currentStage = self.get_component_stages(SN)
+
+        dlg = Gtk.Dialog(title="Add Attachment")
+
+        dlg.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                        Gtk.STOCK_OK, Gtk.ResponseType.OK)
+        area = dlg.get_content_area()
+        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        area.add(box)
+
+        box.pack_start(Gtk.Label(label="Select Stage"), False, True, 0)
+        box.pack_start(combo, False, True, 0)
+        dlg.show_all()
+
+        rc = dlg.run()
+        if rc == Gtk.ResponseType.OK:
+            new_stage = combo.get_active_text()
+            model[iter][TestList.Stage] = new_stage
+            data = model[iter][TestList.Json]
+            changed = (new_stage != model[iter][TestList.currentStage])
+            data["isRetroactive"] = changed
+            if changed:
+                data["stage"] = new_stage
+            else:
+                if "stage" in data:
+                    del data["stage"]
+
+            model[iter][TestList.Json] = data
+
+
+        dlg.hide()
+        dlg.destroy()
+
+
+    def get_component_stages(self, SN):
+        """Create a combo with the stages."""
+        try:
+            obj = ITkDButils.get_DB_component(self.session, SN)
+            currentStage = obj["currentStage"]["code"]
+
+            combo = Gtk.ComboBoxText.new_with_entry()
+            combo.remove_all()
+            indx = 0
+            for i, stg in enumerate(obj["stages"]):
+                S = stg["code"]
+                combo.append_text(S)
+                if S == currentStage:
+                    indx = i
+
+            combo.set_active(indx)
+            return combo, currentStage
+
+        except Exception:
+            self.write_message("Something went wring with the stages")
+            return [None, None]
+
     def add_tests_to_view(self, files):
         """Add the input fiels to the treeview."""
         default_site = None
@@ -419,8 +483,10 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                     comments = data.get("comments", [])
                     defects = data.get("defects", [])
                     the_date = handle_test_date(data["date"])
+                    combo, currentStage = self.get_component_stages(data["component"])
                     model.append([data["component"], data["testType"], data["runNumber"], the_date,
-                                  data["institution"], ifile, data, len(attachments), attachments,
+                                  data["institution"], currentStage, currentStage,
+                                  ifile, data, len(attachments), attachments,
                                   len(comments), comments, len(defects), defects])
 
             except Exception as E:

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/UploadPetalInformation.py

@@ -14,7 +14,7 @@ from gi.repository import Gtk, Gio
 
 try:
     import itkdb_gtk
-    
+
 except ImportError:
     from pathlib import Path
     cwd = Path(sys.argv[0]).parent.parent
@@ -44,11 +44,9 @@ def get_type(child):
     """Return object type
 
     Args:
-    -----
         child (): object
 
-    Returns
-    -------
+    Returns:
         str: object type
 
     """
@@ -229,13 +227,11 @@ class AVSPanel(Gtk.Window):
         """Create the dialog for a DB test and add it to the notebook.
 
         Args:
-        ----
             test_json: The JSon-like dict with the values
             test_name: The name of the test for internal indexing
             label: The label for the Notebook
 
-        Return:
-        ------
+        Returns:
             The box containing the data.
 
         """
@@ -264,7 +260,6 @@ class AVSPanel(Gtk.Window):
         """Register petal core in DB.
 
         Args:
-        ----
             SN: The petal Serial Number.
 
         """
@@ -610,7 +605,8 @@ class AVSPanel(Gtk.Window):
                 complain("Could not upload test {}".format(values["testType"]), res)
 
 
-if __name__ == "__main__":
+def main():
+    """The main entry."""
     # Parse command line options
     parser = ArgumentParser()
     parser.add_argument('files', nargs='*', help="Input files")
@@ -640,3 +636,6 @@ if __name__ == "__main__":
     print("Bye !!")
     dlg.die()
     sys.exit()
+
+if __name__ == "__main__":
+    main()

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/UploadTest.py

@@ -48,11 +48,9 @@ def check_data(data):
     """Checks validity of JSon data.
 
     Args:
-    ----
         data (): The json data
 
-    Returns
-    -------
+    Returns:
         boolean: True if valid, False otherwise.
 
     """
@@ -84,7 +82,6 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         """Initialization.
 
         Args:
-        ----
             session: ITkDB session
             payload: path of test file
             attachment: an Attachment object or list of attachments.
@@ -92,6 +89,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         """
         self.payload = payload
         self.data = None
+        self.folder = None
         self.attachments = []
         self.comments = []
         self.defects = []
@@ -169,6 +167,19 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         self.entryTest = Gtk.Entry()
         grid.attach(self.entryTest, 1, 2, 1, 1)
 
+        # Object Stage
+        lbl = Gtk.Label(label="Object Stage")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 3, 1, 1)
+
+        self.objStage = Gtk.ComboBoxText.new()
+        self.objStage.connect("changed", self.on_new_stage)
+        grid.attach(self.objStage, 1, 3, 1, 1)
+
+        self.isRetroactive = Gtk.ToggleButton.new_with_label("RetroActive")
+        grid.attach(self.isRetroactive, 2, 3, 1, 1)
+
+
         # The "Add attachment" button.
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.mainBox.pack_start(box, False, False, 0)
@@ -204,16 +215,11 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
                 else:
                     print("Input file does not exists: {}".format(self.payload))
-                    
+
             except TypeError:
                 self.load_payload(self.payload)
                 self.write_message("Loaded memory payload.")
 
-        #if len(self.attachments):
-        #    dC = [A for A in self.attachments]
-        #    self.attachments.clear()
-        #    for A in dC:
-        #        self.append_attachment_to_view(A)
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
 
@@ -250,20 +256,57 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         return out
 
     def load_payload(self, data):
-        """Payloadis given as a dict."""
+        """Payload is given as a dict."""
         self.data = data
         errors, missing = check_data(self.data)
         self.complete_missing(missing, errors)
+        self.set_stages()
+
+    def on_new_stage(self, *args):
+        """New stage selected."""
+        stg = self.objStage.get_active_text()
+        changed = (stg != self.currentStage)
+        self.isRetroactive.set_active(changed)
+        self.data["isRetroactive"] = changed
+        if changed:
+            self.data["stage"] = stg
+        else:
+            if "stage" in self.data:
+                del self.data["stage"]
+
+    def set_stages(self):
+        """Prepare the stages combo."""
+        # Check the object stage
+        SN = self.data["component"]
+        try:
+            obj = ITkDButils.get_DB_component(self.session, SN)
+            self.currentStage = obj["currentStage"]["code"]
+
+            self.objStage.remove_all()
+            indx = 0
+            for i, stg in enumerate(obj["stages"]):
+                S = stg["code"]
+                self.objStage.append_text(S)
+                if S == self.currentStage:
+                    indx = i
+
+            self.objStage.set_active(indx)
+
+        except Exception:
+            self.write_message("Something went wring with the stages")
+
 
     def on_test_file(self, fdlg):
         """Test file browser clicked."""
         fnam = fdlg.get_filename()
+        self.folder = Path(fnam).parent
 
         # The file exists by definition
         try:
             self.data = json.loads(open(fnam).read())
             errors, missing = check_data(self.data)
             self.complete_missing(missing, errors)
+            self.set_stages()
 
         except Exception as E:
             self.data = None
@@ -285,6 +328,10 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
             else:
                 dbGtkUtils.complain("Invalid JSON data".format('\n'.join(errors)))
 
+        self.find_attachments()
+        self.find_comments()
+        self.find_defects()
+        
         self.entrySN.set_text(self.data["component"] if self.data["component"] else "")
         self.entryTest.set_text(self.data["testType"])
         self.comments = self.data.get("comments", [])
@@ -304,6 +351,24 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         dlg.hide()
         dlg.destroy()
 
+    def find_attachments(self):
+        """Find Attachments in payload."""
+        self.attachments = []
+        if "attachments" in self.data:
+            for A in self.data["attachments"]:
+                if not Path(A["path"]).exists():
+                    if self.folder:
+                        the_path = self.folder.joinpath(A["path"])
+                    else:
+                        continue
+                else:
+                    the_path = Path(A["path"]).expanduser().resolve()
+                    
+                self.attachments.append(ITkDButils.Attachment(the_path, A["title"], A["description"]))
+
+        if len(self.attachments) > 0:
+            self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
+
     def edit_attachments(self, *args):
         """Edit test attachmetns."""
         SA = ShowAttachments("Test Attachments", self.session, self.attachments, parent=self)
@@ -317,6 +382,15 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
 
+    def find_comments(self):
+        """Find comments in payload"""
+        self.comments = []
+        if "comments" in self.data:
+            for C in self.data["comments"]:
+                self.comments.append(C)
+                
+        if len(self.comments) > 0:
+            self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
 
     def edit_comments(self, *args):
         """Edit test comments."""
@@ -331,6 +405,17 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         if len(self.comments) > 0:
             self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
 
+
+    def find_defects(self):
+        """Find defects in payload."""
+        self.defects = []
+        if "defects" in self.data:
+            for D in self.data["defects"]:
+                self.defects.append(D)
+                
+        if len(self.defects) > 0:
+            self.btn_defects.set_label("Defects ({})".format(len(self.defects)))
+
     def edit_defects(self, *args):
         """Edit test defects."""
         SD = ShowDefects("Test Defects", self.defects, self)
@@ -356,6 +441,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
         self.data["comments"] = self.comments
         self.data["defects"] = self.defects
+            
         rc = ITkDButils.upload_test(self.session, self.data, self.attachments)
         if rc:
             ipos = rc.find("The following details may help:")

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/WireBondGui.py

@@ -168,8 +168,9 @@ class HybridHoles:
             irow: rown number
             ichan: channel number
 
-        Return:
+        Returns:
             True if added, False otherwise.
+            
         """
         first_chan = self.param[irow][0]
         last_chan = self.param[irow][1]

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.17"
+__version__ = "0.9.0"
 
 
 def dash_board():
@@ -25,9 +25,9 @@ def groundVITests():
     main()
 
 
-def sendShipments():
+def createShipments():
     """Send items."""
-    from .SendShipments import main
+    from .CreateShipments import main
     main()
 
 def uploadTest():
@@ -50,3 +50,8 @@ def wirebondTest():
     """Inputs data and eventually upload wirebod test."""
     from .WireBondGui import main
     main()
+
+def uploadPetalInformation():
+    """Read files from AVS nd create Petal core in PDB."""
+    from .UploadPetalInformation import main
+    main()

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/dashBoard.py

@@ -15,7 +15,8 @@ from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import GetShipments
 from itkdb_gtk import GroundVITests
 from itkdb_gtk import ITkDBlogin
-from itkdb_gtk import SendShipments
+from itkdb_gtk import CreateShipments
+from itkdb_gtk import UploadTest
 from itkdb_gtk import UploadMultipleTests
 from itkdb_gtk import GlueWeight
 from itkdb_gtk import UploadModuleIV
@@ -30,12 +31,13 @@ from gi.repository import Gtk
 class DashWindow(dbGtkUtils.ITkDBWindow):
     """Dashboard class."""
     UPLOAD_TEST = 1
-    CREATE_SHIPMNT = 2
-    RECV_SHIPMNT = 3
-    PETAL_GND = 4
-    GLUE_WEIGHT = 5
-    MOD_IV = 6
-    WIRE_BOND = 7
+    UPLOAD_MANY_TESTS = 2
+    CREATE_SHIPMNT = 3
+    RECV_SHIPMNT = 4
+    PETAL_GND = 5
+    GLUE_WEIGHT = 6
+    MOD_IV = 7
+    WIRE_BOND = 8
     
     def __init__(self, session):
         """Initialization."""
@@ -60,27 +62,31 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         grid.attach(lbl, 0, irow, 1, 1)
 
         irow += 1
-        btnTest = Gtk.Button(label="Upload Tests (json)")
+        btnTest = Gtk.Button(label="Upload Single Test")
         btnTest.connect("clicked", self.upload_test)
         grid.attach(btnTest, 0, irow, 1, 1)
 
+        btnTest = Gtk.Button(label="Upload Multiple Tests")
+        btnTest.connect("clicked", self.upload_multiple_tests)
+        grid.attach(btnTest, 1, irow, 1, 1)
+
+        irow += 1
         btnGnd = Gtk.Button(label="Petal VI/GND")
         btnGnd.connect("clicked", self.petal_gnd)
-        grid.attach(btnGnd, 1, irow, 1, 1)
+        grid.attach(btnGnd, 0, irow, 1, 1)
 
-        irow += 1
         btnWeight = Gtk.Button(label="GlueWeight")
         btnWeight.connect("clicked", self.glue_weight)
-        grid.attach(btnWeight, 0, irow, 1, 1)
+        grid.attach(btnWeight, 1, irow, 1, 1)
 
+        irow += 1
         btnModIV = Gtk.Button(label="Module IV")
         btnModIV.connect("clicked", self.module_IV)
-        grid.attach(btnModIV, 1, irow, 1, 1)
+        grid.attach(btnModIV, 0, irow, 1, 1)
 
-        irow +=1
         btnWireBond = Gtk.Button(label="Wire Bond")
         btnWireBond.connect("clicked", self.wire_bond)
-        grid.attach(btnWireBond, 0, irow, 1, 1)
+        grid.attach(btnWireBond, 1, irow, 1, 1)
 
 
 
@@ -113,19 +119,30 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         if self.mask & bt:
             return
 
+        self.mask |= bt
+        W = UploadTest.UploadTest(self.session)
+        W.connect("destroy", self.app_closed, bitn)
+
+    def upload_multiple_tests(self, *args):
+        """Launch upload multiple test."""
+        bitn = DashWindow.UPLOAD_MANY_TESTS
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
         self.mask |= bt
         W = UploadMultipleTests.UploadMultipleTests(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def create_shipment(self, *args):
-        """Launch sendShipment."""
+        """Launch createShipment."""
         bitn = DashWindow.CREATE_SHIPMNT
         bt = 1 << bitn
         if self.mask & bt:
             return
 
         self.mask |= bt
-        W = SendShipments.SendShipments(self.session)
+        W = CreateShipments.CreateShipments(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def receive_shipment(self, *args):

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/dbGtkUtils.py

@@ -108,7 +108,6 @@ def empty_container(container):
     """Remove all children from a container.
 
     Args:
-    ----
         container: The container.
 
     """
@@ -121,7 +120,6 @@ def replace_in_container(container, child):
     """Replace a child from a single-child container.
 
     Args:
-    ----
         container: the container
         child: the new child to be added
 
@@ -138,7 +136,6 @@ def complain(main_title, second_text="", parent=None):
     """Open an error dialog.
 
     Args:
-    ----
         main_title: Main text in window
         second_text: Second text
         parent: dialog parent
@@ -160,13 +157,11 @@ def ask_for_confirmation(main_title, second_text, parent=None):
     """Ask for action cofirmation.
 
     Args:
-    ----
         main_title: Main title in the message window
         second_text: Secondary text in the message widow
         parent (optional): The parent window. Defaults to None.
 
     Return:
-    ------
         OK: True if OK button clicked.
 
     """
@@ -254,14 +249,12 @@ def get_a_value(main_title, second_text=None, is_tv=False, parent=None):
     """Open a dialog to get a value.
 
     Args:
-    ----
         main_title: Main title in the message window
         is_tv: If true show a text view rathar than an entry.
         second_text: Secondary text in the message widow
         parent (optional): The parent window. Defaults to None.
 
     Return:
-    ------
         value: The value in the entry
 
     """
@@ -274,9 +267,9 @@ def get_a_value(main_title, second_text=None, is_tv=False, parent=None):
     box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
     area.add(box)
 
-    box.pack_start(Gtk.Label(main_title), False, True, 0)
+    box.pack_start(Gtk.Label(label=main_title), False, True, 0)
     if second_text and len(second_text):
-        box.pack_start(Gtk.Label(second_text), False, True, 0)
+        box.pack_start(Gtk.Label(label=second_text), False, True, 0)
 
     entry = TextEntry(3 if is_tv else -1)
 
@@ -299,15 +292,13 @@ def get_a_list_of_values(main_title, labels, defaults=None, second_text=None, pa
     """Get a list of values.
 
     Args:
-    ----
         main_title: Main title for window
         labels: List of labes to get the values. If the label ends with /v
                 then a TextView will be shown instead of a TextEntry.
         defaults (optional): default values-
         second_text (optional): Second title for window-. Defaults to None.
 
-    Returns
-    -------
+    Returns:
         list with values
 
     """
@@ -325,7 +316,7 @@ def get_a_list_of_values(main_title, labels, defaults=None, second_text=None, pa
     lbl.set_markup("<b>{}</b>".format(main_title))
     box.pack_start(lbl, False, True, 5)
     if second_text and len(second_text):
-        box.pack_start(Gtk.Label(second_text), False, True, 0)
+        box.pack_start(Gtk.Label(label=second_text), False, True, 0)
 
     entries = []
     values = []
@@ -341,7 +332,7 @@ def get_a_list_of_values(main_title, labels, defaults=None, second_text=None, pa
         else:
             is_text_view.append(False)
 
-        lbl = Gtk.Label(txt)
+        lbl = Gtk.Label(label=txt)
         lbl.set_justify(Gtk.Justification.LEFT)
         vbox.pack_start(lbl, False, False, 0)
 
@@ -369,7 +360,6 @@ def add_button_to_container(box, label, tooltip=None, callback=None):
     """Creates a buttons and adds to container.
 
     Args:
-    ----
         box: The container.
         label: The button label
         tooltip (optional): Tooltip message. Defaults to None.
@@ -407,7 +397,7 @@ class MessagePanel(object):
         Args:
             size: size of the panel
 
-        Returns
+        Returns:
             Gtk.TextBuffer, Gtk.Frame
         """
         frame = Gtk.Frame()
@@ -453,7 +443,6 @@ class ITkDBWindow(Gtk.Window):
         """Initialization.
 
         Args:
-        ----
             title: The title of the window.
             session: ITkDB session.
             show_search: tooltip for search button in header (calls to query_db).
@@ -610,7 +599,6 @@ class DictDialog(Gtk.Grid):
         """Create the Gtk.Grid.
 
         Args:
-        ----
             values: A dict (JSon-like)
             hidden_keys: keys tha twill not be shown.
 
@@ -730,7 +718,6 @@ class DictDialog(Gtk.Grid):
         """Show the keys and values of a dictionary (JSON).
 
         Args:
-        ----
             values: The dictionary object
 
         """
@@ -764,8 +751,10 @@ class DictDialog(Gtk.Grid):
 def create_scrolled_dictdialog(the_dict, hidden=("component", "testType")):
     """Create a DictDialog within a scrolled window.
 
-    Return:
-    ------
+    Args:
+        the_dict: the input dictionary with values.
+        
+    Returns:
         scrolled: the scrolled window
         gM: the DictDialog
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/readAVSdata.py

@@ -37,7 +37,6 @@ def create_weight(session, SN, the_date=None, manager="", passed=True, problems=
     """Creates the dictionary for a WEIGHT test.
 
     Args:
-    ----
         session: the DB session
         SN: Serial Number
         the_date: the date of the test
@@ -62,7 +61,6 @@ def create_manufacturing(session, SN, the_date=None, manager="", passed=True, pr
     """Create the dictionary or the MANUFACTURING test.
 
     Args:
-    ----
         session: the DB session
         SN: Serial Number
         the_date: the date of the test
@@ -102,7 +100,6 @@ def create_delamination_test(session, SN, the_date=None, operator="", passed=Tru
     """Create the delamination test JSON.
 
     Args:
-    ----
         session: the DB session
         SN: Serial Number
         the_date: the date of the test
@@ -128,7 +125,6 @@ def create_grounding_test(session, SN, the_date=None, operator="", passed=True,
     """Create grounding test.
 
     Args:
-    ----
         session: the DB session
         SN: Serial Number
         the_date: the date of the test
@@ -154,7 +150,6 @@ def create_metrology_test(session, SN, the_date=None, operator="", passed=True,
     """Metrology test.
 
     Args:
-    ----
         session: the DB session
         SN: Serial Number
         the_date: the date of the test
@@ -316,7 +311,6 @@ def readFATfile(session, fnam, SN=None):
     """Read data from FAT excel file.
 
     Args:
-    ----
         session: the DB session
         fnam: File path
         SN: COre serial number
@@ -463,7 +457,6 @@ def readProductionSheet(session, fnam, SN):
     """Read data fro AVS PS.
 
     Args:
-    ----
         session: the DB session
         fnam: path of input file
         SN: The serial number

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/readGoogleSheet.py

@@ -55,7 +55,6 @@ def get_spreadsheet_data(url, data_range):
     """Get the data from the given range in teh google sheet.
 
     Args:
-    ----
         url: google sheet document url
         data_range: the data range, ej. inventory!A2:Z
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk/untrash_component.py

@@ -8,7 +8,7 @@ def untrash_component(client, SN, reason="Accidentally trashed"):
     Args:
         SN (str): Serial number of component to recover.
         reason (str): message for the DB
-    Return:
+    Returna:
         dict: PDB response.
 
     """

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.17
+Version: 0.9.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
@@ -57,7 +57,7 @@ Find all shipments to be received at a given site and list them. It handles a
 barcode reader that helps identifying the items actually received for the
 reception. It will finally make the DB aware of the items receptioned.
 
-## SendShipments.py
+## CreateShipments.py
 Create a new shipment. Allows to add items with the QR reader as well as from a
 GUI dialog. One can add comments and attachments to the shipment.
 

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 README.md
 pyproject.toml
+itkdb_gtk/CreateShipments.py
 itkdb_gtk/GetShipments.py
 itkdb_gtk/GlueWeight.py
 itkdb_gtk/GroundVITests.py
@@ -7,7 +8,6 @@ itkdb_gtk/ITkDB.desktop
 itkdb_gtk/ITkDB.svg
 itkdb_gtk/ITkDBlogin.py
 itkdb_gtk/ITkDButils.py
-itkdb_gtk/SendShipments.py
 itkdb_gtk/ShowAttachments.py
 itkdb_gtk/ShowComments.py
 itkdb_gtk/ShowDefects.py

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/itkdb_gtk.egg-info/entry_points.txt

@@ -1,9 +1,10 @@
 [gui_scripts]
+createShipments = itkdb_gtk:createShipments
 getShipments = itkdb_gtk:getShipments
 glueWeight = itkdb_gtk:glueWeight
 groundVITests = itkdb_gtk:groundVITests
+iploadPetalInformation = itkdb_gtk:uploadPetalInformation
 itkdb_dashBoard = itkdb_gtk:dash_board
-sendShipments = itkdb_gtk:sendShipments
 uploadModuleIV = itkdb_gtk:uploadModuleIV
 uploadMultipleTests = itkdb_gtk:uploadMultipleTests
 uploadTest = itkdb_gtk:uploadTest

{itkdb_gtk-0.0.17 → itkdb_gtk-0.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.0.17"
+version = "0.9.0"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -31,11 +31,12 @@ itkdb_dashBoard = "itkdb_gtk:dash_board"
 getShipments = "itkdb_gtk:getShipments"
 glueWeight = "itkdb_gtk:glueWeight"
 groundVITests = "itkdb_gtk:groundVITests"
-sendShipments = "itkdb_gtk:sendShipments"
+createShipments = "itkdb_gtk:createShipments"
 uploadTest = "itkdb_gtk:uploadTest"
 uploadMultipleTests = "itkdb_gtk:uploadMultipleTests"
 uploadModuleIV = "itkdb_gtk:uploadModuleIV"
 wirebondTest = "itkdb_gtk:wirebondTest"
+iploadPetalInformation = "itkdb_gtk:uploadPetalInformation"
 
 [tool.setuptools]
 include-package-data = true