Merge branch 'latest' of https://git.opensipkd.com/aa.gusti/opensipkd-base into latest

opensipkd/base/tools/report.py

@@ -28,7 +28,7 @@ def jasper_compile(input_file):
 
 
 def jasper_export(input_file, output_file=None, schema=None,
 def jasper_export(input_file, output_file=None, schema=None,
                   output_formats=["pdf"], dburl="sqlalchemy.url",
                   output_formats=["pdf"], dburl="sqlalchemy.url",
-                  parameters={}, db_schema=None):
+                  parameters={}, db_schema=None, report_locale="en_US"):
     db = get_params(dburl).split("@")
     db = get_params(dburl).split("@")
     db_driver, db_user, db_password = db[0].split(':')
     db_driver, db_user, db_password = db[0].split(':')
     db_servers, db_name = db[1].split('/')
     db_servers, db_name = db[1].split('/')
@@ -67,11 +67,13 @@ def jasper_export(input_file, output_file=None, schema=None,
         'password': db_password,
         'password': db_password,
         'host': db_host,
         'host': db_host,
         'database': db_name,
         'database': db_name,
+        'db_sid': db_name, # for oracle: added by Tatang
         'schema': db_schema,
         'schema': db_schema,
         'port': db_port,
         'port': db_port,
         'jdbc_dir': jdbc_dir,
         'jdbc_dir': jdbc_dir,
         'jdbc_driver': jdbc_driver,
         'jdbc_driver': jdbc_driver,
     }
     }
+
     pyreportjasper = PyReportJasper()
     pyreportjasper = PyReportJasper()
     # log.info(input_file)
     # log.info(input_file)
     # log.info(output_file)
     # log.info(output_file)
@@ -84,8 +86,9 @@ def jasper_export(input_file, output_file=None, schema=None,
         db_connection=conn,
         db_connection=conn,
         output_formats=output_formats,
         output_formats=output_formats,
         parameters=parameters,
         parameters=parameters,
-        locale='en_US'
+        locale=report_locale
     )
     )
+
     # pyreportjasper.compile(write_jasper=True)
     # pyreportjasper.compile(write_jasper=True)
     pyreportjasper.process_report()
     pyreportjasper.process_report()
     output_files = [".".join([output_file, f]) for f in output_formats]
     output_files = [".".join([output_file, f]) for f in output_formats]

opensipkd/base/views/templates/base3.1.pt

@@ -281,8 +281,6 @@
 
 
 <metal:js define-slot="js_files"></metal:js>
 <metal:js define-slot="js_files"></metal:js>
 
 
-<!-- Define Script-->
-<script metal:define-slot="scripts"></script>
 <!-- End isi Script-->
 <!-- End isi Script-->
 <!-- MAIN PANEL -->
 <!-- MAIN PANEL -->
 <div id="main" role="main">
 <div id="main" role="main">
@@ -325,5 +323,8 @@
     <!-- END MAIN CONTENT -->
     <!-- END MAIN CONTENT -->
 </div>
 </div>
 <!-- END MAIN PANEL -->
 <!-- END MAIN PANEL -->
+
+<!-- Define Script-->
+<script metal:define-slot="scripts"></script>
 </body>
 </body>
 </html>
 </html>