itkdb-gtk 0.10.9.dev4__py3-none-any.whl → 0.10.10__py3-none-any.whl

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,13 +40,13 @@ 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.",
                          help_link=help_link)
 
-        self.institute = "IFIC"
+        self.institute = self.pdb_user["institutions"][0]["code"]
         self.global_image = None
         self.global_link = None
 
@@ -64,7 +63,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(grid, False, False, 5)
 
         irow = 0
-        receiver = self.create_institute_combo()
+        receiver = self.create_institute_combo(only_user=True)
         receiver.connect("changed", self.on_institute)
         receiver.set_tooltip_text("Select the Institute making the test.")
         dbGtkUtils.set_combo_iter(receiver, self.institute)
@@ -511,7 +510,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
                 dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]), msg)
-                self.write_message(msg)
+                self.write_message(msg+"\n")
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
@@ -525,15 +524,16 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     rc = ITkDButils.set_test_run_parameter(self.session,
                                                            ITkDButils.uploaded_test_runs[0],
                                                            "COMMENT", "Picture of PW carrier")
-                    
+
                     rc = ITkDButils.set_test_run_parameter(self.session,
                                                            ITkDButils.uploaded_test_runs[0],
                                                            "LINK_TO_PICTURE", global_link)
                     if rc:
                         ipos = rc.find("The following details may help:")
                         msg = rc[ipos:]
-                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"], payload["testType"]), msg)
-                        self.write_message(msg)
+                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"],
+                                                                                           payload["testType"]), msg)
+                        self.write_message(msg+'\n')
 
                 elif payload["testType"] == "VISUAL_INSPECTION_RECEPTION":
                     rc = ITkDButils.create_test_run_comment(self.session,
@@ -542,8 +542,11 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     if rc:
                         ipos = rc.find("The following details may help:")
                         msg = rc[ipos:]
-                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"], payload["testType"]), msg)
-                        self.write_message(msg)
+                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"],
+                                                                                                 payload["testType"]), msg)
+                        self.write_message(msg+"\n")
+                    else:
+                        self.write_message("Image: {}\n".format(global_link))
 
 
             n_items += 1
@@ -560,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:
@@ -569,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

@@ -40,7 +40,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
 
     def __init__(self, session, help_link=None):
         """Initialization."""
-        super().__init__(title="ITkDB Dashboard",
+        super().__init__(title="Petal Reception Tests",
                          session=session,
                          show_search="Find object with given SN.",
                          help_link=help_link)
@@ -83,8 +83,8 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         lbl.set_xalign(0)
         grid.attach(lbl, 0, 1, 1, 1)
 
-        self.institute = "IFIC"
-        inst = self.create_institute_combo()
+        self.institute = self.pdb_user["institutions"][0]["code"]
+        inst = self.create_institute_combo(only_user=True)
         inst.connect("changed", self.new_institute)
         inst.set_tooltip_text("Select the Institute.")
         grid.attach(inst, 1, 1, 1, 1)
@@ -114,6 +114,10 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         # The text view
         self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
 
+        # Set the default institute
+        dbGtkUtils.set_combo_iter(inst, self.institute)
+
+
         self.show_all()
 
     def on_SN_changed(self, entry, value):
@@ -139,7 +143,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             page.dict_dialog.factory_reset()
 
 
-    def create_test_box(self, label, test_name, institute="IFIC"):
+    def create_test_box(self, label, test_name, institute=None):
         """Create and add to notebook a test dialog.
 
         Args:
@@ -148,6 +152,9 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             institute: The institute.
 
         """
+        if institute is None:
+            institute = self.institute
+
         defaults = {
             "institution": institute,
             "runNumber": "1",
@@ -180,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
@@ -191,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()
@@ -273,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:
@@ -282,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

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 """GUI to upload tests."""
-import argparse
 import fnmatch
 import json
 import os
@@ -64,7 +63,26 @@ def all_files(root, patterns='*', single_level=False, yield_folders=False):
 
 
 class TestList(object):
-    SN, TestType, RunNumber, Date, Institute, Stage, currentStage, Path, Json, Nattch, Attachments, Ncomm, Comments, Ndef, Defects, ALL = range(16)
+    """Enumeration with TreeView model columns."""
+    (
+        SN,
+        TestType,
+        RunNumber,
+        Date,
+        Institute,
+        Stage,
+        currentStage,
+        Path,
+        Json,
+        Nattch,
+        Attachments,
+        Ncomm,
+        Comments,
+        Ndef,
+        Defects,
+        Color,
+        ALL,
+    ) = range(17)
 
 
 def check_data(data):
@@ -113,6 +131,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         self.tests = []
         self.data = None
         self.tree = None
+        self.def_color = None
 
         self.init_window()
 
@@ -174,7 +193,23 @@ 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, str, str, object, int, object, int, object, int, object)
+        model = Gtk.ListStore(str, # SN
+                              str, # test type
+                              str, # runNumber
+                              str, # date
+                              str, # institute
+                              str, # stage
+                              str, # stage
+                              str, # ifile
+                              object, # data
+                              int, # num. attch.
+                              object, # attachments
+                              int, # num. comments
+                              object, # comments
+                              int, # num defects
+                              object, # defects
+                              str # color
+                              )
         self.tree = Gtk.TreeView(model=model)
         self.tree.connect("button-press-event", self.button_pressed)
         scrolled = Gtk.ScrolledWindow()
@@ -187,7 +222,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         self.tree.append_column(column)
 
         renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("Test Type", renderer, text=TestList.TestType)
+        self.def_color = renderer.get_property("foreground-rgba").to_string()
+        column = Gtk.TreeViewColumn("Test Type", renderer, text=TestList.TestType, foreground=TestList.Color)
         self.tree.append_column(column)
 
         renderer = Gtk.CellRendererText()
@@ -376,7 +412,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         """Set the test stage."""
         model, lv_iter, val = data
         SN = val[TestList.SN]
-        combo, currentStage = self.get_component_stages(SN)
+        combo, _ = self.get_component_stages(SN)
 
         dlg = Gtk.Dialog(title="Add Attachment")
 
@@ -429,68 +465,84 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             return combo, currentStage
 
         except Exception:
-            self.write_message("Something went wring with the stages")
+            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
+                self.write_message("{}\n".format(Path(ifile).name))
+                folder = Path(ifile).parent
+
                 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.add_test_data_to_view(data, ifile=ifile, folder=folder)
 
-                    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"])
-                    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])
 
             except Exception as E:
                 self.write_message("Cannot load file {}\n".format(ifile))
