Changes to gsadatabse and other dependencies to reflect new data model …

…#161
nanoMFG · Feb 21, 2022 · 43956ce · 43956ce
1 parent 689201a
commit 43956ce
Show file tree

Hide file tree

Showing 6 changed files with 320 additions and 160 deletions.
diff --git a/src/gresq/dashboard/dashboard.py b/src/gresq/dashboard/dashboard.py
@@ -4,7 +4,8 @@
 from PyQt5 import QtGui, QtCore, QtWidgets
 from gresq.dashboard.submit import GSASubmit
 from gresq.dashboard.query import GSAQuery
-
+from gresq.dashboard.query_2_0 import GSAQuery as GSAQuery_2_0
+from gresq.dashboard.submit_2_0 import GSASubmit as GSASubmit_2_0
 # from GSARaman import GSARaman
 from gresq.dashboard.oscm import GSAOscm
 from gresq.util.util import ConfigParams
@@ -46,19 +47,21 @@ def __init__(
         helpMenu = mainMenu.addMenu('&Help')
         helpMenu.addAction(aboutAction)
 
-        self.query_tab = GSAQuery(config=self.config)
-        self.submit_tab = GSASubmit(config=self.config)
-        self.oscm_tab = GSAOscm(server_instance="prod")
-        self.submit_tab.preparation.oscm_signal.connect(
-            lambda: self.setCurrentWidget(self.oscm_tab)
-        )
+   #     self.query_tab = GSAQuery(config=self.config)
+        self.query_2_0_tab = GSAQuery_2_0(config=self.config)
+     #   self.submit_tab = GSASubmit(config=self.config)
+        self.submit_2_0_tab = GSASubmit_2_0(config=self.config)
+ #       self.oscm_tab = GSAOscm(server_instance="prod")
+  #      self.submit_tab.preparation.oscm_signal.connect(
+   #         lambda: self.setCurrentWidget(self.oscm_tab)
+#        )
 
         self.mainWidget = QtGui.QTabWidget()
-        self.mainWidget.addTab(self.query_tab, "Query")
-        self.mainWidget.addTab(self.submit_tab, "Submit")
-        self.mainWidget.addTab(self.oscm_tab, "OSCM")
-        self.mainWidget.addTab(self.query_tab, "Query_2_0")
-        self.mainWidget.addTab(self.submit_tab, "Submit_2_0")
+    #    self.mainWidget.addTab(self.query_tab, "Query")
+   #     self.mainWidget.addTab(self.submit_tab, "Submit")
+   #     self.mainWidget.addTab(self.oscm_tab, "OSCM")
+        self.mainWidget.addTab(self.query_2_0_tab, "Query_2_0")
+        self.mainWidget.addTab(self.submit_2_0_tab, "Submit_2_0")
 
         self.setCentralWidget(self.mainWidget)
 

diff --git a/src/gresq/dashboard/query_2_0/__init__.py b/src/gresq/dashboard/query_2_0/__init__.py
@@ -1,2 +1,2 @@
-from gresq.dashboard.query_2_0.query import GSAQuery
-from gresq.dashboard.query_2_0.query import convertScripts
+from gresq.dashboard.query_2_0.query_2_0 import GSAQuery
+from gresq.dashboard.query_2_0.query_2_0 import convertScripts