itkdb-gtk 0.10.9.dev3__py3-none-any.whl → 0.10.10.dev1__py3-none-any.whl

itkdb_gtk/UploadModuleIV.py

@@ -16,7 +16,6 @@ import json
 import tempfile
 import copy
 from pathlib import Path
-import shutil
 
 from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg as FigureCanvas
 from matplotlib.backends.backend_gtk3 import NavigationToolbar2GTK3 as NavigationToolbar
@@ -56,11 +55,12 @@ def remove_files(W, flist):
 class IVwindow(dbGtkUtils.ITkDBWindow):
     """GUI for IV file handling."""
 
-    def __init__(self, session, title="IV window", options=None, help=None):
+    def __init__(self, session, title="IV window", options=None, help_link=None):
         """Initialization."""
-        super().__init__(
-            session=session, title=title, show_search=None, gtk_runs=gtk_runs, help=help
-        )
+        super().__init__(session=session, title=title,
+                         show_search=None, gtk_runs=gtk_runs,
+                         help_link=help_link
+                         )
         self.mdata = {}
         self.mod_type = {}
         self.mod_SN = {}
@@ -179,7 +179,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
         js_out.write(json.dumps(test, indent=3, cls=dbGtkUtils.MyEncoder))
         js_out.close()
 
-        attachment = ITkDButils.Attachment(data_out.name, "resultsFile", fnam)
+        attachment = ITkDButils.Attachment(path=data_out.name, title="resultsFile", desc=fnam)
         uploadW = UploadTest.UploadTest(self.session, js_out.name, attachment)
         uploadW.connect("destroy", remove_files, [data_out.name, js_out.name])
 
@@ -247,7 +247,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
             rc = fc.run()
             if rc == Gtk.ResponseType.OK:
                 SensorUtils.save_sensor_data(fc.get_filename(), mdata)
-                
+
             fc.hide()
             fc.destroy()
 
@@ -256,7 +256,7 @@ class IVwindow(dbGtkUtils.ITkDBWindow):
 
         if do_both.get_active():
             self.upload_test(self.mdata["single"], self.mod_type["single"])
-            
+
         dlg.destroy()
 
     def on_refresh(self, *args):

itkdb_gtk/UploadMultipleTests.py

@@ -11,7 +11,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
@@ -103,15 +102,17 @@ def check_data(data):
 class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
     """Collects information to upload a test and its attachments."""
 
-    def __init__(self, session, help=help):
+    def __init__(self, session, help_link=None):
         """Initialization.
 
         Args:
             session: ITkDB session
 
         """
-        super().__init__(session=session, title="Upload Tests", gtk_runs=gtk_runs, help=help)
+        super().__init__(session=session, title="Upload Tests", gtk_runs=gtk_runs, help_link=help_link)
         self.tests = []
+        self.data = None
+        self.tree = None
 
         self.init_window()
 
@@ -224,12 +225,12 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         # double click shows attachments
         if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
             select = self.tree.get_selection()
-            model, iter = select.get_selected()
-            if not iter:
+            model, lv_iter = select.get_selected()
+            if not lv_iter:
                 return
 
-            self.on_show_json(None, (model, iter, model[iter]))
-            # self.on_show_attachments(None, (model, iter, model[iter]))
+            self.on_show_json(None, (model, lv_iter, model[lv_iter]))
+            # self.on_show_attachments(None, (model, lv_iter, model[lv_iter]))
             return
 
         if event.button != 3:
@@ -237,44 +238,44 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
         # Create popup menu
         select = self.tree.get_selection()
-        model, iter = select.get_selected()
+        model, lv_iter = select.get_selected()
         values = None
-        if iter:
-            values = model[iter]
+        if lv_iter:
+            values = model[lv_iter]
 
-        if not iter:
+        if not lv_iter:
             P = tree.get_path_at_pos(event.x, event.y)
             if P:
                 print(P[0].to_string())
-                iter = model.get_iter(P[0])
-                values = model[iter]
+                lv_iter = model.get_iter(P[0])
+                values = model[lv_iter]
 
         if not values:
             return
 
         menu = Gtk.Menu()
         item_show = Gtk.MenuItem(label="Show JSOn")
