DmitrMakeev
commited on
Update app.py
Browse files
app.py
CHANGED
@@ -2057,28 +2057,18 @@ def from_allow():
|
|
2057 |
else:
|
2058 |
pr5_data = {}
|
2059 |
|
2060 |
-
|
2061 |
-
|
2062 |
-
|
2063 |
-
|
2064 |
-
|
2065 |
-
|
2066 |
-
|
2067 |
if del_flag == '1':
|
2068 |
-
|
|
|
|
|
2069 |
elif module and status:
|
2070 |
-
|
2071 |
-
|
2072 |
-
|
2073 |
-
|
2074 |
-
|
2075 |
-
|
2076 |
-
|
2077 |
-
|
2078 |
-
|
2079 |
-
|
2080 |
|
2081 |
-
|
2082 |
pr5_json = json.dumps(pr5_data)
|
2083 |
|
2084 |
utc_now = datetime.utcnow()
|
@@ -2086,21 +2076,20 @@ def from_allow():
|
|
2086 |
msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
|
2087 |
data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
|
2088 |
|
2089 |
-
columns_to_update = ['name', 'phone', 'email', 'pr5', 'data_on']
|
2090 |
-
values_to_update = [name, phone, email, pr5_json, data_on]
|
2091 |
-
|
2092 |
if result:
|
2093 |
-
|
2094 |
-
|
2095 |
-
|
|
|
|
|
2096 |
else:
|
2097 |
-
|
2098 |
-
|
|
|
|
|
2099 |
|
2100 |
conn.commit()
|
2101 |
-
|
2102 |
replace_null_with_empty_string(conn)
|
2103 |
-
|
2104 |
conn.close()
|
2105 |
|
2106 |
return jsonify(pr5_data), 200
|
@@ -2126,7 +2115,6 @@ def from_allow():
|
|
2126 |
|
2127 |
|
2128 |
|
2129 |
-
|
2130 |
|
2131 |
@app.route('/gc_in', methods=['GET'])
|
2132 |
def add_data_gc_in():
|
|
|
2057 |
else:
|
2058 |
pr5_data = {}
|
2059 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2060 |
if del_flag == '1':
|
2061 |
+
# Удаление ключа из JSON
|
2062 |
+
if module in pr5_data:
|
2063 |
+
del pr5_data[module]
|
2064 |
elif module and status:
|
2065 |
+
if module in pr5_data:
|
2066 |
+
# Обновление значения существующего ключа
|
2067 |
+
pr5_data[module] = status
|
2068 |
+
else:
|
2069 |
+
# Добавление нового ключа в JSON
|
2070 |
+
pr5_data[module] = status
|
|
|
|
|
|
|
|
|
2071 |
|
|
|
2072 |
pr5_json = json.dumps(pr5_data)
|
2073 |
|
2074 |
utc_now = datetime.utcnow()
|
|
|
2076 |
msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
|
2077 |
data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
|
2078 |
|
|
|
|
|
|
|
2079 |
if result:
|
2080 |
+
cursor.execute("""
|
2081 |
+
UPDATE contacts
|
2082 |
+
SET pr5 = ?, data_on = ?
|
2083 |
+
WHERE email = ? OR phone = ?
|
2084 |
+
""", (pr5_json, data_on, email, phone))
|
2085 |
else:
|
2086 |
+
cursor.execute("""
|
2087 |
+
INSERT INTO contacts (name, email, phone, pr5, data_on)
|
2088 |
+
VALUES (?, ?, ?, ?, ?)
|
2089 |
+
""", (name, email, phone, pr5_json, data_on))
|
2090 |
|
2091 |
conn.commit()
|
|
|
2092 |
replace_null_with_empty_string(conn)
|
|
|
2093 |
conn.close()
|
2094 |
|
2095 |
return jsonify(pr5_data), 200
|
|
|
2115 |
|
2116 |
|
2117 |
|
|
|
2118 |
|
2119 |
@app.route('/gc_in', methods=['GET'])
|
2120 |
def add_data_gc_in():
|