fix webserver bug

artyl · Jun 28, 2020 · 857743a · 857743a
1 parent fef269b
commit 857743a
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ BalanceHistory.sqlite
 balance.html
 plugin/personalsetting.py
 mbplugin*.zip
-python-3.8.3-embed-win32_TKINTER.zip
+python-*.zip
 dllplugin
 jsmblhplugin
 httpserver

diff --git a/otherjsmp/SipNet.jsmb → ordinaryjsmb/SipNet.jsmb b/otherjsmp/SipNet.jsmb → ordinaryjsmb/SipNet.jsmb
diff --git a/otherjsmp/StrelkaCard_Ru.jsmb → ordinaryjsmb/StrelkaCard_Ru.jsmb b/otherjsmp/StrelkaCard_Ru.jsmb → ordinaryjsmb/StrelkaCard_Ru.jsmb
diff --git a/otherjsmp/avtodor-tr.jsmb → ordinaryjsmb/avtodor-tr.jsmb b/otherjsmp/avtodor-tr.jsmb → ordinaryjsmb/avtodor-tr.jsmb
diff --git a/otherjsmp/beeline.jsmb → ordinaryjsmb/beeline.jsmb b/otherjsmp/beeline.jsmb → ordinaryjsmb/beeline.jsmb
diff --git a/otherjsmp/megafon.jsmb → ordinaryjsmb/megafon.jsmb b/otherjsmp/megafon.jsmb → ordinaryjsmb/megafon.jsmb
diff --git a/otherjsmp/mts_20200229-used.jsmb → ordinaryjsmb/mts_20200229-used.jsmb b/otherjsmp/mts_20200229-used.jsmb → ordinaryjsmb/mts_20200229-used.jsmb
diff --git a/otherjsmp/readme.md → ordinaryjsmb/readme.md b/otherjsmp/readme.md → ordinaryjsmb/readme.md
diff --git a/otherjsmp/smile-net.jsmb → ordinaryjsmb/smile-net.jsmb b/otherjsmp/smile-net.jsmb → ordinaryjsmb/smile-net.jsmb
diff --git a/otherjsmp/tele2-api.jsmb → ordinaryjsmb/tele2-api.jsmb b/otherjsmp/tele2-api.jsmb → ordinaryjsmb/tele2-api.jsmb
diff --git a/plugin/dbengine.py b/plugin/dbengine.py
@@ -187,6 +187,8 @@ def report(self,fields):
         rows = self.cur.execute(reportsql)
         headers = list(zip(*rows.description))[0]
         data = rows.fetchall()
+        # округляем float до 2х знаков
+        data = [tuple([(round(i, 2) if type(i) == float else i) for i in line]) for line in data]
         return headers,data
 
     def check_and_add_addition(self):

diff --git a/plugin/httpserver_mobile.py b/plugin/httpserver_mobile.py
@@ -10,6 +10,12 @@
 
 lang='p' # Для плагинов на python преффикс lang всегда 'p'
 
+HTML_NO_REPORT = '''Для того чтобы были доступны отчеты необходимо в mbplugin.ini включить запись результатов в sqlite базу<br>
+sqlitestore = 1<br>Также можно настроить импорт из базы BalanceHistory.mdb включив <br>
+createhtmlreport = 1<br>
+После включения, запустите mbplugin\setup_and_check.bat
+'''
+
 def find_ini_up(fn):
     allroot = [os.getcwd().rsplit('\\',i)[0] for i in range(len(os.getcwd().split('\\')))]
     all_ini = [i for i in allroot if os.path.exists(os.path.join(i,fn))]
@@ -125,8 +131,7 @@ def getreport(param=[]):
                 el = ''
             if he != 'Balance' and (el == 0.0 or el == 0):
                 el = ''
-            html_line.append(
-                f'<{"th" if he=="NN" else "td"} id="{he}"{mark}>{el}</td>')
+            html_line.append(f'<{"th" if he=="NN" else "td"} id="{he}"{mark}>{el}</td>')
         html_table.append(f'<tr id="row" class="n">{"".join(html_line)}</tr>')
     res = template.format(style=style, html_header=html_header, html_table='\n'.join(html_table))
     return 'text/html', [res]
@@ -287,7 +292,11 @@ def simple_app(self,environ, start_response):
         if cmd.lower() == 'getbalance':
             ct, text = getbalance(param)  # TODO !!! Но правильно все-таки через POST
         if cmd == '' or cmd == 'report': # report
-            ct, text = getreport(param)
+            options = store.read_ini()['Options']
+            if options['sqlitestore'] == '1':
+                ct, text = getreport(param)
+            else:
+                ct, text = 'text/html', HTML_NO_REPORT
         if cmd == 'exit': # exit cmd
             self.cmdqueue.put('STOP')
             text = ['exit']