hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-11-14 10:59:43 +07:00
commit 14d2b45588
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ProfileController.ts
View file

@ -7057,6 +7057,7 @@ export class ProfileController extends Controller {
lastName: profile.lastName, lastName: profile.lastName,
citizenId: profile.citizenId, citizenId: profile.citizenId,
position: profile.position, position: profile.position,
isDirector : posMaster?.isDirector,
isProbation: profile.isProbation, isProbation: profile.isProbation,
posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName, posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,

1
src/middlewares/logs.ts
View file

@ -52,6 +52,7 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
res.on("finish", async() => { res.on("finish", async() => {
if (!req.url.startsWith("/api/")) return; if (!req.url.startsWith("/api/")) return;
let system = "organization"; let system = "organization";
if (req.url.startsWith("/api/v1/org/keycloak/log/sso")) system = "inout";
if (req.url.startsWith("/api/v1/org/metadata/")) system = "master"; if (req.url.startsWith("/api/v1/org/metadata/")) system = "master";
if (req.url.startsWith("/api/v1/org/pos/position/")) system = "master"; if (req.url.startsWith("/api/v1/org/pos/position/")) system = "master";
if (req.url.startsWith("/api/v1/org/pos/type/")) system = "master"; if (req.url.startsWith("/api/v1/org/pos/type/")) system = "master";