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

special char msg contenet changed and update api validation

master
Ubuntu 3 years ago
parent
886ac15224
commit
9814b6afa1
4 changed files with 197 additions and 214 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      smart_service/apis/app_user_login.py
  2. 3
      smart_service/apis/update_validation.py
  3. 48
      smart_service/fixtures/client_script.json
  4. 3
      smart_service/masters/doctype/variant/variant.py

51
smart_service/apis/app_user_login.py
View File

@ -9,7 +9,7 @@ import xml.etree.ElementTree as ET
from copy import copy from copy import copy
current_db_name = frappe.conf.get("db_name") current_db_name = frappe.conf.get("db_name")
now_datetime=now()
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def app_user_validation(usr, pwd): def app_user_validation(usr, pwd):
@ -34,8 +34,7 @@ def app_user_validation(usr, pwd):
dicData['status']=1 dicData['status']=1
return dicData return dicData
else: else:
message_to_send={'status':0,'error':'Invalid Credentials'} return {'status':0,'error':'Invalid Credentials'}
return message_to_send
elif technician_login==0 and mahindra_login==1: elif technician_login==0 and mahindra_login==1:
response1 = requests.post("http://www.mahindramile.com/WindowAuth/Service.asmx/ValidateCredential", data=data, headers=headers) response1 = requests.post("http://www.mahindramile.com/WindowAuth/Service.asmx/ValidateCredential", data=data, headers=headers)
@ -80,8 +79,7 @@ def app_user_validation(usr, pwd):
except: except:
msgDic['IsSuccessfull'] = node.text msgDic['IsSuccessfull'] = node.text
message_to_send={'status':0,'error':'Invalid Credentials'} return {'status':0,'error':'Invalid Credentials'}
return message_to_send
elif technician_login==1 and mahindra_login==1: elif technician_login==1 and mahindra_login==1:
response = requests.post( response = requests.post(
@ -139,11 +137,9 @@ def app_user_validation(usr, pwd):
dicData['status']=1 dicData['status']=1
return dicData return dicData
except: except:
message_to_send={'status':0,'error':'Invalid Credentials'} return {'status':0,'error':'Invalid Credentials'}
return message_to_send
else: else:
message_to_send={'status':0,'error':'Login Blocked'} return {'status':0,'error':'Login Blocked'}
return message_to_send
def xml_to_dict(node): def xml_to_dict(node):
@ -153,7 +149,7 @@ def xml_to_dict(node):
@frappe.whitelist() @frappe.whitelist()
def grant_user_access(userdata,iid): def grant_user_access(userdata,iid):
try:
user_details = {} user_details = {}
userdata = json.loads(userdata) userdata = json.loads(userdata)
user_id=userdata['ID'] user_id=userdata['ID']
@ -224,7 +220,7 @@ def grant_user_access(userdata,iid):
app_device.os = os app_device.os = os
app_device.os_version = os_version app_device.os_version = os_version
app_device.app_current_version = app_current_version app_device.app_current_version = app_current_version
app_device.last_login = now_datetime app_device.last_login = now()
app_device.insert() app_device.insert()
if frappe.db.exists({'doctype':'App Device','device_id' : device_id}): if frappe.db.exists({'doctype':'App Device','device_id' : device_id}):
@ -244,21 +240,20 @@ def grant_user_access(userdata,iid):
app_logs.latitude = latitude app_logs.latitude = latitude
app_logs.longitude = longitude app_logs.longitude = longitude
app_logs.active_status = 'Active' app_logs.active_status = 'Active'
app_logs.date_time_stamp = now_datetime app_logs.date_time_stamp = now()
app_logs.insert() app_logs.insert()
app_device_tmp=frappe.get_last_doc('App Device', filters={"device_id": device_id}) app_device_tmp=frappe.get_last_doc('App Device', filters={"device_id": device_id})
frappe.db.sql('''UPDATE {2}.`tabApp Device` SET active_status= "{1}" where name = "{0}";'''.format(app_device_tmp.name, "Active", current_db_name)) frappe.db.sql('''UPDATE {2}.`tabApp Device` SET active_status= "{1}" where name = "{0}";'''.format(app_device_tmp.name, "Active", current_db_name))
frappe.db.commit() frappe.db.commit()
app_logs3 = frappe.new_doc('App Log') app_logs3 = frappe.new_doc('App Log')
app_logs3.user = app_user1.name app_logs3.user = app_user1.name
app_logs3.device = app_device.name app_logs3.device = app_device.name
app_logs3.type = 'Logged in' app_logs3.type = 'Logged in'
app_logs3.latitude = latitude app_logs3.latitude = latitude
app_logs3.longitude = longitude app_logs3.longitude = longitude
app_logs3.date_time_stamp = now_datetime app_logs3.date_time_stamp = now()
app_logs3.insert() app_logs3.insert()
else: else:
@ -271,7 +266,7 @@ def grant_user_access(userdata,iid):
app_logs.active_status = 'Active' app_logs.active_status = 'Active'
app_logs.latitude = latitude app_logs.latitude = latitude
app_logs.longitude = longitude app_logs.longitude = longitude
app_logs.date_time_stamp = now_datetime app_logs.date_time_stamp = now()
app_logs.save() app_logs.save()
app_logs4 = frappe.new_doc('App Log') app_logs4 = frappe.new_doc('App Log')
@ -280,12 +275,11 @@ def grant_user_access(userdata,iid):
app_logs4.type = 'Logged in' app_logs4.type = 'Logged in'
app_logs4.latitude = latitude app_logs4.latitude = latitude
app_logs4.longitude = longitude app_logs4.longitude = longitude
app_logs4.date_time_stamp = now_datetime app_logs4.date_time_stamp = now()
app_logs4.save() app_logs4.save()
else : else :
frappe.db.sql('''UPDATE {4}.`tabApp Device` set last_logged_in= '{0}', user_name = '{2}', device_type = '{3}' where name = "{1}";'''.format(now_datetime,iid,email,user_type_desc,current_db_name)) frappe.db.sql('''UPDATE {4}.`tabApp Device` set last_logged_in= '{0}', user_name = '{2}', device_type = '{3}' where name = "{1}";'''.format(now(),iid,email,user_type_desc,current_db_name))
frappe.db.commit() frappe.db.commit()
app_user2=frappe.get_last_doc('App Users', filters={"email_id": email}) app_user2=frappe.get_last_doc('App Users', filters={"email_id": email})
app_logs = frappe.new_doc('App Log') app_logs = frappe.new_doc('App Log')
@ -294,7 +288,7 @@ def grant_user_access(userdata,iid):
app_logs.type = 'Logged in' app_logs.type = 'Logged in'
app_logs.latitude = latitude app_logs.latitude = latitude
app_logs.longitude = longitude app_logs.longitude = longitude
app_logs.date_time_stamp = now_datetime app_logs.date_time_stamp = now()
app_logs.save() app_logs.save()
''' create user with role system manager ''' ''' create user with role system manager '''
@ -311,7 +305,8 @@ def grant_user_access(userdata,iid):
user_details['User ID'] = lst1[0][0] user_details['User ID'] = lst1[0][0]
return user_details return user_details
except: except:
return "Login Failure" # return "Login Failure"
return {'status':0,'error':'Login Failure'}
else: else:
# user = frappe.new_doc('User') # user = frappe.new_doc('User')
@ -332,7 +327,10 @@ def grant_user_access(userdata,iid):
user_details['User ID'] = lst1[-1][0] user_details['User ID'] = lst1[-1][0]
return user_details return user_details
except: except:
return "Login Failure" # return "Login Failure"
return {'status':0,'error':'Login Failure'}
except:
return {'status':0,'error':'Input data error'}
def generate_keys(user): def generate_keys(user):
user_details = frappe.get_doc('User', user) user_details = frappe.get_doc('User', user)
@ -352,14 +350,3 @@ def login_generate_token(doc=None,method=None):
water.apple = new_tok water.apple = new_tok
water.save() water.save()
return water.apple 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

3
smart_service/apis/update_validation.py
View File

@ -101,8 +101,7 @@ def check_vehicle_update(vehicle_list):
publish_data = frappe.db.sql('''select name,CAST(version AS DECIMAL(10,2)) as version from {}.tabPublish where vehicle= '{}' and language='{}' and publish_type = '{}' and version > {} and vehicle_status = 'Active'; publish_data = frappe.db.sql('''select name,CAST(version AS DECIMAL(10,2)) as version from {}.tabPublish where vehicle= '{}' and language='{}' and publish_type = '{}' and version > {} and vehicle_status = 'Active';
'''.format(current_db_name, vehicle, l_id, publish_type, current_version), as_dict=True) '''.format(current_db_name, vehicle, l_id, publish_type, current_version), as_dict=True)
else: else:
publish_data = frappe.db.sql('''select name,version from {}.tabPublish where vehicle= '{}' and language='{}' and publish_type= '{}' and version > {} and vehicle_status = 'Active'; '''.format(current_db_name, vehicle, l_id, publish_type, current_version), as_dict=True) publish_data = frappe.db.sql('''select name,version,release_description as description from {}.tabPublish where vehicle= '{}' and language='{}' and publish_type= '{}' and version > {} and vehicle_status = 'Active'; '''.format(current_db_name, vehicle, l_id, publish_type, current_version), as_dict=True)
if len(publish_data) > 0: if len(publish_data) > 0:
update_version = publish_data[-1]['version'] update_version = publish_data[-1]['version']

48
smart_service/fixtures/client_script.json
View File

File diff suppressed because one or more lines are too long

3
smart_service/masters/doctype/variant/variant.py
View File

@ -4,13 +4,10 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
from frappe import _ from frappe import _
#from magic import magic
class Variant(Document): class Variant(Document):
def validate(self): def validate(self):
# mime = magic.Magic(mime=True)
if self.variant: if self.variant:
self.variant = self.variant.strip() self.variant = self.variant.strip()
# self.variant = mime.from_file("/home/ubuntu/frappe-bench/sites/guidedsmartservice.com/public/files/anydesk.xlsx")
self.name = self.vehicle + '.' + self.variant self.name = self.vehicle + '.' + self.variant

Write Preview
Loading…
Cancel
Save