-        item_show.connect("activate", self.on_show_json, (model, iter, values))
+        item_show.connect("activate", self.on_show_json, (model, lv_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))
+        item_set_stage.connect("activate", self.on_set_stage, (model, lv_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))
+        item_show_att.connect("activate", self.on_show_attachments, (model, lv_iter, values))
         menu.append(item_show_att)
 
         item_show_com = Gtk.MenuItem(label="Edit Comments")
-        item_show_com.connect("activate", self.on_show_comments, (model, iter, values))
+        item_show_com.connect("activate", self.on_show_comments, (model, lv_iter, values))
         menu.append(item_show_com)
 
         item_show_def = Gtk.MenuItem(label="Edit Defects")
-        item_show_def.connect("activate", self.on_show_defects, (model, iter, values))
+        item_show_def.connect("activate", self.on_show_defects, (model, lv_iter, values))
         menu.append(item_show_def)
 
         item_del = Gtk.MenuItem(label="Delete")
-        item_del.connect("activate", self.on_delete_tests, (model, iter, values))
+        item_del.connect("activate", self.on_delete_tests, (model, lv_iter, values))
         menu.append(item_del)
         menu.show_all()
 
@@ -282,17 +283,17 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
     def on_show_json(self, item, data):
         """Test JSon."""
-        model, iter, val = data
+        model, lv_iter, val = data
         payload = val[TestList.Json]
         value, dlg = create_json_data_editor(payload)
         rc = dlg.run()
         if rc == Gtk.ResponseType.OK:
             payload = value.values
-            model.set_value(iter, TestList.Json, payload)
-            model.set_value(iter, TestList.SN, payload["component"])
-            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"]))
+            model.set_value(lv_iter, TestList.Json, payload)
+            model.set_value(lv_iter, TestList.SN, payload["component"])
+            model.set_value(lv_iter, TestList.RunNumber, payload["runNumber"])
+            model.set_value(lv_iter, TestList.Date, handle_test_date(payload["date"]))
+            model.set_value(lv_iter, TestList.Institute, handle_test_date(payload["institution"]))
 
 
         dlg.hide()
@@ -300,48 +301,48 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
     def on_show_attachments(self, item, data):
         """Show the attachmetns."""
-        model, iter, val = data
+        model, lv_iter, val = data
 
         SA = ShowAttachments("Test Attachments", self.session, val[TestList.Attachments], parent=self)
         response = SA.run()
         if response == Gtk.ResponseType.OK:
-            model.set_value(iter, TestList.Attachments, SA.attachments)
-            model.set_value(iter, TestList.Nattch, len(SA.attachments))
+            model.set_value(lv_iter, TestList.Attachments, SA.attachments)
+            model.set_value(lv_iter, TestList.Nattch, len(SA.attachments))
 
         SA.hide()
         SA.destroy()
 
     def on_show_comments(self, item, data):
         """Show comments"""
-        model, iter, val = data
+        model, lv_iter, val = data
         SC = ShowComments("Test Comments", val[TestList.Comments], self)
         rc = SC.run()
         if rc == Gtk.ResponseType.OK:
-            model.set_value(iter, TestList.Comments, SC.comments)
-            model.set_value(iter, TestList.Ncomm, len(SC.comments))
+            model.set_value(lv_iter, TestList.Comments, SC.comments)
+            model.set_value(lv_iter, TestList.Ncomm, len(SC.comments))
 
         SC.hide()
         SC.destroy()
 
     def on_show_defects(self, item, data):
         """Show comments"""
-        model, iter, val = data
+        model, lv_iter, val = data
         SD = ShowDefects("Test Defects", val[TestList.Defects], self)
         rc = SD.run()
         if rc == Gtk.ResponseType.OK:
-            model.set_value(iter, TestList.Defects, SD.defects)
-            model.set_value(iter, TestList.Ndef, len(SD.defects))
+            model.set_value(lv_iter, TestList.Defects, SD.defects)
+            model.set_value(lv_iter, TestList.Ndef, len(SD.defects))
 
         SD.hide()
         SD.destroy()
 
     def on_delete_tests(self, item, data):
         """Test edit."""
-        model, iter, val = data
+        model, lv_iter, val = data
         rc = dbGtkUtils.ask_for_confirmation("Remove this test?",
                                              "{} - {}".format(val[TestList.SN], val[TestList.TestType]))
         if rc:
