law-common 10.17.1-beta.7 → 10.18.1-beta.0

package/dist/src/api/interface/billing.create.dto.interface.d.ts

@@ -9,7 +9,7 @@ export interface IBillingCreateDto extends Omit<IEntityCreateDto<IBillingEntity>
 export interface IBillingParticulars {
     invoiceText?: string;
     debitNoteText?: string;
-    includeDebitNoteSummary?: boolean;
+    includeDebitNoteSummary: boolean;
 }
 export interface IBillingCreateDtoExtra {
     particulars: IBillingParticulars[];

package/dist/src/entities/interface/entity.utils.interface.d.ts

@@ -22,7 +22,7 @@ import { IHolidayListEntity } from "./holiday-list.entity.interface";
 import { IHolidayEntity } from "./holiday.entity.interface";
 import { IIndustryEntity } from "./industry.entity.interface";
 import { IIntermediaryBankEntity } from "./intermediary_bank.entity.interface";
-import { ILeaveEntity, IUserLeaveVirtualEntity } from "./leave.entity.interface";
+import { ILeaveCountVirtualEntity, ILeaveEntity, IUserLeaveVirtualEntity } from "./leave.entity.interface";
 import { ILeaveHistoryEntity } from "./leave_history.entity.interface";
 import { IOfficeLocationEntity } from "./office.location.entity";
 import { IOrganizationEntity } from "./organization.entity.interface";
@@ -144,7 +144,7 @@ export type IBaseEntityApiResponse<T extends {
         [K in EntityEnum | VirtualEntityEnum]?: IBaseEntityApiResponse<EnumEntityType<K>>;
     };
 };
