CPATRD/3cx_tapi
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename firma to atCompany on server and client

Browse Source 
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:
Patrik Oberschmid
2026-04-13 13:18:02 +02:00
parent d5558b61b2
commit 2874ea78c4
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/availability-info.ts
+1 -1
View File
@@ -3,5 +3,5 @@ export class AvailabilityInfo {
public loggedIn: boolean; public loggedIn: boolean;
public extension: string; public extension: string;
public lastStamp: Date; public lastStamp: Date;
public firma: boolean; public atCompany: boolean;
} }
client/src/availability.ts
+1 -1
View File
@@ -73,7 +73,7 @@ export class Availability {
} }
var location = '' var location = ''
if (entry.loggedIn) { 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>' indicator.innerHTML = '<span class="tapi-dot ' + dotClass + '"></span><small>' + time + location + '</small>'
} }
server/src/CPATapi.Server/Models/Availability.cs
+2 -2
View File
@@ -13,6 +13,6 @@ public class Availability
public string? US_EXTENSION { get; set; } public string? US_EXTENSION { get; set; }
[JsonPropertyName("lastStamp")] [JsonPropertyName("lastStamp")]
public DateTime? LAST_STAMP { get; set; } public DateTime? LAST_STAMP { get; set; }
[JsonPropertyName("firma")] [JsonPropertyName("atCompany")]
public bool? FIRMA { get; set; } public bool? AT_COMPANY { get; set; }
} }
server/src/CPATapi.Server/Repository/ZeitConsensRepository.cs
+2 -2
View File
@@ -12,7 +12,7 @@ internal class ZeitConsensRepository(IConfiguration config) : Repository(config)
,bu.LOGGED_IN ,bu.LOGGED_IN
,us.US_EXTENSION ,us.US_EXTENSION
,buLast.LAST_STAMP ,buLast.LAST_STAMP
,buLast.FIRMA ,buLast.AT_COMPANY
FROM dbo.MA_DATEN ma FROM dbo.MA_DATEN ma
INNER JOIN projectmanagement.dbo.CP_USER us ON us.US_LOGINNAME = ma.MA_USER_NAME INNER JOIN projectmanagement.dbo.CP_USER us ON us.US_LOGINNAME = ma.MA_USER_NAME
OUTER APPLY ( OUTER APPLY (
@@ -24,7 +24,7 @@ internal class ZeitConsensRepository(IConfiguration config) : Repository(config)
OUTER APPLY ( OUTER APPLY (
SELECT TOP 1 SELECT TOP 1
bu.BU_BU AS LAST_STAMP 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 FROM dbo.BU bu
WHERE bu.BU_MA_NR = ma.MA_NR WHERE bu.BU_MA_NR = ma.MA_NR
ORDER BY bu.BU_BU DESC ORDER BY bu.BU_BU DESC