itkdb-gtk 0.0.12__tar.gz → 0.0.16.dev0__tar.gz

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.12
+Version: 0.0.16.dev0
 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
@@ -9,6 +9,11 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+Requires-Dist: itkdb>=0.4.0
+Requires-Dist: openpyxl
+Requires-Dist: pyserial
+Requires-Dist: python_dateutil
+Requires-Dist: requests
 
 # Interaction with the ITk PDB.
 
@@ -53,12 +58,15 @@ reception. It will finally make the DB aware of the items receptioned.
 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.
 
-## groundingTest.py
-Allows to enter valueos, comments and defects for those ot items in the gounding
+## groundVITests.py
+Allows to upload and enter valueos, comments and defects for those items in the gounding
 and visual instpections tests of the petal core.
 
+## uploadIVfiles.py
+The idea behind this is that we messure the IV on a Ring module and on only one of the to Half modules. The IV of the remaining half modules is derived from the other 2. Eventually the IV test can be uploaded to the DB.
+
 ## dashBoard.py
 This is an launcher application from which we can start most of the other
 applications. It is a very good starting point. There is a Gnome desktop file (ITkDB.desktop)
-that needs to be copied to $HOME/.local/share/applications and an icon (ITkDB.svg) that
-needs to go to $HOME/.local/share/icons
+that needs to be copied to `$HOME/.local/share/applications` and an icon (ITkDB.svg) that
+needs to go to `$HOME/.local/share/icons`

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/README.md

@@ -41,12 +41,15 @@ reception. It will finally make the DB aware of the items receptioned.
 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.
 
-## groundingTest.py
-Allows to enter valueos, comments and defects for those ot items in the gounding
+## groundVITests.py
+Allows to upload and enter valueos, comments and defects for those items in the gounding
 and visual instpections tests of the petal core.
 
+## uploadIVfiles.py
+The idea behind this is that we messure the IV on a Ring module and on only one of the to Half modules. The IV of the remaining half modules is derived from the other 2. Eventually the IV test can be uploaded to the DB.
+
 ## dashBoard.py
 This is an launcher application from which we can start most of the other
 applications. It is a very good starting point. There is a Gnome desktop file (ITkDB.desktop)
-that needs to be copied to $HOME/.local/share/applications and an icon (ITkDB.svg) that
-needs to go to $HOME/.local/share/icons
+that needs to be copied to `$HOME/.local/share/applications` and an icon (ITkDB.svg) that
+needs to go to `$HOME/.local/share/icons`

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/itkdb_gtk/ITkDBlogin.py

@@ -92,6 +92,7 @@ class ITkDBlogin(Gtk.Dialog):
 
         if gtk_runs:
             self.create_window()
+            self.present()
             self.run()
 
         else:

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/itkdb_gtk/ITkDButils.py

@@ -235,9 +235,13 @@ def set_object_stage(client, SN, stage):
 def get_DB_component(client, SN):
     """Get ta component by its serial number."""
     global db_response
-    db_response = client.get('getComponent', json={'component': SN})
-    return db_response
+    try:
+        db_response = client.get('getComponent', json={'component': SN})
+        return db_response
 
