tina4-python 0.2.166__tar.gz → 0.2.168__tar.gz

{tina4_python-0.2.166 → tina4_python-0.2.168}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.166
+Version: 0.2.168
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.166 → tina4_python-0.2.168}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.166"
+version = "0.2.168"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.166 → tina4_python-0.2.168}/tina4_python/Template.py

@@ -60,8 +60,11 @@ class Template:
     @staticmethod
     def datetime_format(value, format="%H:%M %d-%m-%y"):
         if value.strip().upper() == "NOW":
-            value = date.today()
-        return value.strftime(format)
+            value = datetime.now()
+        try:
+            return value.strftime(format)
+        except AttributeError:
+            return value
 
     @staticmethod
     def production_dump(param):

{tina4_python-0.2.166 → tina4_python-0.2.168}/tina4_python/public/js/tina4helper.js

@@ -7,46 +7,71 @@ var formToken = null;
  * @param method
  * @param callback
  */
-function sendRequest (url, request, method, callback) {
-    if (url === undefined) {
-        url = "";
-    }
-    if (request === undefined) {
-        request = null;
-    }
-    if (method === undefined) {
-        method = 'GET';
-    }
+function sendRequest(url, request, method, callback) {
+    // Default values
+    if (url === undefined)       url = "";
+    if (request === undefined)   request = null;
+    if (method === undefined)    method = 'GET';
 
     const xhr = new XMLHttpRequest();
-
-
     xhr.open(method, url, true);
 
+    // Add authorization header if token exists
     if (formToken !== null) {
-        //set a form token to the header
-        xhr.setRequestHeader('Authorization', 'Bearer '+formToken);
+        xhr.setRequestHeader('Authorization', 'Bearer ' + formToken);
+    }
+
+    // ────────────────────────────────────────────────
+    // Content-Type logic – only set when appropriate
+    // ────────────────────────────────────────────────
+    let isFormData = request instanceof FormData;
+
+    if (method.toUpperCase() === 'POST' || method.toUpperCase() === 'PUT' || method.toUpperCase() === 'PATCH') {
+        if (isFormData) {
+            //DO not touch this
+        } else if (typeof request === 'object' && request !== null) {
+            //Becomes a JSON String
+            request = JSON.stringify(request);
+            xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+        } else if (typeof request === 'string') {
+            // Already a string – assume JSON or let server decide
+            // You can set charset=UTF-8 if you're sure it's JSON/text
+            xhr.setRequestHeader('Content-Type', 'text/plain; charset=UTF-8');
+        }
     }
 
+    // ────────────────────────────────────────────────
+    // Response handling
+    // ────────────────────────────────────────────────
     xhr.onload = function () {
         let content = xhr.response;
-        if (xhr.getResponseHeader('FreshToken') !== '' && xhr.getResponseHeader('FreshToken') !== null) {
-            formToken = xhr.getResponseHeader('FreshToken');
+
+        // Update token if server sent a fresh one
+        const freshToken = xhr.getResponseHeader('FreshToken');
+        if (freshToken && freshToken !== '') {
+            formToken = freshToken;
         }
 
         try {
             content = JSON.parse(content);
-            callback(content);
-        } catch (exception) {
-            callback (content);
+        } catch (e) {
+            // Not JSON → keep as raw string/text
+        }
+
+        if (typeof callback === 'function') {
+            callback(content, xhr.status, xhr);
         }
     };
 
-    if (method === 'POST') {
-        xhr.send(request);
-    } else {
-        xhr.send(null);
-    }
+    // Optional: handle errors
+    xhr.onerror = function () {
+        if (typeof callback === 'function') {
+            callback(null, xhr.status, xhr);
+        }
+    };
+
+    // Send the body (or null)
+    xhr.send(request);
 }
 
 /**