Merge remote-tracking branch 'origin/v3.5'

server/src/uds/core/managers/stats.py

@@ -214,7 +214,8 @@ class StatsManager(metaclass=singleton.Singleton):
         try:
 
             def getKwarg(fld: str) -> str:
-                val = None
+                val = kwargs.get(fld)
+                if val is None:
                     for i in FLDS_EQUIV[fld]:
                         val = kwargs.get(i)
                         if val is not None:

server/src/uds/core/reports/css/report.css

@@ -17,13 +17,13 @@
     @bottom-right {
         content: '{printed}'
     }
-    @left-top {
+    /*@left-top {
         content: "{water}"; font: .5cm/1.5 Fontin Sans;
         background: #557891; color: #fff; text-align: right;
         padding-right: 2em; height: 1.5em; width: 10cm;
         transform-origin: 100% 0;
         transform: rotate(-90deg);
-    }
+    }*/
 }
 body { 
     text-align: justify;