Administrator
/
smart_service
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

new logo updated and report permission updated

master
Ubuntu 3 years ago
parent
a56372428b
commit
8c25d4ac0d
15 changed files with 1930 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      smart_service/add_ons/doctype/user_feedback/user_feedback.json
  2. 14
      smart_service/add_ons/report/feedback_report/feedback_report.json
  3. 5
      smart_service/add_ons/report/model_download_report/model_download_report.json
  4. 5
      smart_service/add_ons/report/model_hit_report/model_hit_report.json
  5. 31
      smart_service/apis/addon_api.py
  6. 30
      smart_service/fixtures/client_script.json
  7. 303
      smart_service/fixtures/custom_docperm.json
  8. 1417
      smart_service/fixtures/report.json
  9. 116
      smart_service/fixtures/role_profile.json
  10. 4
      smart_service/fixtures/workflow_state.json
  11. 5
      smart_service/mahindra_smart_service/report/installation_report/installation_report.json
  12. 5
      smart_service/mahindra_smart_service/report/login_report/login_report.json
  13. 24
      smart_service/public/css/smart_service.css
  14. BIN
      smart_service/public/images/SsAndMahindra.png
  15. 11
      smart_service/transactions/report/audit_report/audit_report.json

4
smart_service/add_ons/doctype/user_feedback/user_feedback.json
View File

@ -74,7 +74,7 @@
},
{
"fieldname": "date",
"fieldtype": "Date",
"fieldtype": "Datetime",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Date",
@ -107,7 +107,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 13:30:25.712932",
"modified": "2022-03-24 14:30:33.570508",
"modified_by": "Administrator",
"module": "Add Ons",
"name": "User Feedback",

14
smart_service/add_ons/report/feedback_report/feedback_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:22:37.473617",
"modified": "2022-03-24 15:17:31.495600",
"modified_by": "Administrator",
"module": "Add Ons",
"name": "Feedback Report",
@ -21,6 +21,18 @@
"roles": [
{
"role": "System Manager"
},
{
"role": "_Author"
},
{
"role": "_Reviewer"
},
{
"role": "_Approver"
},
{
"role": "_Publisher"
}
]
}

5
smart_service/add_ons/report/model_download_report/model_download_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:22:50.511522",
"modified": "2022-03-24 15:20:03.357943",
"modified_by": "Administrator",
"module": "Add Ons",
"name": "Model Download Report",
@ -21,6 +21,9 @@
"roles": [
{
"role": "System Manager"
},
{
"role": "_Publisher"
}
]
}

5
smart_service/add_ons/report/model_hit_report/model_hit_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:23:04.344843",
"modified": "2022-03-24 15:19:50.950588",
"modified_by": "Administrator",
"module": "Add Ons",
"name": "Model Hit Report",
@ -21,6 +21,9 @@
"roles": [
{
"role": "System Manager"
},
{
"role": "_Publisher"
}
]
}

31
smart_service/apis/addon_api.py
View File

@ -107,13 +107,11 @@ def bookmark(args, request):
@frappe.whitelist()
def feedback(args, request):
try:
request = json.loads(request)
if args == 'get_user_feedback':
api = frappe.db.get_list(
'User Feedback',
fields=['name', 'status', 'feedback_type', 'date',
'user_name', 'attachments', 'description', 'date'],filters={'user_name':frappe.db.get_value('App Users', {'user_id': request['UserID']}, ['name'])})
if args == 'get_user_feedback':
try:
request = json.loads(request)
api = frappe.db.sql('''SELECT name,feedback_type,status,concat(DATE(date),"T",time(date)) as date,user_name,attachments,description FROM {0}.`tabUser Feedback` where user_name = '{1}';'''
.format(current_db_name,frappe.db.get_value('App Users', {'user_id': request['UserID']}, ['name'])),as_dict = True)
for i in api:
if i['attachments'] != 0:
@ -122,10 +120,13 @@ def feedback(args, request):
i['status'] = True
else:
i['status'] = False
return api
except:
api = {"isSuccessful": False}
return api
elif args == 'post_user_feedback':
elif args == 'post_user_feedback':
try:
request = json.loads(request)
usr_fdbk = frappe.new_doc('User Feedback')
usr_fdbk.subject = request['Subject']
usr_fdbk.feedback_type = request["FeedbackType"]
@ -161,10 +162,12 @@ def feedback(args, request):
ret.insert(ignore_permissions=True)
file_response.append(ret)
return {"isSuccessful": True,"name":usr_fdbk.name,"files":file_response}
except:
return {"isSuccessful": False}
api = {"isSuccessful": True,"name":usr_fdbk.name,"files":file_response}
except:
api = {"isSuccessful": False}
return api
@frappe.whitelist()

