itkdb-gtk 0.0.14__py3-none-any.whl → 0.0.16__py3-none-any.whl

itkdb_gtk/{uploadMultipleTests.py → UploadMultipleTests.py}

@@ -8,19 +8,18 @@ import sys
 from pathlib import Path
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-    from ShowComments import ShowComments
-    from ShowAttachments import ShowAttachments
-    from ShowDefects import ShowDefects
-    from uploadTest import create_json_data_editor
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
-    from itkdb_gtk.ShowComments import ShowComments
-    from itkdb_gtk.ShowAttachments import ShowAttachments
-    from itkdb_gtk.ShowDefects import ShowDefects
-    from itkdb_gtk.uploadTest import create_json_data_editor
+    import itkdb_gtk
+    
+except ImportError:
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk.ShowComments import ShowComments
+from itkdb_gtk.ShowAttachments import ShowAttachments
+from itkdb_gtk.ShowDefects import ShowDefects
+from itkdb_gtk.UploadTest import create_json_data_editor
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -172,8 +171,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         paned.add1(tree_view)
 
         # The text view
-        frame = self.create_text_view()
-        paned.add2(frame)
+        paned.add2(self.message_panel.frame)
 
         self.show_all()
 

itkdb_gtk/{uploadPetalInformation.py → UploadPetalInformation.py}

@@ -13,15 +13,15 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio
 
 try:
-    import readAVSdata
-    import ITkDBlogin
-    import ITkDButils
+    import itkdb_gtk
+    
+except ImportError:
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
 
-    from dbGtkUtils import replace_in_container, complain, DictDialog, ask_for_confirmation
-
-except ModuleNotFoundError:
-    from itkdb_gtk import readAVSdata, ITkDBlogin, ITkDButils
-    from itkdb_gtk.dbGtkUtils import replace_in_container, complain, DictDialog, ask_for_confirmation
+from itkdb_gtk import readAVSdata, ITkDBlogin, ITkDButils
+from itkdb_gtk.dbGtkUtils import replace_in_container, complain, DictDialog, ask_for_confirmation
 
 
 def create_scrolled_dictdialog(the_dict, hidden=("component", "testType")):
@@ -261,7 +261,7 @@ class AVSPanel(Gtk.Window):
         replace_in_container(self.test_panel[key], scrolled)
 
     def check_register_petal(self, SN):
-        """Register teal core in DB.
+        """Register petal core in DB.
 
         Args:
         ----

itkdb_gtk/{uploadTest.py → UploadTest.py}

@@ -6,18 +6,17 @@ import sys
 from pathlib import Path
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-    from ShowComments import ShowComments
-    from ShowAttachments import ShowAttachments
-    from ShowDefects import ShowDefects
-
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
-    from itkdb_gtk.ShowComments import ShowComments
-    from itkdb_gtk.ShowAttachments import ShowAttachments
-    from itkdb_gtk.ShowDefects import ShowDefects
+    import itkdb_gtk
+
+except ImportError:
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk.ShowComments import ShowComments
+from itkdb_gtk.ShowAttachments import ShowAttachments
+from itkdb_gtk.ShowDefects import ShowDefects
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -88,7 +87,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         ----
             session: ITkDB session
             payload: path of test file
