Browse Source

update set only once masters docs and api updated

master
Ubuntu 3 years ago
parent
commit
6db2655144
  1. 12
      smart_service/apis/app_user_login.py
  2. 17
      smart_service/apis/update_validation.py
  3. 57
      smart_service/fixtures/client_script.json
  4. 4
      smart_service/fixtures/workflow_state.json
  5. 5
      smart_service/masters/doctype/drive/drive.json
  6. 5
      smart_service/masters/doctype/fuel/fuel.json
  7. 12
      smart_service/masters/doctype/service_kilometers/service_kilometers.json
  8. 5
      smart_service/masters/doctype/sub_systems/sub_systems.json
  9. 5
      smart_service/masters/doctype/systems/systems.json
  10. 5
      smart_service/masters/doctype/transmission/transmission.json
  11. 5
      smart_service/masters/doctype/variant/variant.json
  12. 5
      smart_service/masters/doctype/vehicle/vehicle.json
  13. 27
      smart_service/masters/doctype/vehicle/vehicle.py
  14. 5
      smart_service/masters/doctype/vehicle_segment/vehicle_segment.json
  15. 2
      smart_service/public/css/smart_service.css
  16. 4
      smart_service/transactions/doctype/publish/publish.json
  17. 27
      smart_service/transactions/report/audit_report/audit_report.py

12
smart_service/apis/app_user_login.py

@ -352,4 +352,14 @@ def login_generate_token(doc=None,method=None):
water.apple = new_tok
water.save()
return water.apple
@frappe.whitelist(allow_guest=True)
def temporary_login():
user_details={}
docu = frappe.get_doc("Fish", None)
token = docu.apple
user_details['token'] = token
user_details['Installation ID'] = "AppDev-0142"
user_details['User ID'] = "U-00006"
user_details['Code'] = "SJ010081"
return user_details

17
smart_service/apis/update_validation.py

@ -249,7 +249,14 @@ def check_vehicle_update(vehicle_list):
final.append(variant_out)
res = {'Name': '%s-%s_%s' % (iid, vehicle, l_id), 'Language': l_id, 'IsUpdateAvailable': 'true',
'CurrentVersion': float(current_version), 'Version': float(update_version)}
try:
if not os.path.exists(base_url+"/files/json_files"):
os.makedirs(base_url+"/files/json_files")
if not os.path.exists(base_url+"/files/json_files/temp"):
os.makedirs(base_url+"/files/json_files/temp")
file_name = "/files/json_files/temp/%s-%s_%s.json" % (iid, vehicle, l_id)
dicfinal = {'JSON': final}
@ -305,4 +312,12 @@ def delete_complete(doc=None,method=None):
@frappe.whitelist()
def file_details():
lst=[]
with os.scandir() as dir_entries:
for entry in dir_entries:
info = entry.stat()
lst.append(info)
return lst

57
smart_service/fixtures/client_script.json

File diff suppressed because one or more lines are too long

4
smart_service/fixtures/workflow_state.json

@ -123,12 +123,12 @@
"docstatus": 0,
"doctype": "Workflow State",
"icon": "",
"modified": "2021-11-26 15:26:56.857786",
"modified": "2022-03-28 15:50:00.411032",
"name": "Publish Ready",
"parent": null,
"parentfield": null,
"parenttype": null,
"style": "Info",
"style": "Success",
"workflow_state_name": "Publish Ready"
}
]

5
smart_service/masters/doctype/drive/drive.json

@ -21,7 +21,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Drive",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -42,7 +43,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-18 11:48:00.194884",
"modified": "2022-03-28 16:16:40.291574",
"modified_by": "Administrator",
"module": "Masters",
"name": "Drive",

5
smart_service/masters/doctype/fuel/fuel.json

@ -22,7 +22,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Fuel",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -43,7 +44,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-17 19:07:08.832628",
"modified": "2022-03-28 16:16:24.261317",
"modified_by": "Administrator",
"module": "Masters",
"name": "Fuel",

12
smart_service/masters/doctype/service_kilometers/service_kilometers.json

