Rename firma to atCompany on server and client
Renames the Zeiterfassung-vs-home flag to a clearer English name (SQL alias AT_COMPANY, model property AT_COMPANY, JSON atCompany) in both the server query/model and the client AvailabilityInfo type and people-tile renderer.
This commit is contained in:
@@ -3,5 +3,5 @@ export class AvailabilityInfo {
|
||||
public loggedIn: boolean;
|
||||
public extension: string;
|
||||
public lastStamp: Date;
|
||||
public firma: boolean;
|
||||
public atCompany: boolean;
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ export class Availability {
|
||||
}
|
||||
var location = ''
|
||||
if (entry.loggedIn) {
|
||||
location = entry.firma ? ' · Büro' : ' · Home'
|
||||
location = entry.atCompany ? ' · Büro' : ' · Home'
|
||||
}
|
||||
indicator.innerHTML = '<span class="tapi-dot ' + dotClass + '"></span><small>' + time + location + '</small>'
|
||||
}
|
||||
|
||||
@@ -13,6 +13,6 @@ public class Availability
|
||||
public string? US_EXTENSION { get; set; }
|
||||
[JsonPropertyName("lastStamp")]
|
||||
public DateTime? LAST_STAMP { get; set; }
|
||||
[JsonPropertyName("firma")]
|
||||
public bool? FIRMA { get; set; }
|
||||
[JsonPropertyName("atCompany")]
|
||||
public bool? AT_COMPANY { get; set; }
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ internal class ZeitConsensRepository(IConfiguration config) : Repository(config)
|
||||
,bu.LOGGED_IN
|
||||
,us.US_EXTENSION
|
||||
,buLast.LAST_STAMP
|
||||
,buLast.FIRMA
|
||||
,buLast.AT_COMPANY
|
||||
FROM dbo.MA_DATEN ma
|
||||
INNER JOIN projectmanagement.dbo.CP_USER us ON us.US_LOGINNAME = ma.MA_USER_NAME
|
||||
OUTER APPLY (
|
||||
@@ -24,7 +24,7 @@ internal class ZeitConsensRepository(IConfiguration config) : Repository(config)
|
||||
OUTER APPLY (
|
||||
SELECT TOP 1
|
||||
bu.BU_BU AS LAST_STAMP
|
||||
,CASE WHEN bu.BU_TERM = 'Zeiterfassung' THEN 1 ELSE 0 END AS FIRMA
|
||||
,CASE WHEN bu.BU_TERM = 'Zeiterfassung' THEN 1 ELSE 0 END AS AT_COMPANY
|
||||
FROM dbo.BU bu
|
||||
WHERE bu.BU_MA_NR = ma.MA_NR
|
||||
ORDER BY bu.BU_BU DESC
|
||||
|
||||
Reference in New Issue
Block a user