@@ -600,6 +652,8 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         """Uploads tests and attachments."""
         model = self.tree.get_model()
         lv_iter = model.get_iter_first()
+        ngood = 0
+        nbad = 0
         while lv_iter:
             past_iter = None
             values = model[lv_iter]
@@ -611,20 +665,28 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             if rc:
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
-                dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]), msg)
-                self.write_message(msg)
+                dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]))
+                self.write_message("Failed uploading test {}-{}\n{}\n".format(payload["component"], payload["testType"], msg))
+                nbad += 1
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
                 past_iter = lv_iter
+                ngood += 1
 
             lv_iter = model.iter_next(lv_iter)
             if past_iter:
                 model.remove(past_iter)
 
+        if nbad>0:
+            dbGtkUtils.complain("Failed to upload all tests", "{} test had errors.\nThey are left in the ListView.")
+        else:
+            dbGtkUtils.complain("All {} tests uploaded succesfully".format(ngood))
+
 
 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()
@@ -636,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

@@ -9,7 +9,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
@@ -93,6 +92,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         self.attachments = []
         self.comments = []
         self.defects = []
+        self.currentStage = None
         if attachment is not None:
             if isinstance(attachment, ITkDButils.Attachment):
                 if attachment.path is not None:
@@ -211,14 +211,15 @@ 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))
 
             except TypeError:
                 self.load_payload(self.payload)
-                self.write_message("Loaded memory payload.")
+                self.write_message("Loaded memory payload.\n")
+                self.testF.set_sensitive(False)
 
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
@@ -293,7 +294,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
             self.objStage.set_active(indx)
 
         except Exception:
-            self.write_message("Something went wring with the stages")
+            self.write_message("Something went wrong with the stages\n")
 
 
     def on_test_file(self, fdlg):
@@ -303,7 +304,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
         # The file exists by definition
         try:
-            self.data = json.loads(open(fnam).read())
+            self.data = json.loads(open(fnam, encoding="UTF-8").read())
             errors, missing = check_data(self.data)
             self.complete_missing(missing, errors)
             self.set_stages()
@@ -326,7 +327,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                     self.write_message("Setting Institution to {}\n".format(self.data["institution"]))
 
             else:
-                dbGtkUtils.complain("Invalid JSON data".format('\n'.join(errors)))
+                dbGtkUtils.complain("Invalid JSON data\n{}".format('\n'.join(errors)))
 
         self.find_attachments()
         self.find_comments()
@@ -451,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")
@@ -482,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))