itkdb-gtk 0.10.10.dev9__py3-none-any.whl → 0.11.0__py3-none-any.whl

itkdb_gtk/GetShipments.py

@@ -136,6 +136,12 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         btn.connect("clicked", self.receive_items)
         grid.attach(btn, 2, 3, 1, 1)
 
+        self.check_all = Gtk.ToggleButton(label="Check A_ll", use_underline=True)
+        self.check_all.set_active(1)
+        self.check_all.set_tooltip_text("If toggled, items will need to be `received`\none by one by unchecking the  check box.")
+        grid.attach(self.check_all, 3, 3, 1, 1)
+
+
         # Add a Separator
         self.mainBox.pack_start(Gtk.Separator(orientation=Gtk.Orientation.VERTICAL), False, True, 0)
 
@@ -300,34 +306,46 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         else:
             self.cmb_shipment.set_active(-1)
             self.cmb_shipment.get_child().set_text("")
+            self.tree.set_model(Gtk.ListStore(str, str, str, bool))
 
+    def mark_all_as_delivered(self):
+        """Mark all items in current shipment as delivered."""
+        if self.store is None:
+            return
 
-        self.tree.set_model(Gtk.ListStore(str, str, str, bool))
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            val = self.store[lv_iter][3]
+            self.store[lv_iter][3] = not val
+            lv_iter = self.store.iter_next(lv_iter)
 
     def receive_items(self, *args):
         """Receive shipment items."""
         data = {}
         names = {}
+        if not self.store:
+            self.write_message("Empty list of items.\n")
+            return
 
-        # self.store is the model of the tree view
-        if self.store:
-            lv_iter = self.store.get_iter_first()
-            while lv_iter:
-                shpmnt = self.store.get_value(lv_iter, 2)
-                if shpmnt not in data:
-                    data[shpmnt] = create_shipment_status(shpmnt)
-                    names[shpmnt] = self.store.get_value(lv_iter, 4)
+        if not self.check_all.get_active():
+            self.mark_all_as_delivered()
 
-                item = {
-                    "code": self.store[lv_iter][5],
-                    "delivered": not self.store[lv_iter][3]
-                }
-                data[shpmnt]["shipmentItems"].append(item)
+        # self.store is the model of the tree view
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            shpmnt = self.store.get_value(lv_iter, 2)
+            if shpmnt not in data:
+                data[shpmnt] = create_shipment_status(shpmnt)
+                names[shpmnt] = self.store.get_value(lv_iter, 4)
+
+            item = {
+                "code": self.store[lv_iter][5],
+                "delivered": not self.store[lv_iter][3]
+            }
+            data[shpmnt]["shipmentItems"].append(item)
 
-                lv_iter = self.store.iter_next(lv_iter)
+            lv_iter = self.store.iter_next(lv_iter)
 
-        else:
-            self.write_message("Empty list of items.\n")
 
         for oid, S in data.items():
             # Check that all items are there

itkdb_gtk/GlueWeight.py

@@ -13,7 +13,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, UploadMultipleTests
 HELP_LINK="https://itkdb-gtk.docs.cern.ch"
 
 
@@ -332,22 +332,20 @@ class GlueWeight(dbGtkUtils.ITkDBWindow):
 
     def upload_tests(self):
         """Upload tests to DB."""
+        W = UploadMultipleTests.UploadMultipleTests(
+            self.session,
+            help_link="{}/uploadMultipleTests.html".format(HELP_LINK)
+        )
+        
         if len(self.test_list)>0:
             for G in self.test_list:
                 m = G.values
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
+                
 
         else:
             for m in self.modules:
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
 
 
 def main():

itkdb_gtk/ITkDButils.py

@@ -298,11 +298,11 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
 
         if data["runNumber"] in runN:
             # if the given runNumber is there, try to create a new one.
-            print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
+            #print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
             try:
                 irun = int(data["runNumber"])
                 for i in range(irun+1, 100):
-                    newRn = "{}".format(i+1)
+                    newRn = "{}".format(i)
                     if newRn not in runN:
                         data["runNumber"] = newRn
                         break

itkdb_gtk/UploadMultipleTests.py

@@ -468,73 +468,81 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             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
-                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.write_message("{}\n".format(Path(ifile).name))
+                folder = Path(ifile).parent
 
-                    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"])
-                    if data["passed"]:
-                        if data["problems"]:
-                            color = "orange"
-                        else:
-                            color = self.def_color
-                    else:
-                        color = "firebrick"
+                data = json.loads(open(ifile, 'r', encoding="UTF-8").read())
+                self.add_test_data_to_view(data, ifile=ifile, folder=folder)
 
-                    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])
 
             except Exception as E:
                 self.write_message("Cannot load file {}\n".format(ifile))

itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.10.dev9"
+__version__ = "0.11.0"
 
 
 def dash_board():

itkdb_gtk/dashBoard.py

@@ -341,10 +341,13 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
 
         self.mask |= bt
         opt = IRPetalParam()
+        opt.files = []
+        opt.golden = None
         opt.folder = None
         opt.out = None
         opt.alias = None
         opt.SN = None
+        opt.desy = False
         W = CoreThermal(opt, self.session, title="Petal Thermal Test.")
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()