30
smart_service/fixtures/client_script.json
View File

File diff suppressed because one or more lines are too long

303
smart_service/fixtures/custom_docperm.json
View File

@ -1509,7 +1509,7 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
"write": 1
},
{
"amend": 0,
@ -1725,7 +1725,7 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
"write": 1
},
{
"amend": 0,
@ -1752,7 +1752,7 @@
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
"write": 1
},
{
"amend": 0,
@ -3428,6 +3428,195 @@
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:24:41.621241",
"name": "6e6b63a638",
"parent": "Feedback",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Author",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:27:11.768727",
"name": "49cf182f1b",
"parent": "Feedback",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Reviewer",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:29:30.853172",
"name": "83e0af3d6e",
"parent": "Feedback",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Approver",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:29:45.577146",
"name": "e3a99c9b25",
"parent": "Feedback",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Publisher",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:35:25.796010",
"name": "2a7918ee54",
"parent": "Model Usage",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Publisher",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:36:03.319354",
"name": "ec2ffe9d45",
"parent": "Model Hit",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Publisher",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 0,
"export": 1,
"if_owner": 0,
"import": 1,
"modified": "2022-03-25 11:36:31.028470",
"name": "33845bfc63",
"parent": "App Log",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 0,
"read": 1,
"report": 1,
"role": "_Publisher",
"select": 0,
"set_user_permissions": 0,
"share": 0,
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
@ -3779,6 +3968,33 @@
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"modified": "2022-03-24 15:36:49.777899",
"name": "dd4212fecc",
"parent": "Dashboard",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"select": 1,
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
@ -3860,6 +4076,33 @@
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"modified": "2022-03-25 11:24:41.516474",
"name": "8793725430",
"parent": "Feedback",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"select": 0,
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
@ -4967,6 +5210,33 @@
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"modified": "2022-03-24 15:36:49.881145",
"name": "83a9a2d1ae",
"parent": "Dashboard",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Dashboard Manager",
"select": 1,
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
@ -5210,6 +5480,33 @@
"submit": 0,
"write": 0
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"delete": 0,
"docstatus": 0,
"doctype": "Custom DocPerm",
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"modified": "2022-03-24 15:36:49.866634",
"name": "b5e1ac2b45",
"parent": "Dashboard",
"parentfield": "permissions",
"parenttype": "DocType",
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "All",
"select": 0,
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,

1417
smart_service/fixtures/report.json
View File

File diff suppressed because it is too large

116
smart_service/fixtures/role_profile.json
View File

@ -0,0 +1,116 @@
[
{
"docstatus": 0,
"doctype": "Role Profile",
"modified": "2022-03-24 15:22:40.806287",
"name": "Author",
"parent": null,
"parentfield": null,
"parenttype": null,
"role_profile": "Author",
"roles": [
{
"parent": "Author",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Author"
}
]
},
{
"docstatus": 0,
"doctype": "Role Profile",
"modified": "2022-03-24 15:22:29.006826",
"name": "Reviewer",
"parent": null,
"parentfield": null,
"parenttype": null,
"role_profile": "Reviewer",
"roles": [
{
"parent": "Reviewer",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Reviewer"
}
]
},
{
"docstatus": 0,
"doctype": "Role Profile",
"modified": "2022-03-24 15:22:12.909385",
"name": "Approver",
"parent": null,
"parentfield": null,
"parenttype": null,
"role_profile": "Approver",
"roles": [
{
"parent": "Approver",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Approver"
}
]
},
{
"docstatus": 0,
"doctype": "Role Profile",
"modified": "2022-03-24 15:23:56.898090",
"name": "Publisher",
"parent": null,
"parentfield": null,
"parenttype": null,
"role_profile": "Publisher",
"roles": [
{
"parent": "Publisher",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Reviewer"
},
{
"parent": "Publisher",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Author"
},
{
"parent": "Publisher",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Approver"
},
{
"parent": "Publisher",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "_Publisher"
}
]
},
{
"docstatus": 0,
"doctype": "Role Profile",
"modified": "2022-03-24 15:28:49.881853",
"name": "CMS Admin",
"parent": null,
"parentfield": null,
"parenttype": null,
"role_profile": "CMS Admin",
"roles": [
{
"parent": "CMS Admin",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "System Manager"
},
{
"parent": "CMS Admin",
"parentfield": "roles",
"parenttype": "Role Profile",
"role": "User_Account_Manager"
}
]
}
]

4
smart_service/fixtures/workflow_state.json
View File

@ -39,12 +39,12 @@
"docstatus": 0,
"doctype": "Workflow State",
"icon": "",
"modified": "2021-11-25 14:45:42.891534",
"modified": "2022-03-24 12:59:27.717741",
"name": "Draft",
"parent": null,
"parentfield": null,
"parenttype": null,
"style": "Inverse",
"style": "Danger",
"workflow_state_name": "Draft"
},
{

5
smart_service/mahindra_smart_service/report/installation_report/installation_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:24:44.638997",
"modified": "2022-03-24 15:19:15.315547",
"modified_by": "Administrator",
"module": "Mahindra Smart Service",
"name": "Installation Report",
@ -21,6 +21,9 @@
"roles": [
{
"role": "System Manager"
},
{
"role": "_Publisher"
}
]
}

