From 6e13f6dcf9a05a8da50ae100d42fc5b8e406ecc8 Mon Sep 17 00:00:00 2001 From: hns Date: Wed, 19 Jan 2022 15:03:43 +0530 Subject: [PATCH] uplaod 3 --- .../model_hit_report.cpython-38.pyc | Bin 347 -> 1930 bytes .../model_hit_report/model_hit_report.js | 16 +++---- .../model_hit_report/model_hit_report.py | 33 +++++++------- .../__pycache__/app_user_login.cpython-38.pyc | Bin 6116 -> 6122 bytes .../__pycache__/publish_api.cpython-38.pyc | Bin 5049 -> 5049 bytes .../__pycache__/testPublish.cpython-38.pyc | Bin 0 -> 1207 bytes .../transaction_api.cpython-38.pyc | Bin 751 -> 795 bytes .../update_validation.cpython-38.pyc | Bin 3789 -> 3861 bytes smart_service/apis/app_user_login.py | 2 +- smart_service/apis/testPublish.py | 41 ++++++++++++++++++ smart_service/apis/update_validation.py | 7 +-- .../_drive_translation.cpython-38.pyc | Bin 2552 -> 2461 bytes .../_fuel_translation.cpython-38.pyc | Bin 2338 -> 2389 bytes .../_procedure_report.cpython-38.pyc | Bin 5615 -> 5665 bytes .../_sub_systems_translation.cpython-38.pyc | Bin 2646 -> 2577 bytes .../_sub_systems_translation.py | 8 ++-- .../_systems_translation.cpython-38.pyc | Bin 2598 -> 2507 bytes .../_systems_translation.py | 4 +- .../_transmission_translation.cpython-38.pyc | Bin 2643 -> 2552 bytes .../_variant_translation.cpython-38.pyc | Bin 2444 -> 2489 bytes ...vehicle_segment_translation.cpython-38.pyc | Bin 2682 -> 2591 bytes .../_vehicle_segment_translation.py | 2 +- .../_vehicle_translation.cpython-38.pyc | Bin 2578 -> 2487 bytes .../doctype/vehi_master/vehi_master.json | 2 +- .../templates/includes/login/_login.js | 4 ++ 25 files changed, 84 insertions(+), 35 deletions(-) create mode 100644 smart_service/apis/__pycache__/testPublish.cpython-38.pyc create mode 100644 smart_service/apis/testPublish.py diff --git a/smart_service/add_ons/report/model_hit_report/__pycache__/model_hit_report.cpython-38.pyc b/smart_service/add_ons/report/model_hit_report/__pycache__/model_hit_report.cpython-38.pyc index 8fd3b74d1f1e2d3f504ec2e1bd7bbe62b5be0fb9..e54412df8ff6c876e9d3789b61104314df78082d 100644 GIT binary patch literal 1930 zcmbVNy>lBy6u({Fw2s4ON}fr18x$zUfmiIRyhGi-A?-L9nb+=tlPbFh&s zr=_K$uuJ|LDw=I6z%3;O!+WO>j?B2>G`qLI{do8Gz2EQYu-o+wcs~C1_vjbbFn&YO zd|CkRK`W1-;|3?Gkr74+j%i96g?B4$WhOH-i&>e??0U^iY348|bD6u^>oHHzBmbh! ztxLi>yu)qoydbR0UGBXw*cSJB8{XTTj*Ncy3chFbiSAW-5*J*AX`+OT(sI~uX)`XB zgg(iYcBVq{NQpkxZdOj`5+_Nh9X<~8C=)S3ORER3L!s?MD+B1J@T0~VIit!rhqodN z;~da}Ea(IsAww|ShHr#%kycq=Y8L@~F#<=NNs@wFrFPbF%fSv3se6Pvh1_F(*bTwj5UDumR_?hy}0Y@;vOCm-V)| zsB*RYK_9gDER*F+1@i1jUQo1gTpeKie~|?e);tA;gjHtZ-NR^QX6SF zd7Wpg>xLO*G|8v`%iB+{kgGs?Cn`gp#On0+um}!-P{E{-!APVcR)Pl)mZaP3d%6W= z)b^5Kn)0!3mEWc?QOGP(dONP96gkj!sRe0+eb@rxvD8c!&-+xiVM-!XYRWFVZG>1D zcA%Bm8Pq2}rGHasc5926#H96(7#G(Mx_<*&&89zKpnyx~gi~Jg=O+`e1sIf%e5$bv z*lS=PaJzv!fV&O61$euGdw^d7d}C$rRlqxq^_zfSYv9)bztOkJeFjDK&aO-Pi`sDE+A;qHA?TWK^FsrDv`NI4dx)li+xg|?n2T+L3~ z2O>&^4EBMBtj%ixwT6Q!%=~732*)?;XzO%)b@E{mM=B|DZAMZ=%w$Clhfkqr_CYN# z=4}|PZQwh|jCmWmUHu5&GON}B^Zz9{bG}|m4<p!PQ6JM~A^I9N`zZrRi& z^Pa4A$vRDmGHZkqW$s$3+S*5@YO5A$pGXHoNMr|IFEi7Fx%Z*f72Kdba_#R=vnO#k zmhqnU!*Eh5tP!Ea!Y6M+r#nma>{TjBOWDGCtccRW4h2)YqFqd^N+5@3T;vmps*ty^ p!=hSiq5f3ES^N)>s3q-wwv6`YXtcxw9Vo{;;J8aW)OXyie*i2L5zPPq delta 181 zcmeC;zsVX`fw6nha!XA$G%XvSt|HjoAuAi==M l#aIO50o7?jSWtC9F$jwl$hyU0lbfGXnv-e=Qu`T*835h!8yf%s diff --git a/smart_service/add_ons/report/model_hit_report/model_hit_report.js b/smart_service/add_ons/report/model_hit_report/model_hit_report.js index a84d01c..7ec657c 100644 --- a/smart_service/add_ons/report/model_hit_report/model_hit_report.js +++ b/smart_service/add_ons/report/model_hit_report/model_hit_report.js @@ -19,18 +19,18 @@ frappe.query_reports["Model Hit Report"] = { default: frappe.datetime.year_end(), "reqd": 0 }, - { - "fieldname":"model", - "label": __("Model"), - "fieldtype": "Link", - "options" : "App Users", - "reqd": 0 - }, + // { + // "fieldname":"model", + // "label": __("Model"), + // "fieldtype": "Link", + // "options" : "Vehicle", + // "reqd": 0 + // }, { "fieldname":"variant", "label": __("Variant"), "fieldtype": "Link", - "options" : "App Device", + "options" : "Variant", "reqd": 0 } diff --git a/smart_service/add_ons/report/model_hit_report/model_hit_report.py b/smart_service/add_ons/report/model_hit_report/model_hit_report.py index c5ffcc2..778f5bf 100644 --- a/smart_service/add_ons/report/model_hit_report/model_hit_report.py +++ b/smart_service/add_ons/report/model_hit_report/model_hit_report.py @@ -6,7 +6,9 @@ from __future__ import unicode_literals import frappe from frappe.utils import cstr, cint, getdate from frappe import msgprint, _ +import datetime +current_db_name = frappe.conf.get("db_name") def execute(filters=None): columns, data = [], [] @@ -16,14 +18,14 @@ def execute(filters=None): def get_data(filters): - - if filters.get('model') and filters.get('variant'): - data = frappe.db.sql("""select dealer.zone,au.user_id,au.first_name,dealer.dealer_code,dealer.dealer_name,dealer.area,ad.os,ad.os_version, - al.device,ad.device_id,ad.app_current_version,al.type,al.date_time_stamp,al.creation,date(al.date_time_stamp) as date,time(al.date_time_stamp) as time,time(al.date_time_stamp) as last_time - from `tabApp Log` al,`tabApp Device` ad,`tabModel Hit` au,`tabApp Dealer` dealer - where - ad.name = %s and al.device = %s and au.name = %s and au.dealer = dealer.name and al.type = 'Installed' and - (al.modified between %s and %s)""",(filters.get('device'),filters.get('device'),filters.get('user'),filters.get('from_date'), filters.get('to_date')), as_dict=1) + variantfilter=filters['variant'] + + + if filters.get('variant'): + data = frappe.db.sql("""SELECT date(date) as date, device_id, module_id, vehicle_id, variant_id, system_id, sub_system_id, procedure_id, steps_id, count(*) as count + FROM {0}.`tabModel Usage` + GROUP BY user_id, device_id, vehicle_id, variant_id, variant_mapping_id, system_id, sub_system_id, procedure_id, steps_id;""".format(current_db_name), as_dict=1) + frappe.msgprint(str(filters)) if data: return data else: @@ -38,13 +40,14 @@ def get_columns(): {"label": _("Dealer Name"), "fieldname": "dealer_name", "fieldtype": "Data", "width": 100}, {"label": _("Dealer Location"), "fieldname": "area", "fieldtype": "Data", "width": 100}, {"label": _("Zone"), "fieldname": "zone", "fieldtype": "Data", "width": 100}, - {"label": _("Device"), "fieldname": "device_type", "fieldtype": "Data", "width": 100}, - {"label": _("Module"), "fieldname": "module", "fieldtype": "Data", "width": 150}, - {"label": _("Model"), "fieldname": "model", "fieldtype": "Data", "width": 100}, - {"label": _("Variant"), "fieldname": "variant", "fieldtype": "Data", "width": 100}, - {"label": _("System"), "fieldname": "system", "fieldtype": "Data", "width": 100}, - {"label": _("Procedure"), "fieldname": "procedure", "fieldtype": "Data", "width": 100}, - {"label": _("Steps"), "fieldname": "steps", "fieldtype": "Data", "width": 100}, + {"label": _("Device"), "fieldname": "device_id", "fieldtype": "Data", "width": 100}, + {"label": _("Module"), "fieldname": "module_id", "fieldtype": "Data", "width": 150}, + {"label": _("Model"), "fieldname": "vehicle_id", "fieldtype": "Data", "width": 100}, + {"label": _("Variant"), "fieldname": "variant_id", "fieldtype": "Data", "width": 100}, + {"label": _("System"), "fieldname": "system_id", "fieldtype": "Data", "width": 100}, + {"label": _("Sub System"), "fieldname": "sub_system_id", "fieldtype": "Data", "width": 100}, + {"label": _("Procedure"), "fieldname": "procedure_id", "fieldtype": "Data", "width": 100}, + {"label": _("Steps"), "fieldname": "steps_id", "fieldtype": "Data", "width": 100}, {"label": _("Count"), "fieldname": "count", "fieldtype": "Data", "width": 100} ] return columns \ No newline at end of file diff --git a/smart_service/apis/__pycache__/app_user_login.cpython-38.pyc b/smart_service/apis/__pycache__/app_user_login.cpython-38.pyc index 0bec772fc63f3c2e4c55ea1defb1c529b68fdd2b..c4b0209bf41c90d2343e93d94a1d3405b22a2466 100644 GIT binary patch delta 261 zcmaE&|4N@Xl$V!_0SNqeJWmYY$ScUmC^K1}@t9~x4ND4JHq!*gqD?i-DXb9I%7#1?tFr)|pp)i;Pu`r<^L}iN5_UdB!c9 z8<@W_irr$k#S&6fnp(wEUF(pVo0yrSmz0~ezO}iZb1NHAkE_5; zc~PJhx0o~YN{aYEEVktQ+}z9(P1zzzAh$?*@?QaYK_wtFinF*hskpMZBsI54WU{W{ zRYtMR%tE}39AZF8O}--S$r8c}jN+3mg=JL@L0VZrgdm6jTfteLky(6bSNpXQ3~W>Uf;}oq@Ele`UuwBkAJfd9zvgtvcD`) zeu1rKaB#$Nil~t!#TlUlcQ%V!tmK+D0#;no&YSD=lzMcn3tH|Tdvha5jf6Xzd5 zLJuam@n%K5%0#Xkm(Qb|Wg^DL*RK&sXbBy|R)4{9fohzfnrO7a724w3sw|GLqS^*Y zKn_4!ARSGX*3#zoW}uyFuqAxJop+>m0l|YktX%G1MeRnOK{VBu)h#o#aZhG-Wy| z@)J%+z2lL%JWZ5-b@TDv)4RuKVY!;8iCRSZWhugYj~?C+U)M*^G@IWk%Wx*vNi3d) zFBU?I&~SBY{JI|BI0GJCrXtAH(y&MUQ*o8Qm(b4frN+9^DkP3>w`Xf{#6|rss zepq+b@LU#|sRgBe?Rx0Tth)(rh2ygYljD%(JWPA^wtQ>(0&^QMTEqSzkPB`0aV;Ma zkfB#91kasVCu=dj;fH&xABZQho_LMDR7Ktl(t>f-IOmd;rDzDBHE^4r zn=|U)QRA4noKHqH=!a+-qE~wEBPlLhOXEqQ$|6^SI_oaRHW}1P62433Ofwqn4@O6^ z6z!EpI?06EdCgTccunmzO8Bm|o~B)#!Tb}+ui?`EeKK7XnV5F-MM|!t>p%9|wYkXS z#S{ioQ%hkZwclrg!8;6m`7LBld}&~s@4JqVvVx2Bi1+`qB;b>d2_S`P w?6}C!8|y-785rB}#Ujz7eX$0sWnl04#>99x0dkd!+vZIxlje0jk$^b(KdFLT_5c6? literal 0 HcmV?d00001 diff --git a/smart_service/apis/__pycache__/transaction_api.cpython-38.pyc b/smart_service/apis/__pycache__/transaction_api.cpython-38.pyc index 9d41f8698cec3625df2c216e32f3a2df37ced992..a36b6c91bca6ef5ee65fc85d2edf69bcc5fcc2eb 100644 GIT binary patch delta 353 zcmaFQI-89*l$V!_0SKBCjl?%|va*%q*4#tSQV38Kc-z85XcFWJqC2VQpb( zW{l!UVGL%_WP1tH;-|@Yi^C;9ximL5ujCecN>Y4YVs2_OBS;Pkn1M7a5IX~Lu?vtW zVaQ_4VoG6Lz+A&n!m^NQ;yh_NvlONprW6(%hC-PXHW;f0WDmPv)vk%xeVD5aYbTp9 zmNVX(yoOOioAnl3T2W#_LFz50l%!kC#f3RQf&8M}#FAV5$)!a_K-a`W9W(hJqZA|G z(-Ai0Bkyn<{V4}8S{Q{PS3@OYhEG-Ppj8Uv9jKK_=tS>>z z{4^PFak%6sm*%GCl_WEQgrI;KNV5R3GY}U$0f`cZEXFLR6vhS2H4Fcqr%K7#QnW+rCF zmZnB#rsiph7G}wlZ5hj@qIeUNOESw+?Zkf}SXc@912$GxHXgew&hUNAe9Xl>CN7hFopTdhvmah|Chz!@X2spilV)8M zPw7?LFm|Oj2Q}P&qeXo&JTBXW-U))cfPJOL>?OLzkv{lPf`zcl450=VvQJG3C>_j?epD3;?RlE9R&bukn)n7hN?d^e delta 261 zcmbO#cUG1+l$V!_0SLvfG zEjx#;R {} and publish_type= '{}' and vehicle_status = 'Active';''' + # .format(current_db_name,v,l_id,current_version,l_id),as_dict=True) + + publish_data = frappe.db.sql(''' select name,version from {}.tabPublish where vehicle= '{}' and language='{}' and version > {} and publish_type= '{}' and vehicle_status = 'Active'; + '''.format(current_db_name,vehi,l_id,current_version,publish_type),as_dict= True) + # for d in publish_data: + + publish_list.append(publish_data) + + + return publish_list + + + \ No newline at end of file diff --git a/smart_service/apis/update_validation.py b/smart_service/apis/update_validation.py index 64028ea..a4e7e71 100644 --- a/smart_service/apis/update_validation.py +++ b/smart_service/apis/update_validation.py @@ -74,14 +74,15 @@ def check_vehicle_update(vehicle_list): if publish_type[0][0] == 'Internal': data = frappe.db.sql('''SELECT name,CAST(version AS DECIMAL(10,2)) as version,language FROM {}.tabPublish where vehicle='{}' and language='{}' and publish_status='Published' and publish_type='{}' and vehicle_status='Active' and version > '{}' order by version ASC;'''.format(current_db_name,vehi, l_id, publish_type[0][0], current_version), as_dict=True) + else: data = frappe.db.sql('''SELECT name,version,language FROM {}.tabPublish where vehicle='{}' and language='{}' and publish_status='Published' and publish_type='{}' and vehicle_status='Active' and version > '{}' order by version ASC;'''.format(current_db_name,vehi, l_id, publish_type[0][0], current_version), as_dict=True) list1 = [] dict1 = {} - base_url = '/home/frappe_srv_01/frappe-bench/sites/ss.hnsonline.com/public' + base_url = '/home/frappe_srv_01/frappe-bench/sites/ss.hnsonline.com/public' for d in data: ver = str(d['version']) file_name = 'files/json_files/'+vehi + "-" + \ @@ -95,8 +96,8 @@ def check_vehicle_update(vehicle_list): f_name = "/files/json_files/temp/%s-%s_%s.json" % ( iid, vehi, l_id) - # with open(base_url+f_name, 'w') as outfile: - # outfile.write(json.dumps(dict1)) + with open(base_url+f_name, 'w') as outfile: + outfile.write(json.dumps(dict1)) # res = {} # res['Name'] = '%s-%s_%s' % (iid, vehi, l_id) diff --git a/smart_service/mahindra_smart_service/report/_drive_translation/__pycache__/_drive_translation.cpython-38.pyc b/smart_service/mahindra_smart_service/report/_drive_translation/__pycache__/_drive_translation.cpython-38.pyc index 4c88ff8e304cf58022316261f4f2b669c34d5d0c..6c1ccb706ce114c3cebde0ce10c9683193bacefa 100644 GIT binary patch delta 817 zcmZ8fO-~a+7@m*a*^hQ9*iu?8W)(S92^uac5+u0IHDRg$L3E9d) zq6hWROyWrsdeFqgqd$O?2Y#+l6X&il?Y@67wm{7S!1TkDo(0@02> ze|Nw1tWj9&UAZ;kp)KRkq-q~l6EsN))ec}aNp)%*fT~4JnhRU-w~(m*Ly}q)6)PGBq?sCy)(^d0hrhn_QK&Suy-~0s^oFw-AK^&H{=keuKJz zDqR?Y5_oj6i>MkRO7bAUC$=GYT^zy?Uk6>-E(op?bL}o)N9WJYQ$17yeA+{i_@p-y zJVb^3!?n4Ex!H={bX%KFeTRB>d3AZw9{2eXT7i@g;YlQ%6Msn+nS94HV)z9C z0A;WOb(n=Fk~RZPjMBNEN_G%2lfTqPA>$vkn-hT|v=$F5v_>HkI-iw_9;yKeF*Wnx zIi!gZ(1#GT%be(?;i?)}zh_RD+`zp$JvDW0ugx7jmg)%IU>N2bPgAEFmjl zL_kDjc`eGYaEc0(AAk)=$Vtdc_^&WS#5VY{ksHq-9p=PfGE{_1#Z+WEPNNfanCCbQ z$;}!5+PGYal=@Dq5#dcQh>wkbUo26)_n#x;!=!+bKC`_;J5BF45uPval#G=dL`i58 Ged#w%Ua)2W delta 924 zcmZuwTTc@~6rRiO?4>Oh%cU5IYxIF?0;WolOHiRDN)S}g2MjI?(^W|+Fk6TrTQPw* z<3pXqHxrHe;1BT6tV#cX@!ba#JyVq!*_oVgX1;TFX3lqJ-(UcW~k=jwD0WoryWUWbVhFXYyB0rJd{>KZY+0xXaQ}L>g+_gU^`1)Ts9Q#n<+ps>hkLOoNFQqZNKTfu+nsb}hf1z7+DNfB%# z=sy`GnkFXBf(aFs!*jW0WV^1vQ`(S%Dzq$gDpmkl6*&W(TN3CB;qNv7|E}5XixD?;YHP=Exv)lXGh09nkoCc(0YlRhX>QRAQu59cTi!H6zZ=9gdq1D><56%s zcB?gC`@7XjWpAwFC%eqqPkdeh^Bucf>1a9-#mA=H|sbX77++!DF+HJLH`kq!wNXC3h|3Gfzw}c CnNeQ= delta 295 zcmcaAv`C0Il$V!_0SF2Tmn2@<$lJxn$UJ!ln^rvwP>c6k zB$g!VTNxP{R5eUq!mcM2pJHZWW^8F{WM*ofmS|y?tT%Zrlfz^&4rLX#B6gsIi-bXh z2#62`61UhA3kp*6Qi_;?98H$VjT{>CaX@CV1dw20Vqs)rv?j1o+f KPjPfH`T_tC!#rL9 diff --git a/smart_service/mahindra_smart_service/report/_procedure_report/__pycache__/_procedure_report.cpython-38.pyc b/smart_service/mahindra_smart_service/report/_procedure_report/__pycache__/_procedure_report.cpython-38.pyc index b363c37707bd53ec7ac2b9a5058e08668cff03c5..8fc7e5954b6ae56589ff1d5c6faad05f18041b96 100644 GIT binary patch delta 1208 zcmZvcOHUI~6vyYZ)9G{C(oT6)kOCGMDh5P_h$Ik6Onec-!vv#b>=YIFG>Wr%T zB)sA;zZ>7)sBaYz@Ai}t2MGSxvj#C<@LtCGNACxy=az2_`QBH#aSR_}%?P0s43^1R z>^OM_2#tg$#4fNd9CVLxuNsAM!!p>}0|7$a_m33{nViY``BVQ1=;W{bUC6KgN8y@I z^~nLA4YVyBavq_~hDqlF;T)~N%?1w$vmv_eM+k>$u=8~1uOUFQZvH2bf^OcdK3O>^ zD3r0Zm0i#19(M4LqiVnslq^oLSK_U%q>mh@2(@Ze*VN0y!35~MKbQi2Go}1Re-N7+CveXr%27I&|g8T~ssj z+o8C!KYb8tg$}+IYC(PqJr2;(vY4Gg@N3}&c1bRrY)PW$Ia)D@kU++t2b$3|U`hTu zyyzoUyHtX=)oJljywzpl!d)5tbKU~Wtj`)Nr3~xk6LpQy!kQ;RqL)26Z2zCy; z+w7C3v(p{yDh>kf9%dQ;& zX)RZl%FaQlB9)~nNpHN)j`Qj0*dVQ5C{vbUm5TO$ewygfU2F;mHcgnJ5O=;{W%Icr znP>u&S@H!ssg@Lg^Btw|#zJc+Q_L6|Ma0JP8Sz z$e@>h*1BMv|I$v&%>n#iw8n-mkxo@nrJ0LBMQ8PdPC_?9Cs50>4gz%(>mj5FlYA>S F`47G!^>hFL delta 1144 zcmZvb&rcIU6vubA?b6@fwp)QhLn}YZQYHLsOOV70#)twT_#@e%xak(CwxvwB98BxM zL}H9yn1dIia?_K)5@VtV{seC(d+_c_6Hi`@?`=tA3A=fpnRz?&eQ(~(?w|UZ@LctH zoE$vS;w$yVJI{N8C?5`l8J;NYuYH?Htn8SF{%6N05@NbD1N`W$Uk}3)+66F#vPyF$ zokq|zf@nu{0A3T?4~=X$+KOsvhl5aXCZ8=YtgOeb+T3@~_2r70Y_ns8%pfc}I~8nPqKGFo=3|BTHW z#SJG$HA|(im|qH?fuU?QY_KbJRB@DPZs(d>sOIPpTk?01LAL3S0C)XMalBNNAWRMO zwwWi5XD9RYJTwNm!=he^i2;eotUoYK{7em;?U{#fS+M3~gPsFy7Oe7^9Rx02ylv3} zT2Pao@O84m)%hBk<8GX+TWS_9)X6odd9)MHEOl#*e`&2*_X**)S8H62PjPjw#;tI2 z`y!37^s`?QD zL=a*AmNtrizT(POEBaP(4Mhwq5-R^&ij#A!D>TMOM7A7CUoZtsDGv%@@u+|ZA^H#l Vh&UpOh#`6rg9sTh&%TD1{{b4#+F1Yq diff --git a/smart_service/mahindra_smart_service/report/_sub_systems_translation/__pycache__/_sub_systems_translation.cpython-38.pyc b/smart_service/mahindra_smart_service/report/_sub_systems_translation/__pycache__/_sub_systems_translation.cpython-38.pyc index 0da2b2a93ec20604cc3611f9e38c4a742a24b3cb..9d0080b243a32aa652ce98b6133a81add2fda071 100644 GIT binary patch delta 871 zcmZ8f%WD%s7@yZZn{8Sf)23Qk#R{hdWUts6a)Dt)*-KoeA@+BRHHP@NjvVA-N39T0qwq9Vvz-N)CANTU^}S#G%9 zcUv&Y3-HC3C4zdo3=K_jRmg^gT$K-dM`~3;vx2;50(`Iz*Aaz1?2|sEh~lRx1eAm@ z0N262V@IT31A=dCulr#x0qkZ z&z9_Zxw+<4Thz4+x0i0(oshprw;<&cIEN-ZzN6SYz~>H}zyK88x?A;a(=a;IVUEAW zIT8!s@abLQ5V<(rITH$l0&6vFsa*BTm14VM7w>z%+wfMU_d>oEJ_Rhk{sXj zKFWWR5|)pvN-pL*%K5?0+5Hju59L9udZ=b&{#u>e?{D&}+Q^g=sWn#K*l;66D-rfK z>*Ars8f8C9R@;oZP2c%DC{DGRSvez?{0Bo)lG`vM$g>3il*R<=Fbz#4c?z1C3?m@! zcaj=H%;cZ73F!0R+NE5N_+nw?l8C9H0Evl>%h~i)UkflbGvE=V1EZi1A=sSbEBXp# z{Efa_@-Lkhb*71wEG6NfgtUZF31b2xRhHJIObi8N2}?-DpoENsaS8twWAInT;mI`8 z;g}$12$L*a%qAn#acXV9&0NP}NIItYSL0+UBGp#27U4D5k5k4w8@D9(-4{MiBpVj# aGmRE)*WD{}l|A{NMBJ$%lt8AcFZ=<3Eyp$h delta 954 zcmZ`%TTc@~6rRiO?5)McR$2_kC5o|L&?pp%#7hypM9_fxfWb}ev>H+hoo!#tu9(QH ziFKZ9)Zj1iKlrfn<};7J_@ZYD8l&sXo^K}KIeTt%I@!2R`$3aQSUE1fSJxKBRBA2JU79+=7rwqY|YT3Tn`CngJ>6PWB^4p#37wP5pL#XKnimu zZiZTjdpfr3D`b1VjL?9btodh87iVtIOyBeB<;D}gvc{|4?82Qn&*#Ol;`zz(bH(wA zTKPh;BDcw19LUpjwEtgSS@&c_$NIVyp~Y&wT4{NKB~_(%PDg0o|+kiagm8wqTe zUEWV)Rukp*^=eG`%1V~m<5>6nl3 z3%Oz@HEEk%mD}c#4JHimE;0(T3Jw6oOx4xk0-hNaG@*uAq!kP($SL@%L^a|*NRS6W zP#D2Bg8hR*u`V%j9z-as0-i6VV%zs??N-|nRo@o`Xpxc9I#Cj?x~qoujQ8-FCh=fAz{P`qf`5P)@!-j1Z=O6E68{3{Enw7ndB5Mx+xO<}{AS)~Klf)IrPCHt z6HM`Ku6!BW`^6gQVY$WzAt{vdzBu{aj8@qTp#Z8{rMayY!@ucDmCkv>Y?!CO5 zhz!2wv}-N5_h|>)at6QMNvT~u6ZXcIG98OEYF>xH>42}0Hl^Hqr@%)Wc!O~4(;VW2 z(>)R*&O#iZDq6h|60QY=>jmV~V{WLtkOnxQ<0!aNBXe*&hEjqqMcMs!s?6m3}{6!1HI8_fsXX?i!9O`qPDf=Mue|L z)ax`OyWSPTZTrrNn)0SmSxqZpg#8ElUvpN_V z3r{@XZF$?)M78GEu1;JZ8{6*4Ju^P}p~>eBVW=h|3ornX0~k~g>2T;a7gR0EOu!2e z8Gt-M0pP#mCRFUP3={d0EHQCjxqwg^&z0@Sa-2rj?+Vv(1cBnL{Fu137_s_hyAjcK q*N@xA&o7oEuKlY;+ze!m%t~vMcbo1V5XggnO2vBikrcLcbM80T0jt9R delta 902 zcmZuvO-~a+7@m*a*^id8*xDAwqz6n`j7kKGAQ35GJOCzw9;#-u^0sPI3e1*6o2?k> z#e;`BH$5PU@#YWkH+V35Tz`ZA!I`SW=+5SSX6D&v-rafL_jCF~CUtjUz(#VsfdOV0m2I%VmU9Bg26B_V*Ef3K4{%D{$8Qc2@_b;bEZCM0 z!`zYUEk*np>a8wgNk-6>&_p#{BY=SbeMLG5v@H%|&O^#gX9$Uj1p%j8Hoell0Qi|I!7$AP(siX;JZs9>)kCXlG;C zmNpv09%+pjc2JN1@M4Vih5jstCCrUsFS1)P?2$Gq-m>&58nG((cXulhfkzPy_Uhs* zn_o!ED)H0_462nSVMs3v)J+P_lvlPl9AbAEdV_Uo1FOzr|@YqIZ}Lu_WQ F{{$>_!kGX7 diff --git a/smart_service/mahindra_smart_service/report/_systems_translation/_systems_translation.py b/smart_service/mahindra_smart_service/report/_systems_translation/_systems_translation.py index 1ddcd5e..6313f9e 100644 --- a/smart_service/mahindra_smart_service/report/_systems_translation/_systems_translation.py +++ b/smart_service/mahindra_smart_service/report/_systems_translation/_systems_translation.py @@ -17,7 +17,7 @@ def execute(filters=None): def get_data(): - custom_lang = frappe.db.sql("""SELECT lang_code FROM %s.`tabCustom Languages` where lang_code <> "en" order by lang_name""",as_list=True) + custom_lang = frappe.db.sql("""SELECT lang_code FROM %s.`tabCustom Languages` where lang_code <> "en" order by lang_name"""%(current_db_name),as_list=True) queryAppendLang = "" @@ -50,7 +50,7 @@ def get_data(): , tanLang.language_code as languageCode FROM %s.tabLanguage as tanLang) as tabLang ON %s.tabTranslation.language = tabLang.languageCode) as tabTranslation - ON %s.`tabSystems`.system_name = tabTranslation.sourceText;""" % (sel,current_db_name,current_db_name,current_db_name,current_db_name,current_db_name ,queryAppendLang,current_db_name,current_db_name,current_db_name,) + ON %s.`tabSystems`.system_name = tabTranslation.sourceText;""" % (sel,current_db_name,current_db_name,current_db_name,current_db_name,current_db_name ,queryAppendLang,current_db_name,current_db_name,current_db_name,current_db_name) data = frappe.db.sql(actualQuery,as_list=True) diff --git a/smart_service/mahindra_smart_service/report/_transmission_translation/__pycache__/_transmission_translation.cpython-38.pyc b/smart_service/mahindra_smart_service/report/_transmission_translation/__pycache__/_transmission_translation.cpython-38.pyc index e5888628ad9591278dcea5ed1b9cfb49e0eef9a0..bdbe472a9e8852a102dda46820d4fc01166e43df 100644 GIT binary patch delta 839 zcmZ8fO=uHA6rP{`&u?i=n;JE0d)Qiv)`M7oP-;Uh{ZSi11G?R0Hl-!mG_#w7vS|+% z4}ymEd4Ku6^-_{01)w(SGXBlFX6gnd`cp)GJ8*l>=7~(u2h~Vd_2Z+*x5x4;!oa!N> zMu=zy5aI*d5OF;m!3bXfJ=iI-d&oXIM~p}b@gIpqwF7A+*fUft++Uepn4PJVny$a* z)Z4@>mG3Msmc|0Mk8VN2PT)x-4i9k!X4xD3YIH1^Tn*h?g}Q#wS`UKtw!d1kOmktj zTq(^j-&~TpFO^Z5HK30(tj@;;)WbR@_CY-S(WX|^<5ns?fqGz0pT^9t7*)ZN_l zI3hKUgHDrY>Rn1bKXeXhv<;r9cZ0Cqa%AJ2ZR*DtdBUxSUAK9=>(NIvB^acczmSzX z`IM6PpeO*K99EzK^Uy-l=Aebq;P5vkpGDMSpY>yqvY-0JiBJ*zi>DR*qX-G^MV5wEO5fn>MrC+>Gg!AK7(|Ki9?$NKUzNxz#4! Vrgv2nr$F|ZjLFQxB(yYR={GA4yZ!(G delta 982 zcmZ`&O-~a+7@nEko&9L3#UdYu=*B?eYSL(hBKQ$0LX<#JshU*GvUFO6^aEzMF_NvA z$dyB#7_XWTuipFtdhzaU`3rb7dNR%|XjIlo-e=yO_ha5X`^@*$=dQ%vjt&Fx_2co5 z^R>5~=!f^(XD^u~Mihd#U{NP3(Y8R*AUZMl9wTTTSn>9YYwg`lm|zd!`-LR0FNr3< zmc|{0+XOdvi-QMN;VL4KAR=v}79es9`rtZvXtoehd_-^`*vAU$1}({lzBB?_aJ`qg z$ePU&&6j-`#_)bGA0PBmeU%TS=QkeBPtHtE6wInqU$#pPQZ}dV%*~oM$qr>Nj1FhA z!y^^vVz$Kg&@Je)D^j}iaLiFmwk-|8SL}oIE_W!NUi6%$0(I(cZN+t08udlf(Dj+g zse(B@cQYSx*-Lrg=;1ajEuUn&av@@Z^Gftw;}N+#%F~F`0c=H_&fy#XAH-lEaq5&5 z;0krt*2)1QOM&FBS1m1wm71>CsM&(nBGc6qo5h$@@|sTdcC$>M&^Z6SH1Qjb2v6tG z$<6KO08mnrp$5C4fev;FrSKQIJBh-~zoaAc0?aLxPMtf;papy`AOfFr`Sbvfy;TQK z6OHIxNXSQAM8}0-Udx{1OT_2{JTKM*-arV}bL^XH!)NTi7DehF8fTxhp{Y;LEw-mAx=Kj$xY%JIfw9B;yX;#Zu1y8QvKOWMX JLBb5QcB|;J&yM6yz%*p`k#D8cQ_BL}F=76blkP5B4w`Ib}H-1F;aTv>@AA z!A~$&{s9YrfW>t-_Qux29b$}eH~Z}FyP0`s_BQ?$x2l$9NMbxaygPJg<)A*CUn#ld zL?0P6Jce3?npC0c0BR=Hs6LQt7By%@>{FENNJVRSv#tj!t=pc{a)-~C5apY2A2&tP zj)tkh5K{p*{rCwlp^POY7X3vGPgueXe^m-#@Gm6?J)TuJN`5FQq1PShlOCx^``NzS zgHhO5dNMUL(iKoEC5-{3_BOv(tEoWUbJ(%t`4>jH;`q*Dd3ky1qRl_l1ybnnC5;}a zOhv;4Viu7U2%?QHW3K1hKWzkxbAIl6l*!_?7-HBAn?j@zX~e%4bfF#cH!WL85Dn5| zF_en1Rg4CPZ8y7qm$|mh2nHv3UZ2|yLX9)88OTSj&+;fwBk(gOv41QkX82Wsw%R(Q X-BWi>5w{N3WP%0>h!GPEMceuY-4kS6 delta 424 zcmdlf+#}2z%FD~e00dXgEKM|-$ScbjHc{JJA%#1IHHEE(F^V&VJ%yu%A&M)7GldIC zbEhx`GidTmoa8X^c0D8ClO!rVaZ#T+0*7`cFujj>2zGY8Wt7D*nUP!S)T;0Lid zfrQ}X*KDecoRbCFWf?0b>$5v+q;REh_cGNo)iAj*#7fmN*Dx+%DPgT)PT`ScXl6{| z6=zt;$jDIWGkG3+sCX26SYlCTVqQrVmz7ImNus`$k&!`F!(=WFJ;C@CGZQmoOH(5= zQ}eV$3$x_ORvan5Y(?xKyM;l72#62`61UhA3kp*6Qi_;?98H!YkT;5WL4+8H5C;)x zjt6-%e)1mT@GWu!q+~SIlPb)1cElQ1#FJb~|7M^U)spV880Aho@ q4OWX}B-n6JpxolH$<0qG%}KRm1M-SN!N$YL!6?Egz{JJI;RgWLv{8=$ diff --git a/smart_service/mahindra_smart_service/report/_vehicle_segment_translation/__pycache__/_vehicle_segment_translation.cpython-38.pyc b/smart_service/mahindra_smart_service/report/_vehicle_segment_translation/__pycache__/_vehicle_segment_translation.cpython-38.pyc index 320cfbd87637a5da85a126656544745d30a9e1e3..6ddb83af258ca6388e8a51001b85d8b5d7d5c093 100644 GIT binary patch delta 850 zcmZ8fK~EDw6rMM;-R^F?ElMe^f;L7DtAr3@Vnkyk2;qPjEFNrP*0!@HlG4)I-GgKc z2Z=Wmo4I0ytNsF`@#x))iF@S-h*0}8{FI@HJe*Jqd3QDl{og`#T_$F^M>20 zZ+e5zyO5WQ@OC$=HuVkM8Z6ay5NFi9iNa~auNXG3hQF^MARDkjIRvaoIOXgm?Gvu` zAtHCl<4b+YQxWBQnFQ>ZTPm*4B8b>^(udxdiq(?XN?$&u7tSwnBhmtP+9S2`ac^bh zD>_zwR9#qJm|v^3>z#GC+2vkk@xlFjl?h)~%sDy2^1$T;o1#kikgCW%b`7TFd-e&1 zBW*;!)^a%gs9io*wvnRLNx~eiY<&l5Uw4qc>PtvR+O%}j!@F9nw?utw%Zn**#LVxt z<9ss|!s`U?iJ^`WXPTiObT?hRWi8(eJ@IT#<#hP65@O&n^i;0bjzQEi^=1&(+p8EP zY-Op)|Air(VX@Du;g1n=kq}y78W>Oniy{}mVsyClQ!5TpVaea=aS(FcxG@=Msv@fV zsvvnVD%P zEz)?M0>TJF5n)t8tfM0xE|^+4n!pz#atI}aGQxj9Wh(87{9=|S3e zYcJDH48iU0=?gg)V>&aoVZ~x5quXf3W)`#M7-M(|Iq~lE%iS*>=o5F~O(!O|`&1nQ zw(JJ*q@0(O;!jgnUCN9Ue_KKmt-%^*z%V1va2qkL4FS4>?&jK<=>cZO0Q!X$oI!08 zKtLu@8yZ>3)b^OB4b2*pg z$Mff=CdTp;lNIlLz9e?(baL5&(DZz_`oM37Xww%nWVC-jwWH^RAmi{(d?p_w>`%1g z5!$!fiG%yj8WjcYr1)ysg6P*HHZADU515YNe$uxhv_->-(AJD=|9{NTF%lXT?rm(8 zL(En~;y0=e4P&L2-(0V`DwLr(V-C-SF|X8YdDX>MnLp%lnM~fd2M5&5lF%>3AC!P_ zl4w974L1Hg5}Y!=X_+MEmUv+fL0!Bzr$!iMmMjGvU|9x7RLWmzO+6sY9zc(Q#SWt# z0MsaoqjVJ>i7grxq+Pn$39Vk<>t3zAsTT@kV`m+MoAM<*r68@~kc7}s&ejy*Tx_e_hkNP(?AM7i;URRV`mK8+zxvuoYx*cuz%+`7D)D4uj6@|!!vWC<9&BP>+U_e!Ero7h4<@f- zBH`wtZoHWY7Z1h@@gNtj{t@rs(VPE(7n~_zj60d{+nLPn&V2jM|CaZjdY;R0!PlR) z-$QQ(>ci`I=0e^|?Yq)EfNEN1q$TZLsAi-iQ@gC{Nmr(k$0T24WpB85Kb6?B9&~D( z;qdzoWOW6;)Gy$r4Z8V!Ik?H7FQWH8AVjPMEiNGv1tz%^Z~1^pV*oLGz@A?oaB0R| zT16I#Q*L72K*SJ>TWkQ`X}!wJQ_IqcjYynZjJKUyGp%3q>Eg4srIn?{^-{am*$5h2 zGAvb|JbGBV+S5nQf;L4Kq#hSHI3`}0B^`;I{0G;c#e2#;Hl~PTW0vU9Xc5hsXVnW7 z9hzkFu;KVxSZGrSMdDgFQbs-%GDq38BqGzzC9Nis3m?AYRO}cI$k8j z_RYwOg>;MT4aoEaI{;waioWDjp{rjyqj`=TxnnCE-%>uoI6;A60wJ+zjE+YpP7+rImm!(IjesF DA0nTh delta 826 zcmZva&ubGw6vyYs?(FO)soN%|ttPOC3S9*S)20m;wW$pvTE*5LqO!!iByCB5WH-6U zMuq0;AsxIcc+`^z5mE5pSpNnup1kQy{DJ5WywAM(?wdC|@6FrvQ6_aKm9mf=Tb-A+ zkHb_RZw}8~a3BFXumP@`U;rPWss$!ka!vqQM{aU>bb0vsF&-0l@vD2b++J5Xeh)4k zUD}GYU?9;&J9vix1_Jac=_AnkI7C;_eWy=A4+*eo^pj1JMSU9LkS?G;?o5eo;+kdP zp%&sM5wA&Zc58k0`s&Jt)2{8cy!t*goXYK+HyjU&bHzew{(NzMp;=oj)}rhKVucABv8G=;IA}x!9z-MbFHg~6s&1