5 Commits

4 changed files with 23 additions and 7 deletions

View File

@ -36,10 +36,9 @@ def get_account_saldo(user, token_info, accountId=None):
def get_tenant_with_saldo(user, token_info):
return dbGetMany(user, token_info, {
"statement": """
SELECT t.firstname, t.lastname, t.address1, sum(a.amount) AS saldo
FROM tenant_t t, account_entry_t a
WHERE a.account = t.account
GROUP BY t.firstname, t.lastname, t.address1
SELECT t.id, t.firstname, t.lastname, t.address1, sum(a.amount) AS saldo
FROM tenant_t t LEFT OUTER JOIN account_entry_t a ON a.account = t.account
GROUP BY t.id, t.firstname, t.lastname, t.address1
""",
"params": ()
}

View File

@ -1,10 +1,13 @@
from db import dbGetMany, dbGetOne
from loguru import logger
from decimal import Decimal
import datetime
def perform(dbh, params):
createdAt = params['created_at']
try:
createdAt = params['created_at']
except KeyError:
createdAt = datetime.datetime.today().strftime("%Y-%m-%d")
tenants = dbGetMany(dbh, { "statement": "SELECT * FROM tenant_t", "params": () })
for tenant in tenants:

View File

@ -38,14 +38,21 @@ parser.add_argument('--verbosity', '-v',
help='Minimal log level for output: DEBUG, INFO, WARNING, ..., default: DEBUG',
required=False,
default="DEBUG")
parser.add_argument('--nocolorize', '-n',
help='disable colored output (for cron)',
required=False,
action='store_true',
default=False)
args = parser.parse_args()
operation = args.operation
params = json.loads(args.params)
logLevel = args.verbosity
noColorize = args.nocolorize
logger.remove()
logger.add(sys.stderr, colorize=True, level=logLevel)
logger.add(sys.stderr, colorize=(not noColorize), level=logLevel)
dbh = None

View File

@ -90,11 +90,18 @@ export class TenantDetailsComponent implements OnInit {
async getTenant(): Promise<void> {
try {
const id = +this.route.snapshot.paramMap.get('id')
this.messageService.add(`getTenant, id=${id}`)
if (id != 0) {
this.messageService.add("getTenant, not-0-branch")
this.tenantId = id
this.tenant = await this.tenantService.getTenant(id)
this.account = await this.accountService.getAccount(this.tenant.account)
this.getTenancies()
} else {
this.messageService.add("getTenant, 0-branch")
this.tenant = NULL_Tenant
this.account = NULL_Account
this.tenancies = []
}
} catch (err) {
this.messageService.add(JSON.stringify(err, undefined, 4))