Skip to content

Commit a2d04a0

Browse files
committed
add childern_adder
1 parent 5991dfc commit a2d04a0

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

children_adder.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ def existing_usernames():
6161

6262
def add_one(username, password, role, dep, rights):
6363
if username == '' or password == '':
64-
print("Username or password cannot be empty.")
64+
print(f"Username or password cannot be empty, user {username}.")
6565
return
6666
password_hash = get_pswd_hash(password)
6767
dep_id = DEPS.get(dep.lower(), None)
6868
role_id = ROLES.get(role.lower(), None)
6969

7070
if dep_id is None or role_id is None:
71-
print(f"Department '{dep}' role '{role}' not found.")
71+
print(f"Department '{dep}' role '{role}' not found, user {username}.")
7272
return
7373
role_id = (role_id - 1) * 7 + dep_id
7474
if role == 'старший':
@@ -78,7 +78,7 @@ def add_one(username, password, role, dep, rights):
7878
if username in EXISTING_USERNAMES:
7979
cur.execute("""
8080
UPDATE "user"
81-
SET passwdhash = %s, role = %s, userrights = %s
81+
SET passwdhash = %s, role = %s, userrights = %s, active = true
8282
WHERE username = %s;
8383
""", (password_hash, role_id, rights, username))
8484
else:
@@ -99,11 +99,11 @@ def read_children_csv(file_path):
9999
for row in reader:
100100
if len(row) < 6:
101101
continue
102-
useless, useless2, username, password, dep, useless4, role = row[0], row[1], row[2], row[3], row[4].lower(), row[5].lower(), row[6]
103-
if dep == 'сотрудник':
104-
dep = ' '
105-
if role == 'сотрудник':
106-
role = 'старший'
102+
useless, useless2, username, password, dep, useless3, role = row[0], row[1], row[2], row[3], row[4].lower(), row[5].lower(), row[6].lower()
103+
# if dep == 'сотрудник':
104+
# dep = ' '
105+
# if role == 'сотрудник':
106+
# role = 'старший'
107107
add_one(username, password, role, dep, 'child')
108108
con.commit()
109109

0 commit comments

Comments
 (0)