From 627445e9e22d78f0681ca1e3ba2f2d94f044d92f Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Wed, 29 Apr 2026 15:33:05 -0400 Subject: [PATCH] More url --- app/api/services/office_dashboard.py | 52 ++++++++++++++++------------ 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/app/api/services/office_dashboard.py b/app/api/services/office_dashboard.py index 564b741..e160e4d 100644 --- a/app/api/services/office_dashboard.py +++ b/app/api/services/office_dashboard.py @@ -156,7 +156,7 @@ class OfficeDashboardService(BaseService): @staticmethod def get_office_product_detail(filters): product_id = filters.get('product_id') - product_data=[] + product_data = [] products = Products.get_product_by_product_id(product_id) if products: product_data = { @@ -169,10 +169,10 @@ class OfficeDashboardService(BaseService): 'added': products.added.isoformat() if products.added else None, 'updated': products.updated.isoformat() if products.updated else None, 'banner': products.banner, - } + } - product_details= [] - productDetails =ProductsDetails.get_product_details_with_product_id(product_id) + product_details = [] + productDetails = ProductsDetails.get_product_details_with_product_id(product_id) if productDetails: product_details = { 'product_detail_id': productDetails.id, @@ -192,7 +192,7 @@ class OfficeDashboardService(BaseService): @staticmethod def get_office_product_update(filters): product_id = filters.get('product_id') - product_data=[] + product_data = [] products = Products.get_product_by_product_id(product_id) if products: product_data = { @@ -205,10 +205,10 @@ class OfficeDashboardService(BaseService): 'added': products.added.isoformat() if products.added else None, 'updated': products.updated.isoformat() if products.updated else None, 'banner': products.banner, - } + } - product_details= [] - productDetails =ProductsDetails.get_product_details_with_product_id(product_id) + product_details = [] + productDetails = ProductsDetails.get_product_details_with_product_id(product_id) if productDetails: product_details = { 'product_detail_id': productDetails.id, @@ -378,13 +378,11 @@ class OfficeDashboardService(BaseService): subscription_uid = filters.get('subscription_uid') member_sub = [] - flavor='' - template_name='' + flavor = '' + template_name = '' product_templates_data = [] templates_data = [] - - membersSubResult = MembersProducts.get_member_product_by_subscription_uid(subscription_uid) if membersSubResult: if membersSubResult.product_template: @@ -448,7 +446,6 @@ class OfficeDashboardService(BaseService): logger.error(f"An error occurred while getting dashboard data: {str(e)}", exc_info=True) return jsonify({"message": "Internal Server Error"}), 500 - @staticmethod def get_office_sidebar(filters): try: @@ -486,15 +483,15 @@ class OfficeDashboardService(BaseService): "added": subs.added, }) - recentLogin = Members.get_recent_member_login(10) + recentLogin = Members.get_recent_member_login(10) if recentLogin: recent_login_data = [] for subs in recentLogin: recent_login_data.append({ 'member_id': subs.id, - 'firstname' : subs.firstname, - 'lastname' : subs.lastname, - 'username' : subs.username, + 'firstname': subs.firstname, + 'lastname': subs.lastname, + 'username': subs.username, 'member_uid': subs.uid, "added": subs.added, }) @@ -515,7 +512,7 @@ class OfficeDashboardService(BaseService): "stuck": 0, "completed": 0 } - system_url =[ + system_url = [ { "name": "AirPlay System", "url": "http://10.10.10.121:8080/" @@ -526,15 +523,26 @@ class OfficeDashboardService(BaseService): }, { "name": "Ansible", - "url": "172.16.4.90:3000" + "url": "http://172.16.4.90:3000" }, { "name": "Int HaProxy", "url": "http://172.16.4.99:5555/" }, + { + "name": "Provision Server", + "url": "http://10.13.3.15:8094" + }, + { + "name": "Event Manager", + "url": "http:;//10.13.3.15:5005" + }, + { + "name": "Socket Server", + "url": "http:;//10.13.3.15:5006" + }, ] - response_data = { 'system_url': system_url, 'recent_payment_summary': recent_payment_summary, @@ -629,7 +637,7 @@ class OfficeDashboardService(BaseService): if limit < 1 or limit > 100: limit = 20 - membersList, total_count = Members.get_all_member(None,None,1,30) + membersList, total_count = Members.get_all_member(None, None, 1, 30) # Convert loans to dictionary format member_data = [] for member in membersList: @@ -645,8 +653,6 @@ class OfficeDashboardService(BaseService): "added": member.added, }) - - response_data = { 'members': member_data, 'count': 30,