diff --git a/src/app/models/login.py b/src/app/models/login.py index 2abb2bf..b41a44b 100644 --- a/src/app/models/login.py +++ b/src/app/models/login.py @@ -5,6 +5,7 @@ def get_users(): Retreive all registrered users from the database :return: users """ + db.connect() cursor = db.cursor() query = ("SELECT userid, username from users") cursor.execute(query) @@ -13,6 +14,7 @@ def get_users(): return users def get_user_id_by_name(username): + db.connect() cursor = db.cursor() query = ("SELECT userid from users WHERE username =\"" + username + "\"") cursor.execute(query) @@ -24,6 +26,7 @@ def get_user_id_by_name(username): return userid def get_user_name_by_id(userid): + db.connect() cursor = db.cursor() query = ("SELECT username from users WHERE userid =\"" + userid + "\"") cursor.execute(query) @@ -44,6 +47,7 @@ def match_user(username, password): :type password: str :return: user """ + db.connect() cursor = db.cursor() query = ("SELECT userid, username from users where username = \"" + username + "\" and password = \"" + password + "\"") diff --git a/src/app/models/project.py b/src/app/models/project.py index ecd492c..4152171 100644 --- a/src/app/models/project.py +++ b/src/app/models/project.py @@ -6,6 +6,7 @@ def get_categories(): :return: List of categories """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM project_category") cursor.execute(query) @@ -29,6 +30,7 @@ def set_project(categoryid, userid, project_title, project_description, project_ :type project_status: str :return: The id of the new project """ + db.connect() cursor = db.cursor() query = ("INSERT INTO projects VALUES (NULL, \"" + categoryid + "\", \"" + userid + "\", \"" + project_title + "\", \"" + @@ -47,6 +49,7 @@ def get_project_by_id(projectid): :type projectid: str :return: The selected project """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM projects WHERE projectid = \"" + projectid + "\"") @@ -56,6 +59,7 @@ def get_project_by_id(projectid): return project[0] def update_project_status(projectid, status): + db.connect() cursor = db.cursor() query = ("UPDATE projects SET project_status = \"" + status + "\" WHERE projectid = \"" + projectid + "\"") @@ -65,6 +69,7 @@ def update_project_status(projectid, status): cursor.close() def get_user_permissions(userid, projectid): + db.connect() cursor = db.cursor() query = ("SELECT read_permission, write_permission, modify_permission \ FROM projects_users WHERE projectid = \"" + projectid + @@ -86,6 +91,7 @@ def get_projects_by_status_and_category(categoryid, project_status): :type project_status: str :return: A list of projects """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM projects WHERE project_status = \"" + project_status + "\" AND categoryid = \"" + categoryid + "\"") @@ -95,6 +101,7 @@ def get_projects_by_status_and_category(categoryid, project_status): return projects def get_projects_by_owner(userid): + db.connect() cursor = db.cursor() query = ("SELECT * FROM projects WHERE userid = \"" + userid + "\"") cursor.execute(query) @@ -111,6 +118,7 @@ def get_projects_by_status_and_owner(userid, project_status): :type project_status: str :return: A list of projects """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM projects WHERE project_status = \"" + project_status + "\" AND userid = \"" + userid + "\"") @@ -128,10 +136,12 @@ def get_projects_by_participant_and_status(userid, project_status): :type project_status: str :return: A list of projects """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM projects, projects_users WHERE projects.project_status = \"" + project_status + "\" AND projects_users.userid = \"" + userid + "\" AND projects_users.projectid = projects.projectid") + db.connect() cursor.execute(query) projects = cursor.fetchall() return projects @@ -149,6 +159,7 @@ def set_task(projectid, task_title, task_description, budget): :type task_description: str :type budget: str """ + db.connect() cursor = db.cursor() query = ("INSERT INTO tasks (projectid, title, task_description, budget, task_status) VALUES (\"" + projectid + "\", \"" + task_title + "\", \"" + @@ -158,6 +169,7 @@ def set_task(projectid, task_title, task_description, budget): cursor.close def update_task_status(taskid, status): + db.connect() cursor = db.cursor() query = ("UPDATE tasks SET task_status = \"" + status + "\" WHERE taskid = \"" + taskid + "\"") @@ -173,6 +185,7 @@ def get_tasks_by_project_id(projectid): :type project_id: str :return: List of tasks """ + db.connect() cursor = db.cursor() query = ("SELECT * FROM tasks WHERE projectid = \"" + projectid + "\"") cursor.execute(query) @@ -181,6 +194,7 @@ def get_tasks_by_project_id(projectid): return tasks def set_task_file(taskid, filename): + db.connect() cursor = db.cursor() query = ("INSERT INTO task_files (taskid, filename) VALUES (\"" + taskid + "\", \"" + filename + "\")") @@ -190,6 +204,7 @@ def set_task_file(taskid, filename): cursor.close() def get_task_files(taskid): + db.connect() cursor = db.cursor() query = ("SELECT filename FROM task_files WHERE taskid = \"" + str(taskid) + "\"") cursor.execute(query) @@ -201,6 +216,7 @@ def get_task_files(taskid): def set_projects_user(projectid, userid, read_permission="TRUE", write_permission="NULL", modify_permission="NULL"): + db.connect() cursor = db.cursor() query = ("INSERT INTO projects_users VALUES (\"" + projectid + "\", \"" + userid + "\", " + read_permission + ", " + diff --git a/src/app/models/register.py b/src/app/models/register.py index bc796d6..289810b 100644 --- a/src/app/models/register.py +++ b/src/app/models/register.py @@ -25,6 +25,7 @@ def set_user(username, password, full_name, company, email, :type postal_code: str :type country: str """ + db.connect() cursor = db.cursor() query = ("INSERT INTO users VALUES (NULL, \"" + username + "\", \"" + password + "\", \"" + full_name + "\" , \"" + company + "\", \"" +