-            model.remove(iter)
+            model.remove(lv_iter)
 
     def get_test_institute(self):
         """Select an institue."""
@@ -373,7 +374,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
     def on_set_stage(self, item, data):
         """Set the test stage."""
-        model, iter, val = data
+        model, lv_iter, val = data
         SN = val[TestList.SN]
         combo, currentStage = self.get_component_stages(SN)
 
@@ -392,9 +393,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         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])
+            model[lv_iter][TestList.Stage] = new_stage
+            data = model[lv_iter][TestList.Json]
+            changed = (new_stage != model[lv_iter][TestList.currentStage])
             data["isRetroactive"] = changed
             if changed:
                 data["stage"] = new_stage
@@ -402,7 +403,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                 if "stage" in data:
                     del data["stage"]
 
-            model[iter][TestList.Json] = data
+            model[lv_iter][TestList.Json] = data
 
 
         dlg.hide()
@@ -437,9 +438,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
         for ifile in files:
             try:
                 has_errors = False
-                data = json.loads(open(ifile).read())
+                data = json.loads(open(ifile, 'r', encoding="UTF-8").read())
                 errors, missing = check_data(data)
-                if len(missing):
+                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])))
@@ -472,7 +473,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                                 path = folder / path.name
 
                             if path.exists():
-                                attachments.append(ITkDButils.Attachment(path, att["title"], att["description"]))
+                                attachments.append(ITkDButils.Attachment(path=path, 
+                                                                         title=att["title"], 
+                                                                         desc=att["description"]))
                             else:
                                 self.write_message("Ignoring atachment {}".format(data["path"]))
 
@@ -596,15 +599,15 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
     def upload_test(self):
         """Uploads tests and attachments."""
         model = self.tree.get_model()
-        iter = model.get_iter_first()
-        while iter:
+        lv_iter = model.get_iter_first()
+        while lv_iter:
             past_iter = None
-            values = model[iter]
+            values = model[lv_iter]
             payload = values[TestList.Json]
             payload["comments"] = values[TestList.Comments]
             payload["defects"] = values[TestList.Defects]
 
-            rc = ITkDButils.upload_test(self.session, payload, values[TestList.Attachments])
+            rc = ITkDButils.upload_test(self.session, payload, values[TestList.Attachments], check_runNumber=True)
             if rc:
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
@@ -613,9 +616,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
-                past_iter = iter
+                past_iter = lv_iter
 
-            iter = model.iter_next(iter)
+            lv_iter = model.iter_next(lv_iter)
             if past_iter:
                 model.remove(past_iter)
 

itkdb_gtk/UploadPetalInformation.py

@@ -5,7 +5,6 @@ import sys
 from argparse import ArgumentParser
 from datetime import datetime, timezone
 from pathlib import Path
-
 import dateutil.parser
 import gi
 
@@ -16,7 +15,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
@@ -120,15 +118,17 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         self.btn_state = Gtk.Button(label="Undef")
         self.btn_state.set_name("btnState")
+        self.btn_state.connect("clicked", self.show_state)
+        self.btn_state.set_tooltip_text("If green all good. Click to see commnets and defects.")
 
         grid.attach(Gtk.Label(label="Serial No."), 0, 0, 1, 1)
         grid.attach(self.SN, 1, 0, 1, 1)
         grid.attach(self.btn_state, 2, 0, 1, 1)
-        
+
 
         grid.attach(Gtk.Label(label="Prod. Sheet"), 0, 1, 1, 1)
         grid.attach(self.btnPSF, 1, 1, 1, 1)
-        
+
         btn = Gtk.Button(label="Reset")
         btn.connect("clicked", self.on_reset)
         grid.attach(btn, 2, 1, 1, 1)
@@ -209,7 +209,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         btn = Gtk.Button(label="Upload Tests")
         btn.set_tooltip_text("Upload all tests")
-        
+
         btn.connect("clicked", self.on_upload)
         btnBox.add(btn)
 
@@ -222,6 +222,44 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         self.show_all()
 
