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

itkdb_gtk/{getShipments.py → GetShipments.py}

@@ -4,12 +4,14 @@ import pathlib
 import sys
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
-
+    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
 import gi
 import serial
 
@@ -125,8 +127,7 @@ class ReceiveShipments(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/GlueWeight.py

@@ -7,11 +7,14 @@ from copy import deepcopy
 from pathlib import Path
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+    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
 
 import gi
 gi.require_version("Gtk", "3.0")

itkdb_gtk/{groundVITests.py → GroundVITests.py}

@@ -4,14 +4,16 @@ import json
 import sys
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+    import itkdb_gtk
+    
+except ImportError:
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
 
-import gi
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
 
+import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio
 
@@ -99,10 +101,10 @@ class GroundingTest(dbGtkUtils.ITkDBWindow):
         # Create the Notebook pages
         self.create_test_box("Visual Inspection", "VISUAL_INSPECTION")
         self.create_test_box("Grounding", "GROUNDING_CHECK")
+        self.create_test_box("Pipe bending", "BENDING120")
 
         # The text view
-        frame = self.create_text_view()
-        self.mainBox.pack_end(frame, True, True, 5)
+        self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
 
         self.show_all()
 

itkdb_gtk/ITkDBlogin.py

@@ -92,6 +92,7 @@ class ITkDBlogin(Gtk.Dialog):
 
         if gtk_runs:
             self.create_window()
+            self.present()
             self.run()
 
         else:

itkdb_gtk/ITkDButils.py

@@ -235,9 +235,13 @@ def set_object_stage(client, SN, stage):
 def get_DB_component(client, SN):
     """Get ta component by its serial number."""
     global db_response
-    db_response = client.get('getComponent', json={'component': SN})
-    return db_response
+    try:
+        db_response = client.get('getComponent', json={'component': SN})
+        return db_response
 
+    except Exception as e:
+        db_response = str(e)
+        return None
 
 def upload_test(client, data, attachments=None):
     """Upload a test to the DB.

itkdb_gtk/{sendShipments.py → SendShipments.py}

@@ -7,11 +7,14 @@ import pathlib
 import sys
 
 try:
-    import dbGtkUtils
-    import ITkDBlogin
-    import ITkDButils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+    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
 
 import gi
 import serial
@@ -125,8 +128,7 @@ class SendShipments(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/ShowAttachments.py

@@ -1,9 +1,15 @@
+import sys
 from pathlib import Path
+
 try:
-    import dbGtkUtils
-    import ITkDButils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils, ITkDButils
+    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, ITkDButils
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -83,6 +89,8 @@ class ShowAttachments(Gtk.Dialog):
         """Creates the tree vew with the attachments."""
         model = Gtk.ListStore(str, str, str, str)
         self.tree = Gtk.TreeView(model=model)
+        self.tree.connect("button-press-event", self.button_pressed)
+
         scrolled = Gtk.ScrolledWindow()
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         scrolled.add(self.tree)
@@ -102,6 +110,122 @@ class ShowAttachments(Gtk.Dialog):
 
         return scrolled
 
+    def button_pressed(self, tree, event):
+        """Button clicked on top of attachment."""
+        # double click shows attachments
+        it = None
+        model = self.tree.get_model()
+        if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
+            select = self.tree.get_selection()
+            model, it = select.get_selected()
+            if not it:
+                return
+
+            self.edit_attachment(model, it)
+            return
+
+        if event.button != 3:
+            return
+
+        # Create popup menu
+        select = self.tree.get_selection()
+        model, it = select.get_selected()
+        values = None
+        if it:
+            values = model[it]
+
+        else:
+            P = tree.get_path_at_pos(event.x, event.y)
+            if P:
+                it = model.get_iter(P[0])
+                values = model[it]
+
+        if not values:
+            return
+
+        if not it:
+            P = self.tree.get_path_at_pos(event.x, event.y)
+            if P:
+                it = model.get_iter(P[0])
+
+        if not it:
+            return
+
+        menu = Gtk.Menu()
+        item_edit = Gtk.MenuItem(label="Edit")
+        item_edit.connect("activate", self.on_edit_attachment, (model, it))
+        menu.append(item_edit)
+
+        item_show = Gtk.MenuItem(label="Show file")
+        item_show.connect("activate", self.on_show_file, (model, it))
+        menu.append(item_show)
+
+        menu.show_all()
+        menu.popup_at_pointer(event)
+
+    def edit_attachment(self, model, it):
+        """Edit attachment at current row."""
+        values = model[it]
+        dlg = add_attachment_dialog()
+        dlg.fC.set_filename(values[3])
+        dlg.att_title.set_text(values[1])
+        dlg.att_desc.set_text(values[2])
+        rc = dlg.run()
+        if rc == Gtk.ResponseType.OK:
+            path = Path(dlg.fC.get_filename())
+            title = dlg.att_title.get_text()
+            desc = dlg.att_desc.get_text()
+            model.set_value(it, 0, path.name)
+            model.set_value(it, 1, title)
+            model.set_value(it, 2, desc)
+            model.set_value(it, 3, path.as_posix())
+
+        dlg.hide()
+        dlg.destroy()
+
+    def on_edit_attachment(self, item, data):
+        """Test JSon."""
+        model, it = data
+        self.edit_attachment(model, it)
+
+
+    def on_show_file(self, item, data):
+        """Test JSon."""
+        model, it  = data
+        values = model[it]
+        sss = None
+        try:
+            with open(values[3], "tr", encoding="utf-8") as f:
+                sss = f.read()
+        
+        except UnicodeDecodeError:
+            dbGtkUtils.complain("Error showing file", "File is not a text file")
+            return        
+        
+        
+        dlg = Gtk.Dialog(title="Add Attachment",
+                     transient_for=self,
+                     flags=0)
+        dlg.add_buttons(Gtk.STOCK_OK, Gtk.ResponseType.OK)
+        dlg.set_size_request(300, 200)
+        area = dlg.get_content_area()
+        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        area.add(box)
+
+        scrolledwindow = Gtk.ScrolledWindow()
+        box.pack_start(scrolledwindow, False, True, 0)
+
+        scrolledwindow.set_hexpand(True)
+        scrolledwindow.set_vexpand(True)
+        textview = Gtk.TextView()
+        textview.get_buffer().set_text(sss)
+        scrolledwindow.add(textview)
+        dlg.show_all()
+        dlg.run()
+        dlg.hide()
+        dlg.destroy()
+        
+
     def add_attachment(self, *args):
         """Add Attachment button clicked."""
         dlg = add_attachment_dialog()
@@ -123,15 +247,19 @@ class ShowAttachments(Gtk.Dialog):
     def remove_attachment(self, *args):
         """Remove selected attachment."""
         select = self.tree.get_selection()
-        model, iter = select.get_selected()
-        if iter:
-            values = model[iter]
+        model, it = select.get_selected()
+        if it:
+            values = model[it]
             for a in self.attachments:
                 if a.path == values[3]:
                     rc = dbGtkUtils.ask_for_confirmation("Remove this attachment ?",
                                                          "{} - {}\n{}".format(a.title, a.desc, values[0]))
                     if rc:
                         self.attachments.remove(a)
-                        model.remove(iter)
+                        model.remove(it)
 
                     break
+
+if __name__ == "__main__":
+    SA = ShowAttachments("Test Attachments", None)
+    SA.run()

itkdb_gtk/ShowComments.py

@@ -1,7 +1,16 @@
+#!/usr/bin/env python3
+"""Shows comments."""
+
 try:
-    import dbGtkUtils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils
+    import itkdb_gtk
+    
+except ImportError:
+    import sys
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
+    
+from itkdb_gtk import dbGtkUtils
 
 import gi
 gi.require_version("Gtk", "3.0")

itkdb_gtk/ShowDefects.py

@@ -1,7 +1,14 @@
+
 try:
-    import dbGtkUtils
-except ModuleNotFoundError:
-    from itkdb_gtk import dbGtkUtils
+    import itkdb_gtk
+    
+except ImportError:
+    import sys
+    from pathlib import Path
+    cwd = Path(sys.argv[0]).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import dbGtkUtils
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -10,10 +17,15 @@ from gi.repository import Gtk, Gio, Gdk
 
 class ShowDefects(Gtk.Dialog):
     """Edit defects"""
-    def __init__(self, title, defects=[], parent=None):
+    
+    def __init__(self, title, defects=None, parent=None):
         """Initialization."""
         super().__init__(title=title, transient_for=parent)
-        self.defects = [C for C in defects]
+        if defects:
+            self.defects = [C for C in defects]
+        else:
+            self.defects = []
+            
         self.init_window()
 
     def init_window(self):