{itkdb_gtk-0.10.10.dev9.dist-info → itkdb_gtk-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev9
+Version: 0.11.0
 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.10.10.dev9.dist-info → itkdb_gtk-0.11.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 itkdb_gtk/CreateShipments.py,sha256=eiVjw7zGLGAoqWxThBc6IVvXLUFXmtQ-_hpZzfDOKx0,13249
-itkdb_gtk/GetShipments.py,sha256=tEGWAmfW86jiAkc6cflVWR2QpKwhOLSRZicwwcfQVKw,18465
-itkdb_gtk/GlueWeight.py,sha256=OSc5EJjyzgZC9sk21L7K_gs88peSrEcC2CWbl1uNXTU,11749
+itkdb_gtk/GetShipments.py,sha256=b3TECQhHlK0kGXH6KjQs06yuzIfTN5tjtiu6wnEOuJ8,19172
+itkdb_gtk/GlueWeight.py,sha256=IHgvbN2DlT8Ou-DMi-n3Z-3xSrPr0tlrkkEH10AshrA,11587
 itkdb_gtk/ITkDB.desktop,sha256=v_K4mHsDxb912J1XGo6mOlbW2TkHvYNGrKmiOnsBQqM,172
 itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
 itkdb_gtk/ITkDBlogin.py,sha256=40tipm_j5eUS4dnZnBT8VyL6Bu_8csuqS9TPWKxvKSY,10038
-itkdb_gtk/ITkDButils.py,sha256=WYjE_DOnFJdxhhQ5ylVTupIOjrp2r83jQALa0Gc2xZg,19587
+itkdb_gtk/ITkDButils.py,sha256=p1r1HqY0hP47Y0fRRweLPNR6rbPRebWS8d9y_vdj_lk,19586
 itkdb_gtk/PanelVisualInspection.py,sha256=ktAcYbdLBS7Zbxq9XsxB_AWTgAfFLa42NFTEsxnBn98,20531
 itkdb_gtk/PetalReceptionTests.py,sha256=N9_lBvao-HeHPwccjycUL7p3R3V_nPur1WibXbcqjgI,9992
 itkdb_gtk/SensorUtils.py,sha256=fYWF9TeutAbore53dLWNlZnVn9P3OsKYcFLNGOs8cnI,15426
@@ -12,17 +12,17 @@ itkdb_gtk/ShowAttachments.py,sha256=KExxPCdbcb04XS8JSUkg5xF1McvlB8e9btwctDCKNXU,
 itkdb_gtk/ShowComments.py,sha256=OiMTFLnhGbbKRj5x61D517BYHAt-qY5Y1lvR3EQz3c0,3151
 itkdb_gtk/ShowDefects.py,sha256=aVAHeaE5IztmAPEuHwhi06KWo_pi9xX2J1fTLhKyAPI,3530
 itkdb_gtk/UploadModuleIV.py,sha256=sqh52bSxANBwlmVWZlDqFXpqRGf0rV0QsjJWC-tY_qI,17792
-itkdb_gtk/UploadMultipleTests.py,sha256=EaDM5t_-tkGlgg66Nb36iGN7dT3-wvsrWwChpbXGML0,24287
+itkdb_gtk/UploadMultipleTests.py,sha256=TFEqcRd2ZZAVhK3P3Qn2vg81NouOCjkjqn9PhoHYhPM,24125
 itkdb_gtk/UploadTest.py,sha256=ukgJ5-IG12bqa1QIp3bXIV8hkdXCv5UDxh1lQswN_ko,16832
 itkdb_gtk/VisualInspection.py,sha256=i2i_9ttetMzGFRcBFm_ow7aziksTgvZzVLUxZhwiyBg,9850
 itkdb_gtk/WireBondGui.py,sha256=WFTLOw4l5JxSbvh4vZMxcF65fqlwvNw0fOyEru9ijqQ,39850
-itkdb_gtk/__init__.py,sha256=23qH2hGi_hozwXJbDTvLWJZWyRACKFft-8KsRf5TdCc,1269
-itkdb_gtk/dashBoard.py,sha256=b2QmPUtjo_gAxf3u5t5_V35J580i9V-4FLr2NvmDzAw,10999
+itkdb_gtk/__init__.py,sha256=T-1R2QGY5NH5Yc1rSoWlZ4NwEtokbXv1TQfg_r_c8gA,1263
+itkdb_gtk/dashBoard.py,sha256=VtD7w9FqexYEdihXCw6rxIZrjChQPyJ1LT4DsT3-K2k,11073
 itkdb_gtk/dbGtkUtils.py,sha256=THW-IT5UJB1YluvUVIfpy6oIY2faSHChNKGTpY5qzag,30480
 itkdb_gtk/readGoogleSheet.py,sha256=Lzm_oPWwDqZZzKoBUgsp277F9-wCfr_BA0X4VD2Eolo,2673
 itkdb_gtk/untrash_component.py,sha256=VrN46-f-kF7voOxtoh7OL-bZSWAaIFb7-Xbx6_WT7K8,757
-itkdb_gtk-0.10.10.dev9.dist-info/METADATA,sha256=FjbmJX0AH9AFQCI15uwKoWwlg7qZPzOjbr5m_npnetM,3156
-itkdb_gtk-0.10.10.dev9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-itkdb_gtk-0.10.10.dev9.dist-info/entry_points.txt,sha256=51wi4BRW1vYuLNySWC6bsmQPo7XPI7cvPFAaBD49Ib0,489
-itkdb_gtk-0.10.10.dev9.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
-itkdb_gtk-0.10.10.dev9.dist-info/RECORD,,
+itkdb_gtk-0.11.0.dist-info/METADATA,sha256=fQrQBCNU8wtqG-e8HDm7PHGm-f6soglsHvqH6uWZRuM,3150
+itkdb_gtk-0.11.0.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+itkdb_gtk-0.11.0.dist-info/entry_points.txt,sha256=51wi4BRW1vYuLNySWC6bsmQPo7XPI7cvPFAaBD49Ib0,489
+itkdb_gtk-0.11.0.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
+itkdb_gtk-0.11.0.dist-info/RECORD,,

{itkdb_gtk-0.10.10.dev9.dist-info → itkdb_gtk-0.11.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any