Merge 6f6cff3 into 8cb5acd

Monogramm · Jan 14, 2020 · 0ab4053 · 0ab4053
2 parents 8cb5acd + 6f6cff3
commit 0ab4053
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/erpnext_ocr/erpnext_ocr/doctype/ocr_language/ocr_language.py b/erpnext_ocr/erpnext_ocr/doctype/ocr_language/ocr_language.py
@@ -25,6 +25,15 @@ def lang_available(lang):
     if len(lang) == 2:
         return frappe.get_doc("OCR Language", {"lang": lang}).name in tesserocr.get_languages()[1]
 
+@frappe.whitelist()
+def get_current_language(user):
+    settings = frappe.get_doc("User", user)
+    if not settings.language:
+        settings = frappe.get_doc("System Settings")
+    lang_code = frappe.get_doc("OCR Language", {"lang": settings.language}).name
+    return lang_code if lang_code is not None else "eng"
+
+
 class OCRLanguage(Document):
     def __init__(self, *args, **kwargs):
         super(OCRLanguage, self).__init__(*args, **kwargs)

diff --git a/erpnext_ocr/erpnext_ocr/doctype/ocr_language/test_ocr_language.py b/erpnext_ocr/erpnext_ocr/doctype/ocr_language/test_ocr_language.py
@@ -7,10 +7,30 @@
 import frappe
 import unittest
 
-from erpnext_ocr.erpnext_ocr.doctype.ocr_language.ocr_language import lang_available, check_language
+from erpnext_ocr.erpnext_ocr.doctype.ocr_language.ocr_language import lang_available, check_language, \
+    get_current_language
+
+
+def delete_test_data():
+    if frappe.db.exists("User", "test_user@example.com"):
+        #test_user = frappe.get_doc('User', "test_user@example.com")
+        #test_user.remove_roles("System Manager")
+        #test_user.delete()
+        frappe.db.sql("""delete from `tabUser` where email='test_user@example.com'""") # ValidationError without SQL
 
 
 class TestOCRLanguage(unittest.TestCase):
+    def setUp(self):
+        test_user = frappe.new_doc("User")
+        test_user.name = 'test_user'
+        test_user.first_name = 'test_user'
+        test_user.email = 'test_user@example.com'
+        test_user.language = "en"
+        test_user.insert(ignore_permissions=True)
+
+    def tearDown(self):
+        delete_test_data()
+
     def test_en_lang_available(self):
         self.assertTrue(lang_available("en"))
 
@@ -40,3 +60,6 @@ def test_equ_check_language(self):
 
     def test_666_check_language(self):
         self.assertEqual(check_language("666"), frappe._("No"))
+
+    def test_get_current_language(self):
+        self.assertEqual("eng", get_current_language("test_user@example.com"))
diff --git a/erpnext_ocr/erpnext_ocr/doctype/ocr_read/ocr_read.js b/erpnext_ocr/erpnext_ocr/doctype/ocr_read/ocr_read.js
@@ -1,6 +1,14 @@
 frappe.ui.form.on('OCR Read', {
-    refresh: function (frm) {
-
+    setup: function (frm) {
+        frappe.call({
+            method: "erpnext_ocr.erpnext_ocr.doctype.ocr_language.ocr_language.get_current_language",
+            args: {
+                'user': frappe.user['name']
+            },
+            callback: function (r) {
+                cur_frm.set_value("language", r.message);
+            }
+        })
     },
     read_image: function (frm) {
         frappe.hide_msgprint(true);