+    except Exception as e:
+        db_response = str(e)
+        return None
 
 def upload_test(client, data, attachments=None):
     """Upload a test to the DB.

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/itkdb_gtk/__init__.py

@@ -1,10 +1,9 @@
-from . import dashBoard
-
-__version__ = "0.0.12"
+__version__ = "0.0.16.dev0"
 
 
 def dash_board():
     """Launches the dash board."""
+    from .dashBoard import main
     dashBoard.main()
 
 
@@ -20,9 +19,9 @@ def glueWeight():
     main()
 
 
-def gndVITests():
+def groundVITests():
     """GND/VI tests."""
-    from .gndVITests import main
+    from .groundVITests import main
     main()
 
 
@@ -42,3 +41,8 @@ def uploadMultipleTests():
     """Upload multiple tests."""
     from .uploadMultipleTests import main
     main()
+
+def uploadIVfiles():
+    """Upload IV files of single and double modules"""
+    from .uploadIVfiles import main
+    main()

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/itkdb_gtk/dashBoard.py

@@ -5,14 +5,16 @@ import sys
 try:
     import dbGtkUtils
     import getShipments
-    import groundingTest
+    import groundVITests
     import ITkDBlogin
     import sendShipments
     import uploadMultipleTests
     import GlueWeight
+    import uploadIVfiles
 
 except Exception:
-    from itkdb_gtk import dbGtkUtils, getShipments, groundingTest, ITkDBlogin, sendShipments, uploadMultipleTests, GlueWeight
+    from itkdb_gtk import dbGtkUtils, getShipments, groundVITests, uploadIVfiles
+    from itkdb_gtk import ITkDBlogin, sendShipments, uploadMultipleTests, GlueWeight
 
 import gi
 
@@ -22,7 +24,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
+    
     def __init__(self, session):
         """Initialization."""
         super().__init__(title="ITkDB Dashboard", session=session)
@@ -59,6 +67,11 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         btnWeight.connect("clicked", self.glue_weight)
         grid.attach(btnWeight, 0, irow, 1, 1)
 
+        btnModIV = Gtk.Button(label="Module IV")
+        btnModIV.connect("clicked", self.module_IV)
+        grid.attach(btnModIV, 1, irow, 1, 1)
+
+
         irow += 1
         grid.attach(Gtk.Label(), 0, irow, 1, 1)
 
@@ -83,7 +96,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
     def upload_test(self, *args):
         """Launch upload test."""
-        bitn = 1
+        bitn = DashWindow.UPLOAD_TEST
         bt = 1 << bitn
         if self.mask & bt:
             return
@@ -94,7 +107,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
     def create_shipment(self, *args):
         """Launch sendShipment."""
-        bitn = 2
+        bitn = DashWindow.CREATE_SHIPMNT
         bt = 1 << bitn
         if self.mask & bt:
             return
@@ -105,7 +118,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
     def receive_shipment(self, *args):
         """Launch getShipments."""
-        bitn = 3
+        bitn = DashWindow.RECV_SHIPMNT
         bt = 1 << bitn
         if self.mask & bt:
             return
@@ -116,18 +129,18 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
     def petal_gnd(self, *args):
         """Petal GND/VI test."""
-        bitn = 4
+        bitn = DashWindow.PETAL_GND
         bt = 1 << bitn
         if self.mask & bt:
             return
 
         self.mask |= bt
-        W = groundingTest.GroundingTest(self.session)
+        W = groundVITests.GroundingTest(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
     def glue_weight(self, *args):
         """Glue Weight test."""
-        bitn = 5
+        bitn = DashWindow.GLUE_WEIGHT
         bt = 1 << bitn
         if self.mask & bt:
             return
@@ -136,6 +149,17 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         W = GlueWeight.GlueWeight(self.session)
         W.connect("destroy", self.app_closed, bitn)
 
+    def module_IV(self, *args):
+        """Module IV tests."""
+        bitn = DashWindow.MOD_IV
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        self.mask |= bt
+        W = uploadIVfiles.IVwindow(self.session)
+        W.connect("destroy", self.app_closed, bitn)
+
     def app_closed(self, *args):
         """Application window closed. Clear mask."""
         bt = 1 << args[1]

{itkdb_gtk-0.0.12 → itkdb_gtk-0.0.16.dev0}/itkdb_gtk/dbGtkUtils.py

@@ -7,11 +7,23 @@ from datetime import datetime
 
 import dateutil.parser
 import gi
+import numpy as np
+
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio, GLib
 
 
+def is_a_date(txt):
+    """check tha the input string is a date."""
+    try:
+        dateutil.parser.parse(txt, fuzzy=False)
+        return True
+
+    except Exception:
+        return False
+
+
 def set_combo_iter(combo, txt, col=0):
     """Set scombo active iter to that containing txt in column col."""
     model = combo.get_model()
@@ -55,6 +67,12 @@ class MyEncoder(json.JSONEncoder):
         if isinstance(o, datetime):
             text = o.astimezone().isoformat()
             return text
+        elif isinstance(o, np.integer):
+            return int(o)
+        elif isinstance(o, np.floating):
+            return float(o)
+        elif isinstance(o, np.ndarray):
+            return o.tolist()
         else:
             return super().default(o)
 
@@ -300,6 +318,8 @@ def add_button_to_container(box, label, tooltip=None, callback=None):
         btn.connect("clicked", callback)
 
     box.pack_start(btn, True, False, 0)
+    
+    return btn
 
 
 class ITkDBWindow(Gtk.Window):
@@ -351,6 +371,9 @@ class ITkDBWindow(Gtk.Window):
 
         # Create main content box
         self.mainBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        self.mainBox.set_property("margin-left", 6)
+        self.mainBox.set_property("margin-right", 6)
+
         self.add(self.mainBox)
 
         # The text view and buffer
@@ -484,12 +507,18 @@ class DictDialog(Gtk.Grid):
         super().__init__(column_spacing=5, row_spacing=1)
 
         self.set_border_width(10)
+        self.factory = deepcopy(values)
         self.values = deepcopy(values)
         self.keys = {}
         self.containers = {}
         self.hidden_keys = hidden_keys
         self.show_values()
 
+    def factory_reset(self):
+        """Set values to original values."""
+        self.values = deepcopy(self.factory)
+        self.refresh()
+
     def on_enter(self, entry, *args):
         """Get the value when we first enter into the Entry."""
         self.keys[args[2]] = entry.get_text()
@@ -519,6 +548,15 @@ class DictDialog(Gtk.Grid):
             elif isinstance(itm[last_key], datetime):
                 itm[last_key] = dateutil.parser.parse(txt)
 
+            elif is_a_date(itm[last_key]):
+                D = dateutil.parser.parse(txt)
+                out = D.isoformat(timespec='milliseconds')
+                if out[-1] not in ['zZ']:
+                    out += 'Z'
+
+                itm[last_key] = out
+                self.containers[name].set_text(out)
+
             else:
                 tp = type(itm[last_key])
                 itm[last_key] = tp(txt)

itkdb_gtk-0.0.12/itkdb_gtk/gndVITests.py → itkdb_gtk-0.0.16.dev0/itkdb_gtk/groundVITests.py

@@ -61,8 +61,16 @@ class GroundingTest(dbGtkUtils.ITkDBWindow):
         grid.attach(lbl, 0, 0, 1, 1)
 
         self.SN = Gtk.Entry()
+        self.SN.connect("focus-in-event", self.on_sn_enter)
+        self.SN.connect("focus-out-event", self.on_sn_leave)
         grid.attach(self.SN, 1, 0, 1, 1)
 
+        self.alias = Gtk.Label(label="")
+        grid.attach(self.alias, 2, 0, 1, 1)
+
+        self.stage = Gtk.Label(label="")
+        grid.attach(self.stage, 3, 0, 1, 1)
+
         lbl = Gtk.Label(label="Institute")
         lbl.set_xalign(0)
         grid.attach(lbl, 0, 1, 1, 1)
@@ -91,6 +99,7 @@ class GroundingTest(dbGtkUtils.ITkDBWindow):
         # Create the Notebook pages
         self.create_test_box("Visual Inspection", "VISUAL_INSPECTION")
         self.create_test_box("Grounding", "GROUNDING_CHECK")
+        self.create_test_box("Pipe bending", "BENDING120")
 
         # The text view
         frame = self.create_text_view()
@@ -98,6 +107,29 @@ class GroundingTest(dbGtkUtils.ITkDBWindow):
 
         self.show_all()
 
+    def on_sn_enter(self, entry, *args):
+        """Enter in SN entry."""
+        self._sn = entry.get_text()
+
+    def on_sn_leave(self, entry, *args):
+        """Leave SN entry."""
+        sn = entry.get_text()
+        if sn != self._sn:
+            self.query_db()
+            current_location = self.dbObject["currentLocation"]["code"]
+            dbGtkUtils.set_combo_iter(self.inst_cmb, current_location, 0)
+
+            stg = self.dbObject["currentStage"]["name"]
+            self.stage.set_text(stg)
+
+            alias = self.dbObject["alternativeIdentifier"]
+            self.alias.set_text(alias)
+
+            npages = self.notebook.get_n_pages()
+            for i in range(npages):
+                page = self.notebook.get_nth_page(i)
+                page.dict_dialog.factory_reset()
+
     def create_test_box(self, label, test_name, institute="IFIC"):
         """Create and add to notebook a test dialog.
 

itkdb_gtk-0.0.16.dev0/itkdb_gtk/untrash_component.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+"""Un trash a trashed component."""
+
+
+def untrash_component(client, SN, reason="Accidentally trashed"):
+    """Un trash given component.
+
+    Args:
+        SN (str): Serial number of component to recover.
+        reason (str): message for the DB
+    Return:
+        dict: PDB response.
+
+    """
+    DTO = {
+        'component': SN,
+        'trashed': False,
+        'reason': reason
+    }
+
+    response = client.post('setComponentTrashed', json=DTO)
+    return response
+
+
+if __name__ == "__main__":
+    import sys
+    from itkdb_gtk import ITkDBlogin
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+
+    try:
+        response = untrash_component(client, sys.argv[1])
+
+    except Exception as E:
+        print(str(E))