@ -9,6 +9,7 @@
"engine": "InnoDB",
"field_order": [
"kilometer",
"km_name",
"active_status",
"myid"
],
@ -21,7 +22,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Kilometer",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -38,11 +40,17 @@
"in_standard_filter": 1,
"label": "myID",
"set_only_once": 1
},
{
"fieldname": "km_name",
"fieldtype": "Data",
"label": "Kilometer",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 12:33:08.426297",
"modified": "2022-03-31 15:33:48.468849",
"modified_by": "Administrator",
"module": "Masters",
"name": "Service Kilometers",

5
smart_service/masters/doctype/sub_systems/sub_systems.json

@ -21,7 +21,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Sub System Name",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -42,7 +43,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 12:40:29.687934",
"modified": "2022-03-28 16:18:17.899428",
"modified_by": "Administrator",
"module": "Masters",
"name": "Sub Systems",

5
smart_service/masters/doctype/systems/systems.json

@ -24,7 +24,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "System Name",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -58,7 +59,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 12:40:21.114791",
"modified": "2022-03-31 14:49:04.303134",
"modified_by": "Administrator",
"module": "Masters",
"name": "Systems",

5
smart_service/masters/doctype/transmission/transmission.json

@ -21,7 +21,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Transmission",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -42,7 +43,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 12:34:18.571139",
"modified": "2022-03-28 16:17:00.779363",
"modified_by": "Administrator",
"module": "Masters",
"name": "Transmission",

5
smart_service/masters/doctype/variant/variant.json

@ -39,7 +39,8 @@
"in_preview": 1,
"in_standard_filter": 1,
"label": "Variant",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fetch_from": "vehicle.myid",
@ -101,7 +102,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-03-01 15:06:32.534454",
"modified": "2022-03-31 16:09:20.683902",
"modified_by": "Administrator",
"module": "Masters",
"name": "Variant",

5
smart_service/masters/doctype/vehicle/vehicle.json

@ -54,7 +54,8 @@
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Vehicle",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "preview",
@ -118,7 +119,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-22 18:11:19.333346",
"modified": "2022-03-28 16:15:54.574158",
"modified_by": "Administrator",
"module": "Masters",
"name": "Vehicle",

27
smart_service/masters/doctype/vehicle/vehicle.py

@ -3,10 +3,14 @@
import frappe
from frappe.model.document import Document
from PIL import Image
from frappe.utils import cstr
import os
class Vehicle(Document):
def validate(self):
pass
def validate(self):
pass
@frappe.whitelist()
def update_km_mapping(doc,vehicle,type,skm_initial):
###Insert kilometer in kilometer mapping for added new kilometer
@ -47,3 +51,22 @@ def vehicle_segment(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql(""" select name
FROM {0}.`tabVehicle Segment` where
(name like "%%%(txt)s%%") order by modified desc limit %(start)s, %(page_len)s """.format(current_db_name)%{'txt': txt, 'start': start, 'page_len': page_len})
@frappe.whitelist()
def image_size(image,doc):
current_db_name = frappe.conf.get("db_name")
site_name = cstr(frappe.local.site)
file_path = "/home/ubuntu/frappe-bench/sites/"+site_name +"/public" + image
size = os.path.getsize(file_path)
img = Image.open(file_path)
width = img.width
height = img.height
if(width > 510 and height > 510):
frappe.db.sql("""delete from `tabFile` where file_url = %s""",image)
frappe.db.commit()
return image
if(size > 10485760 ):
frappe.db.sql("""delete from `tabFile` where file_url = %s""",image)
frappe.db.commit()
return size

5
smart_service/masters/doctype/vehicle_segment/vehicle_segment.json

@ -22,7 +22,8 @@
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Vehicle Segment",
"reqd": 1
"reqd": 1,
"set_only_once": 1
},
{
"fieldname": "active_status",
@ -53,7 +54,7 @@
"icon": "fa fa-car-alt",
"index_web_pages_for_search": 1,
"links": [],
"modified": "2022-02-11 10:34:09.580371",
"modified": "2022-03-31 14:49:18.442598",
"modified_by": "Administrator",
"module": "Masters",
"name": "Vehicle Segment",

2
smart_service/public/css/smart_service.css

@ -110,6 +110,6 @@ h4{
}
body{
font-family: Inter !important;
font-family: inherit !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; */
}

4
smart_service/transactions/doctype/publish/publish.json

@ -1,7 +1,7 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "format: {vehicle}-{language} {version}",
"autoname": "format: {vehicle}-{language} -{creation}",
"creation": "2021-11-01 12:28:45.623316",
"doctype": "DocType",
"editable_grid": 1,
@ -264,7 +264,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2022-03-15 16:00:46.484240",
"modified": "2022-03-28 15:53:18.617801",
"modified_by": "Administrator",
"module": "Transactions",
"name": "Publish",

27
smart_service/transactions/report/audit_report/audit_report.py

@ -59,11 +59,8 @@ def modifyData(dataInput, filterParent):
list1 = []
inputData = modifyChildData(dataInput, indent=6, header=0)
parentAppend = addParent(filterParent, indent=0, header=1)
sMap, sSize = getParentMap(inputData, 'systems')
systemSize = statusLengthAppend(sSize,'System')
parentAppend[0]['active_status'] = systemSize
for pa in parentAppend:
@ -80,7 +77,8 @@ def modifyData(dataInput, filterParent):
sys_assets = frappe.db.sql('''SELECT system_asset as description, {0}
FROM {1}.`tabSystem Mapping_System Assets`
where parent like '{2}' and systems = '{3}' and language= 'en' order by idx; '''.format(activeStatusQuerycase,current_db_name,list1[0]['procedure_name']+"%",sMapAppend[0]['procedure_name']),as_dict=True)
where parent like '{2}' and systems = '{3}' and language= 'en' order by idx; '''.format(activeStatusQuerycase,current_db_name,list1[0]['procedure_name']+"%",
sMapAppend[0]['procedure_name']),as_dict=True)
for sa in sys_assets:
list1.append(sa.update({'procedure_name':"System Asset",'indent':2,'header':'','type':'Asset'}))
@ -89,6 +87,7 @@ def modifyData(dataInput, filterParent):
val = j['procedure_name']
proc = j['procedure']
procMap, procSize = getParentMap(ssMap[val], 'procedure_name')
print(procMap)
procValuesDic = appendToDic3(
procMap, procSize, j, indent=3, header=0, procedure=proc)
@ -97,24 +96,22 @@ def modifyData(dataInput, filterParent):
list1.append(j)
for d in procValuesDic:
list1.append(d)
list1.append(d)
for pm in procMap:
list1.append({'procedure_name': pm, 'indent': 4,'header':0,'active_status':'','modified':''})
step_list,steps_size = getParentMap(procMap[pm], 'step_name')
step_list,steps_size = getParentMap(procMap[pm], 'step_name')
for sl in step_list:
list1.append({'procedure_name': sl, 'indent': 5,'header':0,'active_status':'','modified':''})
for ss in step_list[sl]:
ss.update({'procedure_name':ss['content_type']})
list1.append(ss)
appendData = addDuplicateData(list1)
appendData = removeDuplicateAndHeader(appendData)
return appendData
def print(sts):
frappe.msgprint(str(sts))
def appendToDic1(mapData, indent, header):
mapDataAppend = []
@ -186,7 +183,6 @@ def appendToDic3(mapData, procSize, j, indent, header, procedure):
'''select count(step_name) as count, modified as {1} from {0}.`tabProcedure_Details` where parent= '{2}' group by(procedure_name) order by idx;'''.format(
current_db_name, colmodified, procedure), as_list=True)
for l in other_step_count:
list2.append(l)
list1.append(list2)
@ -197,11 +193,12 @@ def appendToDic3(mapData, procSize, j, indent, header, procedure):
dateList.append(str(k['modified']))
dateList.sort(key=lambda date: datetime.strptime(date, "%Y-%m-%d %H:%M:%S.%f"))
if procSize[i] == 1:
stepLength = str(procSize[i]) + " Step"
else:
stepLength = str(procSize[i]) + " Steps"
# if procSize[i] == 1:
# stepLength = str(procSize[i]) + " Step"
# else:
# stepLength = str(procSize[i]) + " Steps"
stepLength = "TEsting"
procDict = {
'systems': mapData[u][0]['systems'],
'sub_systems': mapData[u][0]['sub_systems'],

Loading…
Cancel
Save