nochmal

lib/DB/BusinessModel.py

@@ -68,15 +68,22 @@ class BusinessModel(QAbstractTableModel):
 
     def __init__(self):
         super().__init__()
+# <<<<<<< HEAD
         self.__business_dao = BusinessDAO()
         self.__business_dao.newBusinessAdded.connect(self.__refreshView)
         self.__conf = ConfigLoader().getConfig()
         self.__key = self.__conf['pyqcrm']['ENCRYPTION_KEY']
+# =======
+#         self.__key = ConfigLoader().getKey()
+# >>>>>>> e28c68f (AddCustomer, AddContact finished)
         self.__getData()
 
+
     def __getData(self, criterion = "Alle"):
         self.beginResetModel()
+
         rows, self.__visible_columns = self.__business_dao.getBusiness(self.__key, criterion)
+
         self.__data = rows
         self.endResetModel()
 
@@ -84,17 +91,21 @@ class BusinessModel(QAbstractTableModel):
         return len (self.__data)
 
     def columnCount(self, parent= QModelIndex()):
-        return len(self.__visible_columns) - 1
+        #return len(self.__visible_columns) - 1
+        return len(self.__visible_columns)
+
 
     def data(self, index, role= Qt.DisplayRole):
         if role == Qt.DisplayRole:
             row = self.__data[index.row()]
-            return row[index.column() + 1]
+            #return row[index.column() + 1]
+            return row[index.column()]
         return None
 
     def headerData(self, section, orientation, role= Qt.DisplayRole):
         if orientation == Qt.Horizontal and role ==Qt.DisplayRole:
-            self.__col_name = self.__visible_columns[section + 1]
+            #self.__col_name = self.__visible_columns[section + 1]
+            self.__col_name = self.__visible_columns[section]
             return self.__col_name
         return super().headerData(section, orientation, role)
 
@@ -122,10 +133,12 @@ class BusinessModel(QAbstractTableModel):
 
     @Slot(dict, int)
     def addBusiness(self, business, contact_id):
-        self.__business_dao.addBusiness(business, contact_id)
+
+        BusinessDAO().addBusiness(self.__key, business, contact_id)
 
     @Slot()
     def __refreshView(self):
+
         self.__getData()
 
     @Slot(dict)