Update SQL scripts with new settings

titov-vv · Apr 8, 2024 · b608735 · b608735
1 parent 17ca7bc
commit b608735
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/jal/jal_init.sql b/jal/jal_init.sql
@@ -710,6 +710,20 @@ INSERT INTO settings(id, name, value) VALUES (16, 'EuLidlRefreshToken', '');
 INSERT INTO settings(id, name, value) VALUES (17, 'PtPingoDoceAccessToken', '');
 INSERT INTO settings(id, name, value) VALUES (18, 'PtPingoDoceRefreshToken', '');
 INSERT INTO settings(id, name, value) VALUES (19, 'PtPingoDoceUserProfile', '{}');
+INSERT INTO settings(id, name, value) VALUES (20, 'DlgGeometry_Accounts', '');
+INSERT INTO settings(id, name, value) VALUES (21, 'DlgViewState_Accounts', '');
+INSERT INTO settings(id, name, value) VALUES (22, 'DlgGeometry_Assets', '');
+INSERT INTO settings(id, name, value) VALUES (23, 'DlgViewState_Assets', '');
+INSERT INTO settings(id, name, value) VALUES (24, 'DlgGeometry_Peers', '');
+INSERT INTO settings(id, name, value) VALUES (25, 'DlgViewState_Peers', '');
+INSERT INTO settings(id, name, value) VALUES (26, 'DlgGeometry_Categories', '');
+INSERT INTO settings(id, name, value) VALUES (27, 'DlgViewState_Categories', '');
+INSERT INTO settings(id, name, value) VALUES (28, 'DlgGeometry_Tags', '');
+INSERT INTO settings(id, name, value) VALUES (29, 'DlgViewState_Tags', '');
+INSERT INTO settings(id, name, value) VALUES (30, 'DlgGeometry_Quotes', '');
+INSERT INTO settings(id, name, value) VALUES (31, 'DlgViewState_Quotes', '');
+INSERT INTO settings(id, name, value) VALUES (32, 'DlgGeometry_Base currency', '');
+INSERT INTO settings(id, name, value) VALUES (33, 'DlgViewState_Base currency', '');
 
 -- Initialize available languages
 INSERT INTO languages (id, language) VALUES (1, 'en');

diff --git a/jal/updates/jal_delta_55.sql b/jal/updates/jal_delta_55.sql
@@ -1,6 +1,19 @@
 BEGIN TRANSACTION;
 --------------------------------------------------------------------------------
-
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (20, 'DlgGeometry_Accounts', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (21, 'DlgViewState_Accounts', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (22, 'DlgGeometry_Assets', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (23, 'DlgViewState_Assets', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (24, 'DlgGeometry_Peers', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (25, 'DlgViewState_Peers', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (26, 'DlgGeometry_Categories', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (27, 'DlgViewState_Categories', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (28, 'DlgGeometry_Tags', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (29, 'DlgViewState_Tags', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (30, 'DlgGeometry_Quotes', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (31, 'DlgViewState_Quotes', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (32, 'DlgGeometry_Base currency', '');
+INSERT OR REPLACE INTO settings(id, name, value) VALUES (33, 'DlgViewState_Base currency', '');
 --------------------------------------------------------------------------------
 -- Set new DB schema version
 UPDATE settings SET value=55 WHERE name='SchemaVersion';

diff --git a/jal/widgets/reference_data.py b/jal/widgets/reference_data.py
@@ -78,7 +78,7 @@ def _init_completed(self):
         self.setFilter()
         self.setWindowTitle(self.dialog_window_name)
         self.restoreGeometry(base64.decodebytes(JalSettings().getValue('DlgGeometry_' + self.dialog_window_name, '').encode('utf-8')))
-        self._view_header.restoreState(base64.decodebytes(JalSettings().getValue('ViewState_' + self.dialog_window_name, '').encode('utf-8')))
+        self._view_header.restoreState(base64.decodebytes(JalSettings().getValue('DlgViewState_' + self.dialog_window_name, '').encode('utf-8')))
 
     def onDataViewContextMenu(self, pos):
         contextMenu = QMenu(self._view)
@@ -95,7 +95,7 @@ def updateItemType(self, index, new_type):
     @Slot()
     def closeEvent(self, event):
         JalSettings().setValue('DlgGeometry_' + self.dialog_window_name, base64.encodebytes(self.saveGeometry().data()).decode('utf-8'))
-        JalSettings().setValue('ViewState_' + self.dialog_window_name, base64.encodebytes(self._view_header.saveState().data()).decode('utf-8'))
+        JalSettings().setValue('DlgViewState_' + self.dialog_window_name, base64.encodebytes(self._view_header.saveState().data()).decode('utf-8'))
         if self.ui.CommitBtn.isEnabled():    # There are uncommitted changed in a table
             if QMessageBox().warning(self, self.tr("Confirmation"),
                                      self.tr("You have uncommitted changes. Do you want to close?"),