phx-node 1.0.107 → 1.0.109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/helper.d.ts +1 -0
- package/dist/lib/helper.js +7 -1
- package/dist/lib/helper.js.map +1 -1
- package/dist/lib/utils/email-render-to-HTML.js +9 -3
- package/dist/lib/utils/email-render-to-HTML.js.map +1 -1
- package/dist/module/explanation/check-allow-explanation.service.js +3 -3
- package/dist/module/explanation/check-allow-explanation.service.js.map +1 -1
- package/dist/module/hrm-checkin/get-actual-working-hours.service.js +2 -2
- package/dist/module/hrm-checkin/get-actual-working-hours.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/lib/helper.d.ts
CHANGED
package/dist/lib/helper.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PHXConvertHeadersRequest = exports.generateValue = exports.sumTotalFee = exports.getTotalDetailPromoByCode = exports.findAdjustmentForOtherService = exports.findAdjustmentForTuition = exports.parseToObject = exports.prevYearDate = exports.nextYearDate = exports.timeYearActive = void 0;
|
|
4
|
+
exports.getConfigByDepartmentId = getConfigByDepartmentId;
|
|
4
5
|
const constant_1 = require("./constant");
|
|
5
6
|
const tuition_1 = require("./types/tuition");
|
|
6
7
|
exports.timeYearActive = new Date().toISOString().slice(0, 10);
|
|
@@ -101,8 +102,13 @@ const PHXConvertHeadersRequest = (headers) => {
|
|
|
101
102
|
deviceId: headers["device-id"],
|
|
102
103
|
listUserSchool: parseSchoolsHeader(headers["hostnames-and-parents-ids"]),
|
|
103
104
|
userId: Number(headers["x-user-id"]),
|
|
104
|
-
currentVersion: extractAppVersion(headers["user-agent"])
|
|
105
|
+
currentVersion: extractAppVersion(headers["user-agent"]),
|
|
105
106
|
};
|
|
106
107
|
};
|
|
107
108
|
exports.PHXConvertHeadersRequest = PHXConvertHeadersRequest;
|
|
109
|
+
function getConfigByDepartmentId(listConfigs, departmentId) {
|
|
110
|
+
var _a;
|
|
111
|
+
const configData = (_a = listConfigs.find((configItem) => configItem.department_id === departmentId)) !== null && _a !== void 0 ? _a : listConfigs.find((configItem) => configItem.department_id === null);
|
|
112
|
+
return configData || {};
|
|
113
|
+
}
|
|
108
114
|
//# sourceMappingURL=helper.js.map
|
package/dist/lib/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/lib/helper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/lib/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PHXEmailRenderToHTML = exports.PHXAllowTags = void 0;
|
|
4
4
|
const liquidjs_1 = require("liquidjs");
|
|
5
5
|
const PHXAllowTags = (html) => {
|
|
6
|
-
const allowedTags = ["p", "b", "i", "a", "br"];
|
|
6
|
+
const allowedTags = ["p", "b", "i", "a", "br", "img"];
|
|
7
7
|
const tagRegex = /<\/?([a-zA-Z0-9]+)(\s[^>]*)?>/g;
|
|
8
8
|
let match;
|
|
9
9
|
while ((match = tagRegex.exec(html)) !== null) {
|
|
@@ -18,14 +18,20 @@ const PHXAllowTags = (html) => {
|
|
|
18
18
|
throw new Error(`Tag <${lowerTag}> contains forbidden attributes (class/style/event)`);
|
|
19
19
|
}
|
|
20
20
|
if (lowerTag === "a") {
|
|
21
|
-
console.log("hrefMatch", attrs);
|
|
22
21
|
const cleanedAttrs = attrs === null || attrs === void 0 ? void 0 : attrs.trim();
|
|
23
22
|
const hrefMatch = cleanedAttrs === null || cleanedAttrs === void 0 ? void 0 : cleanedAttrs.match(/\bhref\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+)/i);
|
|
24
23
|
if (!hrefMatch) {
|
|
25
24
|
throw new Error(`<a> tag must have valid href`);
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
|
-
if (
|
|
27
|
+
if (lowerTag === "img") {
|
|
28
|
+
const cleanedAttrs = attrs === null || attrs === void 0 ? void 0 : attrs.trim();
|
|
29
|
+
const srcMatch = cleanedAttrs === null || cleanedAttrs === void 0 ? void 0 : cleanedAttrs.match(/\bsrc\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+)/i);
|
|
30
|
+
if (!srcMatch) {
|
|
31
|
+
throw new Error(`<img> tag must have valid src`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (attrs && lowerTag !== "a" && lowerTag !== "img") {
|
|
29
35
|
const cleanedAttrs = attrs.trim();
|
|
30
36
|
if (cleanedAttrs) {
|
|
31
37
|
throw new Error(`Tag <${lowerTag}> should not have attributes`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email-render-to-HTML.js","sourceRoot":"","sources":["../../../src/lib/utils/email-render-to-HTML.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAM3B,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE;IACnD,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"email-render-to-HTML.js","sourceRoot":"","sources":["../../../src/lib/utils/email-render-to-HTML.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const common_1 = require("@nestjs/common");
|
|
|
23
23
|
const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
|
|
24
24
|
const query_1 = require("../../query/explanation/query");
|
|
25
25
|
const constant_1 = require("../../lib/constant");
|
|
26
|
+
const helper_1 = require("../../lib/helper");
|
|
26
27
|
let PHXAllowExplanation = class PHXAllowExplanation {
|
|
27
28
|
constructor(grpcClientSystemService) {
|
|
28
29
|
this.grpcClientSystemService = grpcClientSystemService;
|
|
@@ -77,9 +78,8 @@ let PHXAllowExplanation = class PHXAllowExplanation {
|
|
|
77
78
|
return ((_a = item.approval_type) === null || _a === void 0 ? void 0 : _a.code) === request_code ||
|
|
78
79
|
item.request_type_id === null;
|
|
79
80
|
})) === null || _c === void 0 ? void 0 : _c.limit_time_create;
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
configData.department_id === null)) || {};
|
|
81
|
+
const listShiftConfigFilter = hrm_checkin_hrm_checkin_shift_config.filter((configData) => configData.school_id === staffInfo.school_id);
|
|
82
|
+
const dataShiftConfig = (0, helper_1.getConfigByDepartmentId)(listShiftConfigFilter, staffDepartmentId);
|
|
83
83
|
if (isCheckValidateTimeInput) {
|
|
84
84
|
const { hrm_checkin_attendance_code } = yield this.grpcClientSystemService.query({
|
|
85
85
|
query: query_1.queryAttendanceCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-allow-explanation.service.js","sourceRoot":"","sources":["../../../src/module/explanation/check-allow-explanation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,0FAAuF;AACvF,yDAGqC;AACrC,iDAAoD;
|
|
1
|
+
{"version":3,"file":"check-allow-explanation.service.js","sourceRoot":"","sources":["../../../src/module/explanation/check-allow-explanation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ exports.GetActualWorkingHoursService = void 0;
|
|
|
22
22
|
const common_1 = require("@nestjs/common");
|
|
23
23
|
const grpc_client_system_service_1 = require("../grpc-client/grpc-client-system.service");
|
|
24
24
|
const query_1 = require("../../query/hrm-checkin/query");
|
|
25
|
+
const helper_1 = require("../../lib/helper");
|
|
25
26
|
let GetActualWorkingHoursService = class GetActualWorkingHoursService {
|
|
26
27
|
constructor(grpcClientSystemService) {
|
|
27
28
|
this.grpcClientSystemService = grpcClientSystemService;
|
|
@@ -94,8 +95,7 @@ let GetActualWorkingHoursService = class GetActualWorkingHoursService {
|
|
|
94
95
|
const staffDepartmentData = department_users || [];
|
|
95
96
|
const staffDepartmentId = ((_b = staffDepartmentData[0]) === null || _b === void 0 ? void 0 : _b.department_id) || 0;
|
|
96
97
|
const listAttendanceConfigs = (school === null || school === void 0 ? void 0 : school.hrm_checkin_shift_configs) || [];
|
|
97
|
-
const dataAttendanceConfig =
|
|
98
|
-
configData.department_id === null) || {};
|
|
98
|
+
const dataAttendanceConfig = (0, helper_1.getConfigByDepartmentId)(listAttendanceConfigs, staffDepartmentId);
|
|
99
99
|
const { break_start, break_end, allow_break_time } = dataAttendanceConfig;
|
|
100
100
|
const isHasBreakTime = Boolean(allow_break_time && break_start && break_end);
|
|
101
101
|
return isHasBreakTime
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-actual-working-hours.service.js","sourceRoot":"","sources":["../../../src/module/hrm-checkin/get-actual-working-hours.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,0FAAuF;AAEvF,yDAAgE;
|
|
1
|
+
{"version":3,"file":"get-actual-working-hours.service.js","sourceRoot":"","sources":["../../../src/module/hrm-checkin/get-actual-working-hours.service.ts"],"names":[],"mappings":"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"}
|