Polishing mobile

.github/workflows/badge-update.yml

@@ -66,7 +66,7 @@ jobs:
         #
         # -- Lint and parse Output
         #
-        pylint_output=$(PYTHONPATH=. pylint . --recursive=y --disable=W0511,R0903 --score=y)
+        pylint_output=$(PYTHONPATH=. pylint . --recursive=y --score=y)
         score=$(sed -n '$s/[^0-9]*\([0-9.]*\).*/\1/p' <<< "$pylint_output")
 
         #

.github/workflows/python-app.yml

@@ -136,7 +136,7 @@ jobs:
         #
         # -- Lint and parse Output
         #
-        pylint_output=$(PYTHONPATH=. pylint . --recursive=y --disable=W0511,R0903,R0801 --score=y)
+        pylint_output=$(PYTHONPATH=. pylint . --recursive=y --score=y)
         exitcode=$?
         score=$(sed -n '$s/[^0-9]*\([0-9.]*\).*/\1/p' <<< "$pylint_output")
         #

.pylintrc

@@ -1,2 +1,11 @@
 [pylint]
-disable=logging-fstring-interpolation, unspecified-encoding,attribute-defined-outside-init,wrong-import-position
+disable=
+    E0401,  # import-error
+    W0511,  # fixme
+    W1203,  # logging-fstring-interpolation
+    R0903,  # too-few-public-methods
+    R0915,  # too-many-statements
+    R0913,  # too-many-arguments
+    R0912,  # too-many-branches
+    R0914,  # too-many-locals
+    R0917   # too-many-positional-arguments

app/routes.py