-export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : never) & {
+export type EnumEntityType<T extends EntityEnum | VirtualEntityEnum> = (T extends EntityEnum.BILLING ? IBillingEntity : T extends EntityEnum.BILLING_TIMESHEET ? IBillingTimesheetEntity : T extends EntityEnum.BILLING_REIMBURSEMENT_EXPENSE ? IBillingReimbursementExpenseEntity : T extends EntityEnum.TIMESHEET ? ITimesheetEntity : T extends EntityEnum.USER ? IUserEntity : T extends EntityEnum.PROJECT ? IProjectEntity : T extends EntityEnum.CLIENT ? IClientEntity : T extends EntityEnum.LEAVE ? ILeaveEntity : T extends EntityEnum.BANK ? IBankEntity : T extends EntityEnum.BILLING_PAYMENT ? IBillingPaymentEntity : T extends EntityEnum.BILLING_TRANSACTION ? IBillingTransactionEntity : T extends EntityEnum.CLIENT_AFFILIATE ? IClientAffiliateEntity : T extends EntityEnum.CONFIGURATION ? IConfigurationEntity : T extends EntityEnum.HOLIDAY ? IHolidayEntity : T extends EntityEnum.HOLIDAY_LIST ? IHolidayListEntity : T extends EntityEnum.COUNTRY ? ICountryEntity : T extends EntityEnum.EXPENSE_TYPE ? IExpenseTypeEntity : T extends EntityEnum.INDUSTRY ? IIndustryEntity : T extends EntityEnum.INTERMEDIARY_BANK ? IIntermediaryBankEntity : T extends EntityEnum.OFFICE_LOCATION ? IOfficeLocationEntity : T extends EntityEnum.PERMISSION ? IPermissionEntity : T extends EntityEnum.ROLE ? IRoleEntity : T extends EntityEnum.TASK ? ITaskEntity : T extends EntityEnum.DESIGNATION ? IDesignationEntity : T extends EntityEnum.RATE ? IRateEntity : T extends EntityEnum.REIMBURSEMENT ? IReimbursementEntity : T extends EntityEnum.REIMBURSEMENT_EXPENSE ? IReimbursementExpenseEntity : T extends EntityEnum.WORK_FROM_HOME ? IWorkFromHomeEntity : T extends EntityEnum.ORGANIZATION ? IOrganizationEntity : T extends EntityEnum.PROJECT_USER_MAPPING ? IProjectUserMappingEntity : T extends EntityEnum.CLIENT_USER_MAPPING ? IClientUserMappingEntity : T extends EntityEnum.TO_DO_LIST ? IToDoListEntity : T extends EntityEnum.CRON_JOBS ? ICronJobsEntity : T extends EntityEnum.ROLE_PERMISSION_MAPPING ? IRolePermissionMappingEntity : T extends VirtualEntityEnum.USER_LEAVE ? IUserLeaveVirtualEntity : T extends VirtualEntityEnum.LEAVE_COUNT ? ILeaveCountVirtualEntity : T extends EntityEnum.BANK_HISTORY ? IBankHistoryEntity : T extends EntityEnum.LEAVE_HISTORY ? ILeaveHistoryEntity : T extends EntityEnum.WORK_FROM_HOME_HISTORY ? IWorkFromHomeHistoryEntity : T extends EntityEnum.TIMESHEET_HISTORY ? ITimesheetHistoryEntity : never) & {
     id: number;
 };
 export type EntityRelationConfig<T extends EntityEnum | VirtualEntityEnum> = {
@@ -262,7 +262,8 @@ export type IHistoryEntityChangedLogs<T> = {
     timeStamp: string;
 };
 export declare enum VirtualEntityEnum {
-    USER_LEAVE = "user_leave"
+    USER_LEAVE = "user_leave",
+    LEAVE_COUNT = "leave_count"
 }
 export type IHistoryConstraintSearchResponse<T> = IBaseResponse<IHistoryEntitySearchByConstraintResponse<T>[]>;
 export type IHistoryConstraintSearchServiceResponse<T> = IHistoryEntitySearchByConstraintResponse<T>[];

package/dist/src/entities/interface/entity.utils.interface.js

@@ -80,4 +80,5 @@ var EntityEnum;
 var VirtualEntityEnum;
 (function (VirtualEntityEnum) {
     VirtualEntityEnum["USER_LEAVE"] = "user_leave";
+    VirtualEntityEnum["LEAVE_COUNT"] = "leave_count";
 })(VirtualEntityEnum || (exports.VirtualEntityEnum = VirtualEntityEnum = {}));

package/dist/src/entities/interface/leave.entity.interface.d.ts

@@ -2,7 +2,7 @@ import { DurationTypeEnum } from "../enums/duration-type.enum";
 import { LeaveTypeEnum } from "../enums/leave-type.enum";
 import { LeaveStatusEnum } from "../enums/leave.status.enum";
 import { IAuditColumnEntity } from "./audit-column.entity.interface";
-import { IEntityFilterData } from "./entity.utils.interface";
+import { EnumEntityType, IEntityFilterData, VirtualEntityEnum } from "./entity.utils.interface";
 import { IUserEntity } from "./user.entity.interface";
 export interface ILeaveEntity extends IAuditColumnEntity {
     id: number;
@@ -38,3 +38,12 @@ export interface IUserLeaveVirtualEntity extends IAuditColumnEntity {
     type: LeaveTypeEnum;
     id: number;
 }
+export interface ILeaveCountVirtualEntity extends IAuditColumnEntity {
+    id: number;
+    period: string;
+    leaveId?: number;
+    count: number;
+}
+export declare const virtualEntityToKeysMap: {
+    [K in VirtualEntityEnum]: (keyof EnumEntityType<K>)[];
+};

package/dist/src/entities/interface/leave.entity.interface.js

@@ -1,2 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.virtualEntityToKeysMap = void 0;
+const entity_utils_interface_1 = require("./entity.utils.interface");
+exports.virtualEntityToKeysMap = {
+    [entity_utils_interface_1.VirtualEntityEnum.LEAVE_COUNT]: [
+        "createdBy",
+        "createdOn",
+        "leaveId",
+        "period",
+        "updatedBy",
+        "updatedOn",
+        "count",
+        "id"
+    ],
+    [entity_utils_interface_1.VirtualEntityEnum.USER_LEAVE]: [
+        "createdBy",
+        "createdOn",
+        "id",
+        "leavesPending",
+        "leavesTaken",
+        "period",
+        "type",
+        "updatedBy",
+        "updatedOn",
+        "userId",
+    ],
+};

package/dist/src/entities/model/bank.entity.model.d.ts

@@ -0,0 +1,20 @@
+import { IBankApiEntity } from "../../api";
+import { BankStatusEnum } from "../enums/bank_status.enum";
+export declare class BankEntity implements IBankApiEntity {
+    id: number;
+    accountName: string;
+    organizationId: number;
+    name: string;
+    accountNo: string;
+    branchAddress: string;
+    ifscCode: string;
+    emailForPaymentInfoCsv: string;
+    status: BankStatusEnum;
+    remark?: string;
+    swiftAddress?: string;
+    createdBy: number;
+    updatedBy: number;
+    createdOn: string;
+    updatedOn: string;
+    static fromApiEntity(apiEntity: IBankApiEntity): BankEntity;
+}

package/dist/src/entities/model/bank.entity.model.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BankEntity = void 0;
+const bank_status_enum_1 = require("../enums/bank_status.enum");
+class BankEntity {
+    constructor() {
+        this.id = 0;
+        this.accountName = "";
+        this.organizationId = 0;
+        this.name = "";
+        this.accountNo = "";
+        this.branchAddress = "";
+        this.ifscCode = "";
+        this.emailForPaymentInfoCsv = "";
+        this.status = bank_status_enum_1.BankStatusEnum.CREATE_APPROVAL;
+        this.createdBy = 0;
+        this.updatedBy = 0;
+        this.createdOn = `${new Date()}`;
+        this.updatedOn = `${new Date()}`;
+    }
+    static fromApiEntity(apiEntity) {
+        const entity = new BankEntity();
+        Object.assign(entity, apiEntity);
+        return entity;
+    }
+}
+exports.BankEntity = BankEntity;

package/dist/src/entities/model/leave.entity.model.d.ts

@@ -19,6 +19,7 @@ export declare class LeaveEntityModel implements ILeaveEntity {
     updatedBy: number;
     private constructor();
     static fromEntity(data: ILeaveEntity): LeaveEntityModel;
+    isMoreThanOneDayLeave(): boolean;
     getLeaveDuration(excludeWeekdays?: Weekday[], excludeDates?: DateCodeModel[]): number;
     static getLeaveDuration(leaves: LeaveEntityModel[], excludeWeekdays?: Weekday[], excludeDates?: DateCodeModel[], leaveStatusEnum?: LeaveStatusEnum[]): number;
     getDateCodeModels(dateCodeIncludePredicates?: ((dateModel: DateCodeModel) => boolean)[], dateCodeExcludePredicates?: ((dateModel: DateCodeModel) => boolean)[]): DateCodeModel[];

package/dist/src/entities/model/leave.entity.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LeaveEntityModel = void 0;
 const utils_1 = require("../../utils");
+const duration_type_enum_1 = require("../enums/duration-type.enum");
 const leave_status_enum_1 = require("../enums/leave.status.enum");
 class LeaveEntityModel {
     constructor(data) {
@@ -22,10 +23,28 @@ class LeaveEntityModel {
     static fromEntity(data) {
         return new LeaveEntityModel(data);
     }
+    isMoreThanOneDayLeave() {
+        const fromDate = new utils_1.DateCodeModel(this.fromDate);
+        const toDate = new utils_1.DateCodeModel(this.toDate);
+        return fromDate.diffInDays(toDate) > 1;
+    }
     getLeaveDuration(excludeWeekdays = [], excludeDates = []) {
+        if (!this.isMoreThanOneDayLeave()) {
+            return this.durationType === duration_type_enum_1.DurationTypeEnum.FULL ? 1 : 0.5;
+        }
         const fromDate = new utils_1.DateCodeModel(this.fromDate);
         const toDate = new utils_1.DateCodeModel(this.toDate);
-        return fromDate.diffInDays(toDate, excludeWeekdays, excludeDates);
+        let count = fromDate.diffInDays(toDate, excludeWeekdays, excludeDates);
+        if (this.durationType === duration_type_enum_1.DurationTypeEnum.FULL) {
+            return count;
+        }
+        if (this.durationType === duration_type_enum_1.DurationTypeEnum.SECOND_FIRST) {
+            return count - 1;
+        }
+        if (this.durationType === duration_type_enum_1.DurationTypeEnum.FULL_FIRST || this.durationType === duration_type_enum_1.DurationTypeEnum.SECOND_FULL) {
+            return count - 0.5;
+        }
+        return count;
     }
     //   getLeaveDurationByPredicates(predicates: ((leave: LeaveEntityModel) => boolean)[]): number {
     //     const fromDate = new DateCodeModel(this.fromDate);

package/dist/src/utils/models/date-code.model.util.d.ts

@@ -36,4 +36,5 @@ export declare class DateCodeModel {
     getDateInIST(): Date;
     static getDaysInCurrentMonth(): number;
     getDaysInMonth(dateCode?: string): number;
+    isPresent(dateCodes: DateCodeModel[]): boolean;
 }

package/dist/src/utils/models/date-code.model.util.js

@@ -222,5 +222,8 @@ class DateCodeModel {
         // Number of days in that month
         return (0, date_fns_1.lastDayOfMonth)(date).getDate();
     }
+    isPresent(dateCodes) {
+        return dateCodes.some((d) => d.isSame(this));
+    }
 }
 exports.DateCodeModel = DateCodeModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "law-common",
-  "version": "10.17.1-beta.7",
+  "version": "10.18.1-beta.0",
   "description": "",
   "main": "dist/index.js",
   "files": [