diff --git a/client/src/availability-info.ts b/client/src/availability-info.ts index 9bb7bd6..ecee04e 100644 --- a/client/src/availability-info.ts +++ b/client/src/availability-info.ts @@ -3,5 +3,5 @@ export class AvailabilityInfo { public loggedIn: boolean; public extension: string; public lastStamp: Date; - public firma: boolean; + public atCompany: boolean; } diff --git a/client/src/availability.ts b/client/src/availability.ts index 4cc811d..102747f 100644 --- a/client/src/availability.ts +++ b/client/src/availability.ts @@ -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 = '' + time + location + '' } diff --git a/server/src/CPATapi.Server/Models/Availability.cs b/server/src/CPATapi.Server/Models/Availability.cs index 62be9ba..3280d6d 100644 --- a/server/src/CPATapi.Server/Models/Availability.cs +++ b/server/src/CPATapi.Server/Models/Availability.cs @@ -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; } } diff --git a/server/src/CPATapi.Server/Repository/ZeitConsensRepository.cs b/server/src/CPATapi.Server/Repository/ZeitConsensRepository.cs index 9390115..33cd74c 100644 --- a/server/src/CPATapi.Server/Repository/ZeitConsensRepository.cs +++ b/server/src/CPATapi.Server/Repository/ZeitConsensRepository.cs @@ -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