5
smart_service/mahindra_smart_service/report/login_report/login_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:24:33.214754",
"modified": "2022-03-24 15:18:58.913232",
"modified_by": "Administrator",
"module": "Mahindra Smart Service",
"name": "Login Report",
@ -21,6 +21,9 @@
"roles": [
{
"role": "System Manager"
},
{
"role": "_Publisher"
}
]
}

24
smart_service/public/css/smart_service.css
View File

@ -17,16 +17,23 @@
box-shadow: 0 0 2px 2px #E31A37!important;
/* h-offset v-offset blur spread colour */
}
.login-content.page-card{
max-width: 500px !important;
}
.form-signin.form-login {
max-width: 400px !important;
}
.app-logo {
width: 200px !important;
width: 400px !important;
height: 50px !important;
image-rendering: -webkit-optimize-contrast !important;
filter: none !important;
}
.page-card-head img {
max-height: 50px !important;
max-width: auto !important;
}
.navbar{
box-shadow: 7px -2px 11px #E31A37;
@ -58,7 +65,7 @@ box-shadow: 0 0 2px 2px #E31A37!important;
}
.txt-input-captcha{
margin-left: 60px;
width: 81%;
width: 85%;
}
.captcha-txt{
font-size: 15px;
@ -91,5 +98,18 @@ box-shadow: 0 0 2px 2px #E31A37!important;
100%{transform:scale(.5) rotate(-360deg);}
}
h4{
font-weight: 500;
}
:root,
[data-theme=light], [data-theme=dark] {
--font-stack: Inter !important;
--font-family-sans-serif: Inter !important;
--font-family-monospace: Inter !important;
}
body{
font-family: Inter !important;
/* font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; */
}

BIN
smart_service/public/images/SsAndMahindra.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

11
smart_service/transactions/report/audit_report/audit_report.json
View File

@ -9,7 +9,7 @@
"filters": [],
"idx": 0,
"is_standard": "Yes",
"modified": "2022-01-28 15:22:23.994122",
"modified": "2022-03-24 15:18:28.921126",
"modified_by": "Administrator",
"module": "Transactions",
"name": "Audit Report",
@ -24,6 +24,15 @@
},
{
"role": "System Manager"
},
{
"role": "_Reviewer"
},
{
"role": "_Approver"
},
{
"role": "_Author"
}
]
}
Write Preview
Loading…
Cancel
Save