+
+    def show_state(self, *arg):
+        """Shows the status"""
+        msg = ""
+        for test in self.test_list:
+            values = test.values
+            ndef = len(values["defects"])
+            ncomm = len(values["comments"])
+            if ndef==0 and ncomm==0:
+                continue
+
+            msg += "{}\n".format(values["testType"])
+            if ndef:
+                msg += "Defects\n"
+
+            for D in values["defects"]:
+                msg += "{}: {}\n".format(D["name"], D["description"])
+
+            if ncomm:
+                msg += "Comments\n"
+
+            for C in values["comments"]:
+                msg += "{}\n".format(C)
+
+            msg += "\n"
+
+        dialog = Gtk.MessageDialog(
+                transient_for=self,
+                flags=0,
+                message_type=Gtk.MessageType.INFO,
+                buttons=Gtk.ButtonsType.OK,
+                text="Problems found",
+                )
+
+        dialog.format_secondary_text(msg)
+        dialog.run()
+        dialog.destroy()
+
     def on_reset(self, *args):
         """Reset SN"""
         self.petal_core = None
@@ -361,7 +399,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         # Check if we need to assemble the module
         self.check_assembly(self.DESY_comp)
-        
+
         self.check_components()
 
     def on_fat_set(self, *args):
@@ -394,7 +432,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
         self.update_scroll_window("delamination", j_del)
         self.update_scroll_window("grounding", j_gnd)
         self.update_scroll_window("metrology", j_mtr)
-        
+
         self.check_tests(True)
 
     def read_avs_files(self, widgets):
@@ -473,7 +511,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
     def on_check_components(self, *args):
         """Button clicked."""
         self.check_components()
-        
+
     def check_components(self):
         """Check that components are in DB."""
         for cmp, cmp_SN in self.DESY_comp.items():
@@ -558,7 +596,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
                         if rc is None:
                             print("Could not set final stage of {}".format(cSN))
 
-            if len(error_txt):
+            if len(error_txt)>0:
                 dbGtkUtils.complain("Assembly of {} could not be completeed:".format(this_petal),
                          "\n".join(error_txt))
 
@@ -670,7 +708,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
         for test in self.test_list:
             values = test.values
             self.write_message("{}\n".format(values["testType"]))
-            res = ITkDButils.upload_test(self.session, values)
+            res = ITkDButils.upload_test(self.session, values, check_runNumber=True)
             if res is not None:
                 dbGtkUtils.complain("Could not upload test {}".format(values["testType"]), res)
 
@@ -708,4 +746,4 @@ def main():
     sys.exit()
 
 if __name__ == "__main__":
-    main()
+    main()

itkdb_gtk/UploadTest.py

@@ -78,7 +78,7 @@ def check_data(data):
 class UploadTest(dbGtkUtils.ITkDBWindow):
     """Collects information to upload a test and its attachments."""
 
-    def __init__(self, session, payload=None, attachment=None, help=None):
+    def __init__(self, session, payload=None, attachment=None, help_link=None):
         """Initialization.
 
         Args:
@@ -107,7 +107,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
         global gtk_runs
         if gtk_runs:
-            super().__init__(session=session, title="Upload Test", gtk_runs=gtk_runs, help=help)
+            super().__init__(session=session, title="Upload Test", gtk_runs=gtk_runs, help_link=help_link)
             self.init_window()
 
     def init_window(self):
@@ -218,7 +218,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
             except TypeError:
                 self.load_payload(self.payload)
-                self.write_message("Loaded memory payload.")
+                self.write_message("Loaded memory payload.\n")
 
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
@@ -366,7 +366,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
                 else:
                     the_path = Path(A["path"]).expanduser().resolve()
 
-                self.attachments.append(ITkDButils.Attachment(the_path, A["title"], A["description"]))
+                self.attachments.append(ITkDButils.Attachment(path=the_path, title=A["title"], desc=A["description"]))
 
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))
@@ -444,7 +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)
+        rc = ITkDButils.upload_test(self.session, self.data, self.attachments, check_runNumber=True)
         if rc:
             ipos = rc.find("The following details may help:")
             msg = rc[ipos:]
@@ -482,9 +482,9 @@ def main():
     # Start GUI
     UpT = UploadTest(client,
                      payload=args.test_file,
-                     attachment=ITkDButils.Attachment(args.attachment,
-                                                      args.attach_title,
-                                                      args.attach_desc))
+                     attachment=ITkDButils.Attachment(path=args.attachment,
+                                                      title=args.attach_title,
+                                                      desc=args.attach_desc))
 
     if gtk_runs:
         UpT.present()