MERMS/MermsCoreBackendFlask
1
0
Fork 0
Code Issues Pull Requests Releases Activity

canendar data

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-01-20 12:12:33 -05:00
parent a9dd5276b1
commit 5b9dcfc569
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/project/__init__.py
+29 -12
View File
@@ -540,6 +540,7 @@ def start_resetpass():
connection.commit() connection.commit()
# last_row_id=cursor.lastrowid # last_row_id=cursor.lastrowid
send_resetpass_mail('ameye@chiefsoft.com')
# return jsonify(hello="ameye reset path world", last_row_id=last_row_id) # return jsonify(hello="ameye reset path world", last_row_id=last_row_id)
return jsonify(hello="ameye reset path world") return jsonify(hello="ameye reset path world")
@@ -643,11 +644,28 @@ def recent_bar(current_user):
} }
return jsonify(bar_data=bar_data) return jsonify(bar_data=bar_data)
# "initial": random.randint(0, 10), @app.route("/panel/account/calendar")
# "processing": random.randint(0, 10), @token_required
# "verifying" : random.randint(0, 10), def calendar_data(current_user):
# "completed" : random.randint(0, 10), # let send 60 days of data in only - cache heavy
# bar_data = {
"last_update": datetime.datetime.utcnow(),
"category": [
{"cid": "1", "description": "category 01" },
{"cid": "2", "description": "category 02" },
{"cid": "3", "description": "category 03" },
{"cid": "4", "description": "category 04" },
],
"list": [
{"id": "1", "description": "Contacts" , "last_update": "10-10-2010 11:00 AM", "value": random.randint(0, 10) , "data_span":'Last 2 months'},
{"id": "2", "description": "Site Traffic" , "last_update": "10-10-2010 11:30 AM", "value": random.randint(0, 10), "data_span":'Past 12 hours'},
{"id": "3", "description": "Appointments" , "last_update": "10-12-2010 11:30 AM", "value": random.randint(0, 10), "data_span":'Last 14 days'},
{"id": "4", "description": "Purchases" , "last_update": "10-12-2010 11:30 AM", "value": random.randint(0, 10), "data_span":'Last 3 months'},
]
}
return jsonify(bar_data=bar_data)
@app.route("/panel/account/actions") @app.route("/panel/account/actions")
@token_required @token_required
def recent_actions(current_user): def recent_actions(current_user):
@@ -657,7 +675,12 @@ def recent_actions(current_user):
# RECENT_ACTIONS = "SELECT * FROM members_actions WHERE member_id = " + user_id + " ORDER by id DESC LIMIT 4" # RECENT_ACTIONS = "SELECT * FROM members_actions WHERE member_id = " + user_id + " ORDER by id DESC LIMIT 4"
# RECENT_ACTIONS = "SELECT * FROM members_actions WHERE member_id::text = %s ORDER by id DESC LIMIT 4" # RECENT_ACTIONS = "SELECT * FROM members_actions WHERE member_id::text = %s ORDER by id DESC LIMIT 4"
# print(user_id) # print(user_id)
RECENT_ACTIONS = f"SELECT id AS no,action_label AS description,added::text AS date,status FROM members_actions WHERE member_id = {user_id} ORDER by id DESC LIMIT 4" RECENT_ACTIONS = f"""SELECT id AS no,
action_label AS description,
added::text AS date,status
FROM members_actions
WHERE member_id = {user_id}
ORDER by id DESC LIMIT 4"""
actionVal = (user_id) actionVal = (user_id)
with connection.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor: with connection.cursor(cursor_factory=psycopg2.extras.DictCursor) as cursor:
cursor.execute(RECENT_ACTIONS) cursor.execute(RECENT_ACTIONS)
@@ -680,12 +703,6 @@ def recent_actions(current_user):
} }
return jsonify(action_data=action_data, recent_actions=array3) return jsonify(action_data=action_data, recent_actions=array3)
# "actions2": [
# {"no": "1", "description": "Welcome to MERMS" , "date": "10-10-2010 11:00 AM", "status": 'completed'},
# {"no": "2", "description": "Personal Blog Setup" , "date": "10-10-2010 11:30 AM", "status": 'processing'},
# {"no": "3", "description": "Web Traffic Analysis" , "date": "10-12-2010 11:30 AM", "status": 'verifying'},
# ],
#
@app.route("/panel/account/products/url") @app.route("/panel/account/products/url")
@token_required @token_required
def product_urls(current_user): def product_urls(current_user):