Version 1.6.6

filak · Jun 14, 2024 · 96a7643 · 96a7643
1 parent d5b76e0
commit 96a7643
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 27 deletions.
diff --git a/flask-app/application/main.py b/flask-app/application/main.py
@@ -37,11 +37,7 @@ def create_app(debug=False, logger=None, port=5900,
         app.debug = True
 
     if app.debug:
-<<<<<<< Updated upstream
-        print('config:', config_path, '- port:', port)
-=======
         print('MTW Config:  ', config_path, ' - port: ', port)
->>>>>>> Stashed changes
 
     if logger:
         app.logger = logger
@@ -126,17 +122,12 @@ def create_app(debug=False, logger=None, port=5900,
     if app.config.get('SERVER_NAME'):
         app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=0)
 
-<<<<<<< Updated upstream
-    # Flask Extensions init
-
-=======
     if app.debug:
         print('Server host: ', app.config['SERVER_NAME'])
         print('Worker host: ', app.config['WORKER_HOST'])
 
     # Flask Extensions init
 
->>>>>>> Stashed changes
     # Cache, Session
     cache.init_app(app)
     sess.init_app(app)

diff --git a/flask-app/application/modules/utils.py b/flask-app/application/modules/utils.py
@@ -607,22 +607,16 @@ def getElasticData(data):
                 qen = qualifiers[q].get('eng', 'EMPTY')
                 qtr = qualifiers[q].get('trx', 'MISSING')
 
-<<<<<<< Updated upstream
-                d = parts[1]
-=======
                 draw = parts[1]
                 dparts = draw.split('Q')
                 d = dparts[0]
 
->>>>>>> Stashed changes
                 den = descriptors[d].get('eng', 'EMPTY')
                 dtr = descriptors[d].get('trx', 'MISSING')
 
                 qout = {}
                 qout['qua'] = qtr + '~' + qen + '|' + q
 
-<<<<<<< Updated upstream
-=======
                 if len(dparts) == 2:
                     aq = 'Q' + dparts[1]
                     aqen = qualifiers[aq].get('eng', 'EMPTY')
@@ -634,7 +628,6 @@ def getElasticData(data):
                 else:
                     qout['dal'] = dtr + '~' + den + '|' + draw
 
->>>>>>> Stashed changes
                 qua_use.append(qout)
 
         if qua_use:

diff --git a/flask-app/application/templates/_layout.html b/flask-app/application/templates/_layout.html
@@ -184,10 +184,6 @@ <h3>JavaScript is not enabled. <a href="https://enable-javascript.com/" target="
   <script src="{{ url_for('static', filename='jq-ui/jquery-ui.min.js') }}" type="text/javascript"></script>
   <script src="{{ url_for('static', filename='bootstrap/4.6.0/js/popper.min.js') }}?v=1.16.1" type="text/javascript"></script>
   <script src="{{ url_for('static', filename='bootstrap/4.6.0/js/bootstrap.min.js') }}" type="text/javascript"></script>
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
   <script src="{{ url_for('static', filename='js/custom.js')}}?v={{ config.APP_VER }}" type="text/javascript"></script>
 </body>
 </html>
diff --git a/flask-app/application/worker.py b/flask-app/application/worker.py
@@ -25,11 +25,7 @@ def create_app(debug=False, logger=None, port=5903,
         app.debug = True
 
     if app.debug:
-<<<<<<< Updated upstream
-        print('config:', config_path, '- port:', port)
-=======
         print('MTW Config:  ', config_path, ' - port: ', port)
->>>>>>> Stashed changes
 
     if logger:
         app.logger = logger
@@ -84,12 +80,9 @@ def create_app(debug=False, logger=None, port=5903,
 
     app.config.update({'APP_HOST': app.config.get('SERVER_NAME')})
     app.config.update({'SERVER_NAME': None})
-<<<<<<< Updated upstream
-=======
 
     if app.debug:
         print('Worker host: ', app.config['WORKER_HOST'])
->>>>>>> Stashed changes
 
     if relax:
         app.config.update({'APP_RELAXED': True})