-            attachment: an Attachment object.
+            attachment: an Attachment object or list of attachments.
 
         """
         self.payload = payload
@@ -101,7 +100,12 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                 if attachment.path is not None:
                     self.attachments.append(attachment)
             else:
-                print("Wrong attachment: {}".format(attachment))
+                try:
+                    for att in attachment:
+                        self.attachments.append(att)
+
+                except TypeError:
+                    print("Wrong attachment: {}".format(attachment))
 
         global gtk_runs
         if gtk_runs:
@@ -168,15 +172,15 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         # The "Add attachment" button.
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.mainBox.pack_start(box, False, False, 0)
-        dbGtkUtils.add_button_to_container(box, "Attachments",
+        self.btn_attch = dbGtkUtils.add_button_to_container(box, "Attachments",
                                            "Click to edit attachments.",
                                            self.edit_attachments)
 
-        dbGtkUtils.add_button_to_container(box, "Comments",
+        self.btn_comments = dbGtkUtils.add_button_to_container(box, "Comments",
                                            "Click to edit comments.",
                                            self.edit_comments)
 
-        dbGtkUtils.add_button_to_container(box, "Defects",
+        self.btn_defects = dbGtkUtils.add_button_to_container(box, "Defects",
                                            "Click to edit defects.",
                                            self.edit_defects)
 
@@ -185,26 +189,40 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                                            self.upload_test_gui)
 
         # The text view
-        frame = self.create_text_view()
-        self.mainBox.pack_start(frame, True, True, 0)
+        self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
 
         self.show_all()
 
         if self.payload:
-            the_path = Path(self.payload).expanduser().resolve()
-            if the_path.exists():
-                ifile = Path(self.payload).expanduser().resolve().as_posix()
-                self.testF.set_filename(ifile)
-                self.on_test_file(self.testF)
+            try:
+                the_path = Path(self.payload).expanduser().resolve()
+                if the_path.exists():
+                    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))
 
-            else:
-                print("Input file does not exists: {}".format(self.payload))
+                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)))
+
+        if len(self.comments) > 0:
+            self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
+
+        if len(self.defects) > 0:
+            self.btn_defects.set_label("Defects ({})".format(len(self.defects)))
 
-        if len(self.attachments):
-            dC = [A for A in self.attachments]
-            self.attachments.clear()
-            for A in dC:
-                self.append_attachment_to_view(A)
 
     def get_test_institute(self):
         """Select an institue."""
@@ -231,6 +249,12 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         dlg.destroy()
         return out
 
+    def load_payload(self, data):
+        """Payloadis given as a dict."""
+        self.data = data
+        errors, missing = check_data(self.data)
+        self.complete_missing(missing, errors)
+
     def on_test_file(self, fdlg):
         """Test file browser clicked."""
         fnam = fdlg.get_filename()
@@ -239,30 +263,34 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         try:
             self.data = json.loads(open(fnam).read())
             errors, missing = check_data(self.data)
-
-            if len(missing):
-                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:
-                    site = self.get_test_institute()
-                    if site:
-                        self.data["institution"] = site
-                        self.write_message("Setting Institution to {}\n".format(self.data["institution"]))
-
-                else:
-                    dbGtkUtils.complain("Invalid JSON file\n{}".format('\n'.join(errors)), fnam)
-
-            self.entrySN.set_text(self.data["component"])
-            self.entryTest.set_text(self.data["testType"])
-            self.comments = self.data.get("comments", [])
-            self.defects = self.data.get("defects", [])
+            self.complete_missing(missing, errors)
 
         except Exception as E:
             self.data = None
             self.write_message("Cannot load file {}\n".format(fnam))
             self.write_message("{}\n".format(str(E)))
 
+    def complete_missing(self, missing, errors):
+        """Completes missing parts."""
+        if len(missing):
+            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:
+                site = self.get_test_institute()
+                if site:
+                    self.data["institution"] = site
+                    self.write_message("Setting Institution to {}\n".format(self.data["institution"]))
+
+            else:
+                dbGtkUtils.complain("Invalid JSON data".format('\n'.join(errors)))
+
+        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", [])
+        self.defects = self.data.get("defects", [])
+
+
     def show_data(self, *args):
         """Show data button clicked."""
         if self.data is None:
@@ -286,6 +314,10 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         SA.hide()
         SA.destroy()
 
+        if len(self.attachments) > 0:
+            self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
+
+
     def edit_comments(self, *args):
         """Edit test comments."""
         SC = ShowComments("Test Comments", self.comments, self)
@@ -296,6 +328,9 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         SC.hide()
         SC.destroy()
 
+        if len(self.comments) > 0:
+            self.btn_comments.set_label("Comments ({})".format(len(self.comments)))
+
     def edit_defects(self, *args):
         """Edit test defects."""
         SD = ShowDefects("Test Defects", self.defects, self)
@@ -306,6 +341,9 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
         SD.hide()
         SD.destroy()
 
+        if len(self.defects) > 0:
+            self.btn_defects.set_label("Defects ({})".format(len(self.defects)))
+
     def upload_test_gui(self, *args):
         """Uploads test and attachments."""
         self.upload_test()