Translation reports order by desc for drive, fuel, system,subsystem,transmission,variant,vehicle,vehicle segment

smart_service/masters/report/drive_translation/drive_translation.py

@@ -47,7 +47,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.`tabDrive`.drive = 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)
+		ON %s.`tabDrive`.drive = tabTranslation.sourceText ORDER BY `tabDrive`.modified DESC;""" % (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)
 	

smart_service/masters/report/fuel_translation/fuel_translation.py

@@ -46,7 +46,7 @@ def get_data():
 		, tanLang.language_code as languageCode 
 		FROM tabLanguage as tanLang) as tabLang
 		ON tabTranslation.language = tabLang.languageCode) as tabTranslation
-		ON `tabFuel`.fuel = tabTranslation.sourceText;""" % (sel ,queryAppendLang)
+		ON `tabFuel`.fuel = tabTranslation.sourceText ORDER BY `tabFuel`.modified DESC;""" % (sel ,queryAppendLang)
 
 
 	data = frappe.db.sql(actualQuery,as_list=True)

smart_service/masters/report/sub_systems_translation/sub_systems_translation.py

@@ -48,7 +48,7 @@ def get_data():
 		, tanLang.language_code as languageCode 
 		FROM {0}.tabLanguage as tanLang) as tabLang
 		ON {0}.tabTranslation.language = tabLang.languageCode) as tabTranslation
-		ON {0}.`tabSub Systems`.sub_system_name = tabTranslation.sourceText;""" .format(current_db_name,sel ,queryAppendLang)
+		ON {0}.`tabSub Systems`.sub_system_name = tabTranslation.sourceText ORDER BY `tabSub Systems`.modified DESC;""" .format(current_db_name,sel ,queryAppendLang)
 
 
 	data = frappe.db.sql(actualQuery,as_list=True)

smart_service/masters/report/systems_translation/systems_translation.py

@@ -47,7 +47,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,current_db_name)
+		ON %s.`tabSystems`.system_name = tabTranslation.sourceText ORDER BY `tabSystems`.modified DESC;""" % (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)
 	

smart_service/masters/report/transmission_translation/transmission_translation.py

@@ -45,7 +45,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.`tabTransmission`.transmission = 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)
+		ON %s.`tabTransmission`.transmission = tabTranslation.sourceText ORDER BY `tabTransmission`.modified DESC;""" % (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)

smart_service/masters/report/variant_translation/variant_translation.py

@@ -47,7 +47,7 @@ def get_data():
 		, tanLang.language_code as languageCode 
 		FROM tabLanguage as tanLang) as tabLang
 		ON tabTranslation.language = tabLang.languageCode) as tabTranslation
-		ON `tabVariant`.variant = tabTranslation.sourceText;""" % (sel ,queryAppendLang)
+		ON `tabVariant`.variant = tabTranslation.sourceText ORDER BY `tabVariant`.modified DESC;""" % (sel ,queryAppendLang)
 
 	data = frappe.db.sql(actualQuery,as_list=True)
 	return data
@@ -57,7 +57,7 @@ def get_columns():
 
 	columns = []
 	columns += [
-		_("<b>Modified On</b>") + ":Data/:240", _("<b>Status</b>") + ":Data/:100", _("<b>Vehicle</b>") + ":Data/:200",_("<b>Variant</b>") + ":Data/:220",
+		_("<b>Modified On</b>") + ":Datetime/:240", _("<b>Status</b>") + ":Data/:100", _("<b>Vehicle</b>") + ":Data/:200",_("<b>Variant</b>") + ":Data/:220",
 	]
 	lang = []
 	custom_lang = frappe.db.sql("""SELECT lang_code,lang_name,active_status FROM %s.`tabCustom Languages` where lang_code <> "en" order by lang_name"""%(current_db_name),as_dict=1)

smart_service/masters/report/vehicle_segment_translation/vehicle_segment_translation.py

@@ -16,45 +16,48 @@ def execute(filters=None):
 	return columns, data
 
 def get_data():
+	try:
+		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)
+		
 
-	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 = ""
-	 
+		for d in custom_lang:
-
+			q = ", (CASE WHEN tabLang.languageCode = '%s' THEN %s.tabTranslation.translated_text ELSE null END) as %s" %(d[0],current_db_name,d[0])
-	queryAppendLang = ""
+			queryAppendLang += q
-	for d in custom_lang:
-		q = ", (CASE WHEN tabLang.languageCode = '%s' THEN %s.tabTranslation.translated_text ELSE null END) as %s" %(d[0],current_db_name,d[0])
-		queryAppendLang += q
 
-	sel = ""
+		sel = ""
-	for d in custom_lang:
+		for d in custom_lang:
-		r = ",tabTranslation.%s as %s"%(d[0],d[0])
+			r = ",tabTranslation.%s as %s"%(d[0],d[0])
-		sel+= r
+			sel+= r
 
-	
-	actualQuery = """Select 
-		`tabVehicle Segment`.modified as "Modified On",
-		`tabVehicle Segment`.active_status as "Status", 
-		`tabVehicle Segment`.vehicle_segment as 'Vehicle Segment'
-		
 		
-		%s
+		actualQuery = """Select 
-		From %s.`tabVehicle Segment` 
+			`tabVehicle Segment`.modified as "Modified On",
-		LEFT JOIN %s.`tabTranslation` as tabTrans 
+			`tabVehicle Segment`.active_status as "Status", 
-		ON %s.`tabVehicle Segment`.vehicle_segment = tabTrans.source_text
+			`tabVehicle Segment`.vehicle_segment as 'Vehicle Segment'
-		LEFT JOIN (Select  tabLang.languageCode as languageCode
+			
-		,%s.tabTranslation.source_text as sourceText
+			
-		, %s.tabTranslation.translated_text as translated_text 
+			%s
-		%s 
+			From %s.`tabVehicle Segment` 
-		From %s.tabTranslation
+			LEFT JOIN %s.`tabTranslation` as tabTrans 
-		INNER JOIN (SELECT tanLang.language_name as language_name
+			ON %s.`tabVehicle Segment`.vehicle_segment = tabTrans.source_text
-		, tanLang.language_code as languageCode 
+			LEFT JOIN (Select  tabLang.languageCode as languageCode
-		FROM %s.tabLanguage as tanLang) as tabLang
+			,%s.tabTranslation.source_text as sourceText
-		ON %s.tabTranslation.language = tabLang.languageCode) as tabTranslation
+			, %s.tabTranslation.translated_text as translated_text 
-		ON %s.`tabVehicle Segment`.vehicle_segment = 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)
+			%s 
+			From %s.tabTranslation
+			INNER JOIN (SELECT tanLang.language_name as language_name
+			, tanLang.language_code as languageCode 
+			FROM %s.tabLanguage as tanLang) as tabLang
+			ON %s.tabTranslation.language = tabLang.languageCode) as tabTranslation
+			ON %s.`tabVehicle Segment`.vehicle_segment = tabTranslation.sourceText ORDER BY `tabVehicle Segment`.modified DESC;""" % (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)	
+		data = frappe.db.sql(actualQuery,as_list=True)	
-	return data
+		return data
+	except Exception as e:
+		frappe.throw(str(frappe.get_traceback()))
+		
 
 
 def get_columns():

smart_service/masters/report/vehicle_translation/vehicle_translation.py

@@ -45,7 +45,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.`tabVehicle`.vehicle = 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)
+		ON %s.`tabVehicle`.vehicle = tabTranslation.sourceText ORDER BY `tabVehicle`.modified DESC;""" % (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)