@@ -47,25 +47,29 @@ def require_login():
                 """
                 # Allow PyTest Client
                 if current_app.config.get('TESTING', False):
-                    return
+                    return None
 
-                # Allow access to login route
+                # Allow access to login route or static content needed before login
                 if request.endpoint == "login":
-                    return
+                    return None
 
-                # Allow access to CSS files
-                if request.endpoint == "static" and request.path.endswith(".css"):
-                    return
+                if  request.endpoint == "static" and (
+                    request.path.endswith('manifest.json') or
+                    request.path.endswith('sw.js')
+                ):
+                    return None
 
-                # Allow access to JS files
-                if request.endpoint == "static" and request.path.endswith(".js"):
-                    return
+                if request.path.startswith('/static/css') or \
+                   request.path.startswith('/static/js') or \
+                   request.path.startswith('/static/icons'):
+                    return None
 
                 # Block everything else unless logged in
                 if not session.get("logged_in"):
                     return redirect('/login')
 
-                return
+                # Return no Redirection for logged-in users
+                return None
 
             @current_app.route("/login", methods=["GET", "POST"])
             def login():

app/server.py

@@ -8,7 +8,9 @@
 
 parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(os.path.join(parent_dir))
-from app.ui import UserInterface
+
+# Relative imports need to be after sys.path append
+from app.ui import UserInterface #pylint: disable=wrong-import-position
 
 
 def create_app(config_path: str) -> Flask:

app/static/css/grid.css

@@ -46,6 +46,8 @@
             "gegen-val gegen-val"
             "tx-head tx-head"
             "tx-val tx-val"
+            "txt-head txt-head"
+            "txt-val txt-val"
             ". .";
     }
 
@@ -59,6 +61,8 @@
     #dynamic-results tr:nth-child(4) td { grid-area: gegen-val;}
     #dynamic-results tr:nth-child(9) th { grid-area: tx-head;}
     #dynamic-results tr:nth-child(9) td { grid-area: tx-val;}
+    #dynamic-results tr:nth-child(10) th { grid-area: txt-head;}
+    #dynamic-results tr:nth-child(10) td { grid-area: txt-val;}
 
     /* Stack nav */
     nav { display: block; }

app/static/css/style.css

@@ -71,6 +71,11 @@ small.secondary, strong.secondary, i.secondary {
     .bottom-fixed > button {
         border-radius: 2em;
     }
+
+#pwa-install-btn {
+    margin-bottom: 6em;
+}
+
 /* Info TX button */
 button.info {
     padding: 1em;
@@ -159,7 +164,6 @@ button.info {
     background-color: var(--pico-code-kbd-background-color);
     border-radius: var(--pico-border-radius);
     color: var(--pico-code-kbd-color);
-    font-weight: bolder;
     font-size: .875em;
     font-family: var(--pico-font-family);
     line-height: initial;
@@ -184,6 +188,7 @@ button.info {
     }
 
     .tag-chip.parsed {background-color: blueviolet; color:black;}
+    .tag-chip.parsed b {display: block;}
     .tag-chip:hover { filter: brightness(110%); }
 
     /* Generated Color Classes */

app/static/js/functions.js

@@ -3,6 +3,22 @@
 let IBAN = window.location.pathname.split('/')[1];
 let TAGS = [];
 
+// ----------------------------------------------------------------------------
+// -- General Listeners -------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+document.addEventListener('DOMContentLoaded', function () {
+
+	// Set PWA if used in PWA
+	if (sessionStorage.getItem('pwa_installed') != 'true'){
+		if (window.matchMedia && window.matchMedia('(display-mode: standalone)').matches ||
+		   window.navigator.standalone === true) {
+			sessionStorage.setItem('pwa_installed', 'true');
+		}
+	}
+
+});
+
 // ----------------------------------------------------------------------------
 // -- DOM Functions ----------------------------------------------------------
 // ----------------------------------------------------------------------------
@@ -393,6 +409,19 @@ function createAjax(callback) {
 	return ajax;
 }
 
+// -----------------------------
+// PWA: Service Worker registration and Install prompt handling
+// -----------------------------
+if ('serviceWorker' in navigator) {
+	window.addEventListener('load', function () {
+		navigator.serviceWorker.register('/static/sw.js').then(function (reg) {
+			console.log('Service worker registered.', reg);
+		}).catch(function (err) {
+			console.warn('Service worker registration failed:', err);
+		});
+	});
+}
+
 /**
  * Sends a GET request to the specified API endpoint with the given parameters.
  *

app/static/js/iban.js

@@ -43,6 +43,9 @@ document.addEventListener('DOMContentLoaded', function () {
         window.location.href = '/' + IBAN;
     })
 
+    // Update Details Link ("_blank" for non-PWA)
+    updateDetailsLink();
+
 });
 
 // ----------------------------------------------------------------------------
@@ -60,6 +63,19 @@ function set_all_checkboxes() {
     listTxElements();
 }
 
+/**
+ * Set "more" button to target "_blank" if not PWA
+ */
+function updateDetailsLink() {
+    var a = document.querySelector('#details-popup footer a.secondary');
+    if (!a) return;
+    if (sessionStorage.getItem('pwa_installed') == 'true') {
+        a.removeAttribute('target');
+    } else {
+        a.setAttribute('target', '_blank');
+    }
+}
+
 /**
  * Set an eventlistener for every box and change the header when unselected
  * 

app/static/js/tx.js

@@ -69,4 +69,15 @@ function manualTagTx(uuid) {
  */
 function manualCatTx(uuid) {
     return manualCat([uuid], document.getElementById('cat-input').value);
+}
+
+/**
+ * Close window when used as PWA, otherwise go back in browser history.
+ */
+function closeOrBack() {
+    if (sessionStorage.getItem('pwa_installed') != 'true') {
+        window.close();
+    } else {
+        window.history.back();
+    }
 }

app/static/manifest.json

@@ -0,0 +1,21 @@
+{
+  "name": "PynanceParser",
+  "short_name": "PynanceParser",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#13171f",
+  "theme_color": "#00b478",
+  "description": "Get Insides into your Bank Account",
+  "icons": [
+    {
+      "src": "/static/icons/icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/static/icons/icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
+}

app/static/sw.js

@@ -1,11 +1,11 @@
 self.addEventListener('install', function (event) {
-    event.waitUntil(
-        function(){
-            console.log("SW: PWA installiert !");
-        }
-    );
+    self.skipWaiting();
+});
+
+self.addEventListener('activate', function (event) {
+    event.waitUntil(self.clients.claim());
 });
 
 self.addEventListener('fetch', function (event) {
-    // Bisher kein Ressourcen Management nötig !
+    // Not needed for now...
 });

app/templates/layout.html

@@ -8,6 +8,9 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/pico.jade.min.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/grid.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
+    <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='icons/favicon.ico') }}">
+    <link rel="manifest" href="{{ url_for('static', filename='manifest.json') }}">
+    <meta name="theme-color" content="#4db6ac">
 </head>
 <body>
 

app/templates/login.html

@@ -33,5 +33,40 @@ <h1>Pynance Parser</h1>
 
 </main>
 
+<script>
+let deferredPWAInstall = null;
+window.addEventListener('beforeinstallprompt', (e) => {
+	e.preventDefault();
+	deferredPWAInstall = e;
+	let btn = document.getElementById('pwa-install-btn');
+	if (!btn) {
+		btn = document.createElement('button');
+		btn.id = 'pwa-install-btn';
+		btn.className = 'secondary';
+		btn.textContent = 'Install WebApp';
+		btn.addEventListener('click', async () => {
+			btn.style.display = 'none';
+			deferredPWAInstall.prompt();
+			const choice = await deferredPWAInstall.userChoice;
+			deferredPWAInstall = null;
+			if (choice.outcome === 'accepted') {
+				console.log('User accepted the A2HS prompt');
+			} else {
+				console.log('User dismissed the A2HS prompt');
+			}
+		});
+        document.querySelector('body footer').prepend(document.createElement('br'));
+        document.querySelector('body footer').prepend(btn);
+	} else {
+		btn.style.display = 'inline-block';
+	}
+});
+
+window.addEventListener('appinstalled', (evt) => {
+	const btn = document.getElementById('pwa-install-btn');
+	if (btn) btn.style.display = 'none';
+	console.log('PWA was installed.');
+});
+</script>
 
 {% endblock %}

app/templates/tx.html

@@ -16,7 +16,7 @@ <h3>
         </ul>
         <ul>
             <li>
-                <button class="secondary" onclick="window.close()">
+                <button class="secondary" onclick="closeOrBack()">
                     &times; schließen
                 </button>
             </li>

app/ui.py

@@ -12,6 +12,8 @@
 parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(parent_dir)
 
+# Relative imports need to be after sys.path append
+#pylint: disable=wrong-import-position
 from app.routes import Routes
 
 from handler.TinyDb import TinyDbHandler
@@ -22,7 +24,7 @@
 from reader.Comdirect import Reader as Comdirect
 from reader.Commerzbank import Reader as Commerzbank
 from reader.Volksbank_Mittelhessen import Reader as Volksbank_Mittelhessen
-
+#pylint: enable=wrong-import-position
 
 class UserInterface():
     """Basisklasse mit Methoden für den Programmablauf"""

handler/BaseDb.py

@@ -236,7 +236,7 @@ def delete(self, collection: str, condition: dict | list[dict]=None, multi: str=
 
         return {'deleted': update_result}
 
-    def _delete(self, collection: str, condition: dict | list[dict], multi: str):
+    def _delete(self, collection: str, condition: dict | list[dict]=None, multi: str='AND'):
         """
         Private Methode zum Löschen von Datensätzen in der Datenbank,
         die die angegebene Bedingung erfüllen. Siehe 'delete' Methode.

reader/Generic.py

@@ -18,7 +18,7 @@ def __init__(self):
         folgt dem Template in `Models.md` sofern die Felder mit den Informationen
         von hier sicher gefüllt werden können.
         """
-        return
+        self.all_rows = []
 
     def from_csv(self, filepath):
         """