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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.17
+Version: 0.0.18
 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.0.17 → itkdb_gtk-0.0.18}/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
@@ -67,7 +67,7 @@ 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):
@@ -177,7 +177,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 +201,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 +261,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 +297,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 +375,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 +487,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.0.18}/itkdb_gtk/UploadTest.py

@@ -92,6 +92,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         """
         self.payload = payload
         self.data = None
+        self.folder = None
         self.attachments = []
         self.comments = []
         self.defects = []
@@ -169,6 +170,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 +218,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 +259,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 +331,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 +354,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 +385,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 +408,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 +444,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.0.18}/itkdb_gtk/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.17"
+__version__ = "0.0.18"
 
 
 def dash_board():

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

@@ -16,6 +16,7 @@ from itkdb_gtk import GetShipments
 from itkdb_gtk import GroundVITests
 from itkdb_gtk import ITkDBlogin
 from itkdb_gtk import SendShipments
+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,6 +119,17 @@ 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)

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

@@ -274,9 +274,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)
 
@@ -325,7 +325,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 +341,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)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.0.17
+Version: 0.0.18
 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.0.17 → itkdb_gtk-0.0.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.0.17"
+version = "0.0.18"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]