Implement search
This commit is contained in:
15
main.py
15
main.py
@@ -22,7 +22,7 @@ from lib.DB.EmployeeModel import EmployeeModel
|
||||
from lib.DB.ObjectModel import ObjectModel
|
||||
from lib.DB.UserManager import UserManager
|
||||
from lib.Printers import Printers
|
||||
from lib.domain.BaseModel import database
|
||||
from lib.domain.BaseModel import database, init_database_from_config
|
||||
|
||||
os.environ['QML_XHR_ALLOW_FILE_READ'] = '1'
|
||||
|
||||
@@ -42,16 +42,7 @@ user = None
|
||||
def initializeProgram():
|
||||
global address_model, applicant_model, bad_config, business_model, user, business_type, contact_model, employee_model, object_model, db_con, printers
|
||||
if not bad_config:
|
||||
dbconf = config.getConfig()['database']
|
||||
database.init(
|
||||
host=dbconf['DB_HOST'],
|
||||
user=dbconf['DB_USER'],
|
||||
password=dbconf['DB_PASS'],
|
||||
database=dbconf['DB_NAME'],
|
||||
port=int(dbconf['DB_PORT']),
|
||||
connect_timeout=5,
|
||||
)
|
||||
database.connect()
|
||||
init_database_from_config(config.get_config()['database'])
|
||||
|
||||
printers = Printers()
|
||||
if not database.is_closed():
|
||||
@@ -114,7 +105,7 @@ if __name__ == "__main__":
|
||||
|
||||
config = ConfigLoader()
|
||||
|
||||
if not config.getConfig():
|
||||
if not config.get_config():
|
||||
bad_config = True
|
||||
config.configurationReady.connect(configReady)
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user