eigen
/
pos-be
11
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 369 Wiki Activity

Merge pull request 'feat: update text desc scheduling loh' (#180) from fix/log-scheduling into development 

Reviewed-on: #180
pull/142/head 1.7.2-alpha.7
irfan 2025-07-11 16:25:21 +07:00
parent 00fdf84e56 e80bf48d18
commit aba438382d
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-change-status.handler.ts
View File

@ -31,7 +31,7 @@ export class DataSchedulingChangeStatusHandler
const editorName = newData.editor_name || 'System'; const editorName = newData.editor_name || 'System';
const totalPercentage = decryptionTotal(newData?.indexing_key); const totalPercentage = decryptionTotal(newData?.indexing_key);
const description = `<div><b>${editorName}</b> changed the status of <b><i>${scheduleName} (${totalPercentage}%)</i></b> from <b><i>${oldStatus}</i></b> to <b><i>${newStatus}</i></b>.</div>`; const description = `<div><b>${editorName}</b> changed the status of <b><i>${scheduleName} (${totalPercentage}%)</i></b> schedule from <b><i>${newData?.schedule_date_from}</i></b> to <b><i>${newData.schedule_date_to}</i></b> from <b><i>${oldStatus}</i></b> to <b><i>${newStatus}</i></b>.</div>`;
const payload: DataSchedulingLogEntity = { const payload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING, type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING,

2
src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-deleted.handler.ts
View File

@ -29,7 +29,7 @@ export class DataSchedulingDeletedHandler
const scheduleName = deletedData?.name || 'an item'; const scheduleName = deletedData?.name || 'an item';
const totalPercentage = decryptionTotal(deletedData?.indexing_key); const totalPercentage = decryptionTotal(deletedData?.indexing_key);
const description = `<div><b>${deleterName}</b> deleted schedule: <b><i>${scheduleName} (${totalPercentage}%)</i></b>.</div>`; const description = `<div><b>${deleterName}</b> deleted schedule: <b><i>${scheduleName} (${totalPercentage}%)</i></b> schedule from <b><i>${deletedData?.schedule_date_from}</i></b> to <b><i>${deletedData.schedule_date_to}</i></b>.</div>`;
const payload: DataSchedulingLogEntity = { const payload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING, type: SCHEDULING_LOG_TYPE_ENUM.DATA_SCHEDULING,

4
src/modules/configuration/data-scheduling/domain/usecases/handlers/data-scheduling-updated.handler.ts
View File

@ -128,10 +128,10 @@ export class DataSchedulingUpdatedHandler
: `${totalPercentageOld}% to ${totalPercentageNew}%` : `${totalPercentageOld}% to ${totalPercentageNew}%`
}`; }`;
let description = `<div><b>${editorName}</b> has updated schedule for <b><i>${itemName} (${labelName})</i></b>.`; let description = `<div><b>${editorName}</b> has updated schedule for <b><i>${itemName} (${labelName})</i></b> schedule from <b><i>${newData?.schedule_date_from}</i></b> to <b><i>${newData.schedule_date_to}</i></b>.<br>`;
if (Object.keys(changingData.old).length > 0) { if (Object.keys(changingData.old).length > 0) {
description += ` Change details:<ul>`; description += `Change details:<ul>`;
for (const key in changingData.old) { for (const key in changingData.old) {
if (Object.prototype.hasOwnProperty.call(changingData.old, key)) { if (Object.prototype.hasOwnProperty.call(changingData.old, key)) {
const label = this.labelMap[key] || key; const label = this.labelMap[key] || key;

4
src/modules/configuration/data-scheduling/domain/usecases/managers/data-scheduling-default.manager.ts
View File

@ -74,8 +74,8 @@ export class DataSchedulingManager {
if (existData?.default_value !== saveData?.default_value) { if (existData?.default_value !== saveData?.default_value) {
const description = existData?.id const description = existData?.id
? `<p><b>${saveData.editor_name}</b> mengubah pengaturan <b><i>Default Percentage</i></b> dari <b><i>${existData.default_value}%</i></b> menjadi <b><i>${saveData.default_value}%</i></b>.</p>` ? `<div><b>${saveData.editor_name}</b> changed the <b><i>Default Percentage</i></b> setting from <b><i>${existData.default_value}%</i></b> to <b><i>${saveData.default_value}%</i></b>.</div>`
: `<p><b>${saveData.creator_name}</b> membuat pengaturan <b><i>Default Percentage</i></b> dengan value <b><i>${saveData.default_value}%</i></b>.</p>`; : `<div><b>${saveData.creator_name}</b> created the <b><i>Default Percentage</i></b> setting with a value of <b><i>${saveData.default_value}%</i></b>.</div>`;
const logPayload: DataSchedulingLogEntity = { const logPayload: DataSchedulingLogEntity = {
type: SCHEDULING_LOG_TYPE_ENUM.DEFAULT_PERCENTAGE, type: SCHEDULING_LOG_TYPE_ENUM.DEFAULT_PERCENTAGE,

18
src/modules/configuration/data-scheduling/domain/usecases/managers/index-data-scheduling-log.manager.ts
View File

@ -79,16 +79,22 @@ export class IndexDataSchedulingLogManager extends BaseIndexManager<DataScheduli
}); });
} }
if (this.filterParam.log_created_from) { if (this.filterParam.log_created_from && this.filterParam.log_created_to) {
const dateFrom = this.filterParam.log_created_from; const dateFrom = this.filterParam.log_created_from;
queryBuilder.andWhere('log_created_from >= :dateFrom', { const dateTo = this.filterParam.log_created_to;
queryBuilder.andWhere('log_created_at BETWEEN :dateFrom AND :dateTo', {
dateFrom: dateFrom,
dateTo: dateTo,
});
} else if (this.filterParam.log_created_from) {
const dateFrom = this.filterParam.log_created_from;
queryBuilder.andWhere('log_created_at >= :dateFrom', {
dateFrom: dateFrom, dateFrom: dateFrom,
}); });
} } else if (this.filterParam.log_created_to) {
if (this.filterParam.log_created_to) {
const dateTo = this.filterParam.log_created_to; const dateTo = this.filterParam.log_created_to;
queryBuilder.andWhere('log_created_to <= :dateTo', { queryBuilder.andWhere('log_created_at <= :dateTo', {
dateTo: dateTo, dateTo: dateTo,
}); });
} }