From 505073e1c58270f467e9af52a05e770068652c0b Mon Sep 17 00:00:00 2001 From: Muhammad Rayhan Ardiansyah Date: Tue, 10 Mar 2026 10:39:21 +0700 Subject: [PATCH 01/12] fixing --- src/controllers/pharmacy/usage_instructions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/pharmacy/usage_instructions.ts b/src/controllers/pharmacy/usage_instructions.ts index 2d9cfd2..52ac896 100644 --- a/src/controllers/pharmacy/usage_instructions.ts +++ b/src/controllers/pharmacy/usage_instructions.ts @@ -180,7 +180,7 @@ export class UsageInstructionsController { const data = new UsageInstructions() data.usage_instructions_name = param.usage_instructions_name - data.usage_abbreviation = param.usage_instructions_abbreviation + data.usage_instructions_abbreviation = param.usage_instructions_abbreviation data.created_by = req.auth.data.name; await OrmHelper.DB.manager.save(data); @@ -236,7 +236,7 @@ export class UsageInstructionsController { if (data != null) { data.usage_instructions_name = param.usage_instructions_name - data.usage_abbreviation = param.usage_instructions_abbreviation + data.usage_instructions_abbreviation = param.usage_instructions_abbreviation data.updated_by = req.auth.data.name; await repo.save(data); From 5bae9e56f1d0fcfec5cb0183b0dd4458ab7b77af Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 11 Mar 2026 13:47:24 +0700 Subject: [PATCH 02/12] update add large unit and small unit for unit in pharmacy master data --- src/controllers/pharmacy/unit.ts | 4 ++++ src/swagger/builder.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/controllers/pharmacy/unit.ts b/src/controllers/pharmacy/unit.ts index e48b2cd..8b94b3d 100644 --- a/src/controllers/pharmacy/unit.ts +++ b/src/controllers/pharmacy/unit.ts @@ -179,6 +179,8 @@ export class UnitController { const data = new Unit() data.unit_name = param.unit_name + data.small_unit = param.small_unit + data.large_unit = param.large_unit data.created_by = req.auth.data.name await OrmHelper.DB.manager.save(data); @@ -233,6 +235,8 @@ export class UnitController { if (data != null) { data.unit_name = param.unit_name + data.small_unit = param.small_unit + data.large_unit = param.large_unit data.updated_by = req.auth.data.name await repo.save(data); diff --git a/src/swagger/builder.js b/src/swagger/builder.js index de99f7d..cd0888a 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -222,6 +222,8 @@ const doc = { }, unit: { $unit_name: 'Unit name', + $small_unit: 'Small unit name', + $large_unit: 'Large unit name' }, item_category: { $category_name: 'ItemCategory name', From a40161584e7b71336f26cb890ad62936f69cef3a Mon Sep 17 00:00:00 2001 From: Muhammad Rayhan Ardiansyah Date: Wed, 11 Mar 2026 14:53:20 +0700 Subject: [PATCH 03/12] fixing --- src/controllers/pharmacy/factory_to_supplier.ts | 10 +++------- src/controllers/pharmacy/item_master.ts | 4 ++++ src/model/factory_to_supplier.ts | 3 +-- src/routes/private.ts | 2 +- src/swagger/builder.js | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/controllers/pharmacy/factory_to_supplier.ts b/src/controllers/pharmacy/factory_to_supplier.ts index eea88af..c95f4de 100644 --- a/src/controllers/pharmacy/factory_to_supplier.ts +++ b/src/controllers/pharmacy/factory_to_supplier.ts @@ -14,11 +14,10 @@ import { FactoryToSupplierModel } from "../../model/factory_to_supplier"; const log: Logger = new Logger({ name: '[FactorytoSupplierController]', type: 'pretty' }); export class FactorytoSupplierController { - static async listFactorybySupplier(req: Request, res: Response, next: NextFunction): Promise { + static async list(req: Request, res: Response, next: NextFunction): Promise { /* #swagger.tags = ['Pharmacy - FactoryToSupplier'] #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['supplier_id'] = { in: 'query', required: true, type: 'string' } #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } @@ -28,7 +27,6 @@ export class FactorytoSupplierController { */ try { const schema = Joi.object().keys({ - supplier_id: Joi.string().uuid().required().label("Supplier ID"), filter: Joi.string().allow("").optional().label("Filter"), page: Joi.number().required().min(1).label("Page"), limit: Joi.number().required().min(1).label("Limit"), @@ -41,7 +39,7 @@ export class FactorytoSupplierController { let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; - var query = await FactoryToSupplierModel.listFactorybySupplier(param.supplier_id, filter); + var query = await FactoryToSupplierModel.list(filter); const offset = (param.page - 1) * param.limit; let limit = param.limit; @@ -76,7 +74,6 @@ export class FactorytoSupplierController { #swagger.security = [{ "bearerAuth": [] }] - #swagger.parameters['supplier_id'] = { in: 'query', required: true, type: 'string' } #swagger.parameters['filter'] = { description: 'Filter with 2 format :
  • Simple format use text plaint will filter eq:code or like %name%
  • Advance format using field existing {status:\'Y\', any:\'SAME AS PLAINT LOGIC\', etc...}
', in: 'query', @@ -102,7 +99,6 @@ export class FactorytoSupplierController { try { const schema = Joi.object().keys({ - supplier_id: Joi.string().uuid().required().label("Supplier ID"), filter: Joi.string().allow('').optional().label('Filter'), order_field: Joi.string().required().label('Order Field'), order_direction: Joi.string().allow('asc', 'desc').required().label('Order Direction'), @@ -112,7 +108,7 @@ export class FactorytoSupplierController { let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; - var query = await FactoryToSupplierModel.listFactorybySupplier(filter); + var query = await FactoryToSupplierModel.list(filter); const data = await query.getMany(); const filename = "factory_to_supplier.csv"; diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index aa197c9..c10ded8 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -177,6 +177,7 @@ export class ItemMasterController { item_type_detail_id: Joi.string().uuid().required().label('Item Type Detail ID'), item_category_id: Joi.string().uuid().required().label('Item Category ID'), item_class_id: Joi.string().uuid().required().label('Item Class ID'), + item_class_detail_id: Joi.string().uuid().required().label('Item Class Detail ID'), item_status_id: Joi.string().uuid().required().label('Item Status ID'), factory_id: Joi.string().uuid().required().label('Factory ID'), unit_id: Joi.string().uuid().required().label('Unit ID'), @@ -195,6 +196,7 @@ export class ItemMasterController { data.type_detail = param.item_type_detail_id, data.category = param.item_category_id, data.item_class = param.item_class_id, + data.item_class_detail = param.item_class_id, data.status = param.item_status_id, data.factory = param.factory_id, data.unit = param.unit_id, @@ -249,6 +251,7 @@ export class ItemMasterController { item_type_detail_id: Joi.string().uuid().required().label('Item Type Detail ID'), item_category_id: Joi.string().uuid().required().label('Item Category ID'), item_class_id: Joi.string().uuid().required().label('Item Class ID'), + item_class_detail_id: Joi.string().uuid().required().label('Item Class Detail ID'), item_status_id: Joi.string().uuid().required().label('Item Status ID'), factory_id: Joi.string().uuid().required().label('Factory ID'), unit_id: Joi.string().uuid().required().label('Unit ID'), @@ -273,6 +276,7 @@ export class ItemMasterController { data.type_detail = param.item_type_detail_id, data.category = param.item_category_id, data.item_class = param.item_class_id, + data.item_class_detail = param.item_class_id, data.status = param.item_status_id, data.factory = param.factory_id, data.unit = param.unit_id, diff --git a/src/model/factory_to_supplier.ts b/src/model/factory_to_supplier.ts index 32a4490..410ca70 100644 --- a/src/model/factory_to_supplier.ts +++ b/src/model/factory_to_supplier.ts @@ -4,7 +4,7 @@ import { OrmHelper } from "../helpers/orm"; import { FactoryToSupplier } from "entity"; export class FactoryToSupplierModel { - static async listFactorybySupplier(supplier_id: string, filter = {}): Promise> { + static async list(filter = {}): Promise> { const repo = OrmHelper.DB.getRepository(FactoryToSupplier); let whereAttr: string[] = []; let whereVal: any = {}; @@ -16,7 +16,6 @@ export class FactoryToSupplierModel { var query = repo.createQueryBuilder("factory_to_supplier") .leftJoinAndSelect("factory_to_supplier.factory", "factory") .leftJoinAndSelect("factory_to_supplier.supplier", "supplier") - .where("factory_to_supplier.supplier_id = :supplierId", { supplierId: supplier_id }); if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); } diff --git a/src/routes/private.ts b/src/routes/private.ts index 74ff9c6..fc2173a 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -337,7 +337,7 @@ export class RoutePrivate { app.delete('/api/pharmacy/supplier/delete/:id/:hard', SupplierController.delete) app.put('/api/pharmacy/supplier/restore/:id', SupplierController.restore) - app.get('/api/pharmacy/factory-to-supplier/list-factory-by-supplier', FactorytoSupplierController.listFactorybySupplier) + app.get('/api/pharmacy/factory-to-supplier/list', FactorytoSupplierController.list) app.get('/api/pharmacy/factory-to-supplier/export', FactorytoSupplierController.export) app.post('/api/pharmacy/factory-to-supplier/create', FactorytoSupplierController.create) app.put('/api/pharmacy/factory-to-supplier/update/:supplier_id', FactorytoSupplierController.update) diff --git a/src/swagger/builder.js b/src/swagger/builder.js index cd0888a..52db881 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -271,6 +271,7 @@ const doc = { $item_type_detail_id: 'Item type detail ID (UUID)', $item_category_id: 'Item category ID (UUID)', $item_class_id: 'Item class ID (UUID)', + $item_class_detail_id: 'Item class Detail ID (UUID)', $item_status_id: 'Item status ID (UUID)', $factory_id: 'Factory ID (UUID)', $unit_id: 'Unit ID (UUID)', From 143c80ef520ecd68d84a2714f61904ba5fa4b215 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 11 Mar 2026 15:35:35 +0700 Subject: [PATCH 04/12] update --- src/controllers/pharmacy/item_master.ts | 71 ++++++++++++++++--------- src/controllers/pharmacy/unit.ts | 6 ++- src/routes/private.ts | 1 + 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index aa197c9..c7cc8cb 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -68,6 +68,27 @@ export class ItemMasterController { } } + + static async option(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Pharmacy - ItemMaster'] + #swagger.security = [{ "bearerAuth": [] }] + */ + try { + const query = await ItemMasterModel.list(); // ← hapus await disini, karena list() return QueryBuilder + + const total_count_data = await query.getCount(); + const list_data = await query.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, 1, total_count_data, list_data); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } + static async export(req: Request, res: Response, next: NextFunction): Promise { /* #swagger.tags = ['Pharmacy - ItemMaster'] @@ -110,7 +131,7 @@ export class ItemMasterController { var query = await ItemMasterModel.list(filter); const data = await query.getMany(); - + const filename = "item_master.csv"; res.setHeader('Content-Type', 'text/csv'); @@ -191,18 +212,18 @@ export class ItemMasterController { const data = new ItemMaster() data.item_name = param.item_name, - data.generic_name = param.generic_name_id, - data.type_detail = param.item_type_detail_id, - data.category = param.item_category_id, - data.item_class = param.item_class_id, - data.status = param.item_status_id, - data.factory = param.factory_id, - data.unit = param.unit_id, - data.pack_size = param.pack_size, - data.minimum_quantity = param.minimum_quantity, - data.minimum_sales_quantity = param.minimum_sales_quantity, - data.strength = param.strength, - data.active = param.active + data.generic_name = param.generic_name_id, + data.type_detail = param.item_type_detail_id, + data.category = param.item_category_id, + data.item_class = param.item_class_id, + data.status = param.item_status_id, + data.factory = param.factory_id, + data.unit = param.unit_id, + data.pack_size = param.pack_size, + data.minimum_quantity = param.minimum_quantity, + data.minimum_sales_quantity = param.minimum_sales_quantity, + data.strength = param.strength, + data.active = param.active data.created_by = req.auth.data.name; await OrmHelper.DB.manager.save(data); @@ -269,18 +290,18 @@ export class ItemMasterController { if (data != null) { data.item_name = param.item_name, - data.generic_name = param.generic_name_id, - data.type_detail = param.item_type_detail_id, - data.category = param.item_category_id, - data.item_class = param.item_class_id, - data.status = param.item_status_id, - data.factory = param.factory_id, - data.unit = param.unit_id, - data.pack_size = param.pack_size, - data.minimum_quantity = param.minimum_quantity, - data.minimum_sales_quantity = param.minimum_sales_quantity, - data.strength = param.strength, - data.active = param.active + data.generic_name = param.generic_name_id, + data.type_detail = param.item_type_detail_id, + data.category = param.item_category_id, + data.item_class = param.item_class_id, + data.status = param.item_status_id, + data.factory = param.factory_id, + data.unit = param.unit_id, + data.pack_size = param.pack_size, + data.minimum_quantity = param.minimum_quantity, + data.minimum_sales_quantity = param.minimum_sales_quantity, + data.strength = param.strength, + data.active = param.active data.updated_by = req.auth.data.name; await repo.save(data); diff --git a/src/controllers/pharmacy/unit.ts b/src/controllers/pharmacy/unit.ts index 8b94b3d..8f2ef92 100644 --- a/src/controllers/pharmacy/unit.ts +++ b/src/controllers/pharmacy/unit.ts @@ -110,7 +110,7 @@ export class UnitController { var query = await UnitModel.list(filter); const data = await query.getMany(); - + const filename = "unit.csv"; res.setHeader('Content-Type', 'text/csv'); @@ -173,6 +173,8 @@ export class UnitController { try { const schema = Joi.object().keys({ unit_name: Joi.string().max(256).required().label('Name'), + small_unit: Joi.string().max(256).optional().allow('').label('Small Unit'), + large_unit: Joi.string().max(256).optional().allow('').label('Large Unit'), }); const param: any = await schema.validateAsync(req.body); @@ -223,6 +225,8 @@ export class UnitController { const schema = Joi.object().keys({ id: Joi.string().uuid().required().label('ID'), unit_name: Joi.string().max(256).required().label('Name'), + small_unit: Joi.string().max(256).optional().allow('').label('Small Unit'), + large_unit: Joi.string().max(256).optional().allow('').label('Large Unit'), }); req.body.id = req.params['id']; diff --git a/src/routes/private.ts b/src/routes/private.ts index 74ff9c6..c1e530e 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -345,6 +345,7 @@ export class RoutePrivate { // app.put('/api/pharmacy/factory-to-supplier/restore/:supplier_id', FactorytoSupplierController.restore) app.get('/api/pharmacy/item-master/list', ItemMasterController.list) + app.get('/api/pharmacy/item-master/option', ItemMasterController.option) app.get('/api/pharmacy/item-master/export', ItemMasterController.export) app.post('/api/pharmacy/item-master/create', ItemMasterController.create) app.put('/api/pharmacy/item-master/update/:id', ItemMasterController.update) From b62677f30b69d3f352671223d2b2b34e70c867f7 Mon Sep 17 00:00:00 2001 From: Muhammad Rayhan Ardiansyah Date: Wed, 11 Mar 2026 16:12:48 +0700 Subject: [PATCH 05/12] fixing --- src/controllers/pharmacy/factory_to_supplier.ts | 7 +++++++ src/controllers/pharmacy/item_master.ts | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/controllers/pharmacy/factory_to_supplier.ts b/src/controllers/pharmacy/factory_to_supplier.ts index c95f4de..9560426 100644 --- a/src/controllers/pharmacy/factory_to_supplier.ts +++ b/src/controllers/pharmacy/factory_to_supplier.ts @@ -190,6 +190,13 @@ export class FactorytoSupplierController { const factoryRepo = OrmHelper.DB.getRepository(Factory); const supplierRepo = OrmHelper.DB.getRepository(Supplier); + await factoryToSupplierRepo + .createQueryBuilder() + .delete() + .from(FactoryToSupplier) + .where("supplier_id = :supplierId", { supplierId: param.supplier_id }) + .execute(); + let relation : FactoryToSupplier; for (const factoryId of param.factory_ids) { relation = new FactoryToSupplier(); diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index c10ded8..5b746cf 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -196,7 +196,7 @@ export class ItemMasterController { data.type_detail = param.item_type_detail_id, data.category = param.item_category_id, data.item_class = param.item_class_id, - data.item_class_detail = param.item_class_id, + data.item_class_detail = param.item_class_detail_id, data.status = param.item_status_id, data.factory = param.factory_id, data.unit = param.unit_id, @@ -276,7 +276,7 @@ export class ItemMasterController { data.type_detail = param.item_type_detail_id, data.category = param.item_category_id, data.item_class = param.item_class_id, - data.item_class_detail = param.item_class_id, + data.item_class_detail = param.item_class_detail_id, data.status = param.item_status_id, data.factory = param.factory_id, data.unit = param.unit_id, From 3363cd225c7d822b78d02f31dfda8ea8433591e3 Mon Sep 17 00:00:00 2001 From: Muhammad Rayhan Ardiansyah Date: Wed, 11 Mar 2026 16:14:16 +0700 Subject: [PATCH 06/12] fixing --- src/routes/private.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/private.ts b/src/routes/private.ts index 4ca0bae..f1783bc 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -340,7 +340,7 @@ export class RoutePrivate { app.get('/api/pharmacy/factory-to-supplier/list', FactorytoSupplierController.list) app.get('/api/pharmacy/factory-to-supplier/export', FactorytoSupplierController.export) app.post('/api/pharmacy/factory-to-supplier/create', FactorytoSupplierController.create) - app.put('/api/pharmacy/factory-to-supplier/update/:supplier_id', FactorytoSupplierController.update) + // app.put('/api/pharmacy/factory-to-supplier/update/:supplier_id', FactorytoSupplierController.update) // app.delete('/api/pharmacy/factory-to-supplier/delete/:supplier_id/:hard', FactorytoSupplierController.delete) // app.put('/api/pharmacy/factory-to-supplier/restore/:supplier_id', FactorytoSupplierController.restore) From 8264f692de32ec667cb8743a0d938c9c7e1105fd Mon Sep 17 00:00:00 2001 From: Muhammad Rayhan Ardiansyah Date: Wed, 11 Mar 2026 16:38:10 +0700 Subject: [PATCH 07/12] fixing --- src/model/item_master.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/item_master.ts b/src/model/item_master.ts index 592d035..f76c3bb 100644 --- a/src/model/item_master.ts +++ b/src/model/item_master.ts @@ -19,7 +19,7 @@ export class ItemMasterModel { .leftJoinAndSelect("item_master.type_detail", "type_detail") .leftJoinAndSelect("item_master.category", "category") .leftJoinAndSelect("item_master.item_class", "item_class") - .leftJoinAndSelect("item_master.class_detail", "class_detail") + .leftJoinAndSelect("item_master.item_class_detail", "item_class_detail") .leftJoinAndSelect("item_master.status", "status") .leftJoinAndSelect("item_master.factory", "factory") .leftJoinAndSelect("item_master.unit", "unit") From 1cc0dba1c5954fc59212f9bbbfc4523fe1d8c7a7 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Wed, 11 Mar 2026 22:41:14 +0700 Subject: [PATCH 08/12] update: add option for order pharmacy --- src/controllers/pharmacy/item_master.ts | 61 ++++++++++++++----------- src/controllers/pharmacy/item_origin.ts | 27 ++++++++++- src/controllers/pharmacy/supplier.ts | 27 ++++++++++- src/controllers/room.ts | 37 ++++++++++++--- src/routes/private.ts | 3 ++ 5 files changed, 120 insertions(+), 35 deletions(-) diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index 7cbc99a..92c2f6c 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -75,7 +75,14 @@ export class ItemMasterController { #swagger.security = [{ "bearerAuth": [] }] */ try { - const query = await ItemMasterModel.list(); // ← hapus await disini, karena list() return QueryBuilder + const query = await ItemMasterModel.list(); + + query.select([ + "item_master.item_name", + "unit.large_unit", + "unit.small_unit", + "item_master.pack_size", + ]); const total_count_data = await query.getCount(); const list_data = await query.getMany(); @@ -213,19 +220,19 @@ export class ItemMasterController { const data = new ItemMaster() data.item_name = param.item_name, - data.generic_name = param.generic_name_id, - data.type_detail = param.item_type_detail_id, - data.category = param.item_category_id, - data.item_class = param.item_class_id, - data.item_class_detail = param.item_class_detail_id, - data.status = param.item_status_id, - data.factory = param.factory_id, - data.unit = param.unit_id, - data.pack_size = param.pack_size, - data.minimum_quantity = param.minimum_quantity, - data.minimum_sales_quantity = param.minimum_sales_quantity, - data.strength = param.strength, - data.active = param.active + data.generic_name = param.generic_name_id, + data.type_detail = param.item_type_detail_id, + data.category = param.item_category_id, + data.item_class = param.item_class_id, + data.item_class_detail = param.item_class_detail_id, + data.status = param.item_status_id, + data.factory = param.factory_id, + data.unit = param.unit_id, + data.pack_size = param.pack_size, + data.minimum_quantity = param.minimum_quantity, + data.minimum_sales_quantity = param.minimum_sales_quantity, + data.strength = param.strength, + data.active = param.active data.created_by = req.auth.data.name; await OrmHelper.DB.manager.save(data); @@ -293,19 +300,19 @@ export class ItemMasterController { if (data != null) { data.item_name = param.item_name, - data.generic_name = param.generic_name_id, - data.type_detail = param.item_type_detail_id, - data.category = param.item_category_id, - data.item_class = param.item_class_id, - data.item_class_detail = param.item_class_detail_id, - data.status = param.item_status_id, - data.factory = param.factory_id, - data.unit = param.unit_id, - data.pack_size = param.pack_size, - data.minimum_quantity = param.minimum_quantity, - data.minimum_sales_quantity = param.minimum_sales_quantity, - data.strength = param.strength, - data.active = param.active + data.generic_name = param.generic_name_id, + data.type_detail = param.item_type_detail_id, + data.category = param.item_category_id, + data.item_class = param.item_class_id, + data.item_class_detail = param.item_class_detail_id, + data.status = param.item_status_id, + data.factory = param.factory_id, + data.unit = param.unit_id, + data.pack_size = param.pack_size, + data.minimum_quantity = param.minimum_quantity, + data.minimum_sales_quantity = param.minimum_sales_quantity, + data.strength = param.strength, + data.active = param.active data.updated_by = req.auth.data.name; await repo.save(data); diff --git a/src/controllers/pharmacy/item_origin.ts b/src/controllers/pharmacy/item_origin.ts index cfddcca..e60aff2 100644 --- a/src/controllers/pharmacy/item_origin.ts +++ b/src/controllers/pharmacy/item_origin.ts @@ -68,6 +68,31 @@ export class ItemOriginController { } } + static async option(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Pharmacy - ItemOrigin'] + #swagger.security = [{ "bearerAuth": [] }] + */ + try { + const query = await ItemOriginModel.list(); + + query.select([ + "item_origin.id", + "item_origin.origin_name", + ]); + + const total_count_data = await query.getCount(); + const list_data = await query.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, 1, total_count_data, list_data); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } + static async export(req: Request, res: Response, next: NextFunction): Promise { /* #swagger.tags = ['Pharmacy - ItemOrigin'] @@ -110,7 +135,7 @@ export class ItemOriginController { var query = await ItemOriginModel.list(filter); const data = await query.getMany(); - + const filename = "item_origin.csv"; res.setHeader('Content-Type', 'text/csv'); diff --git a/src/controllers/pharmacy/supplier.ts b/src/controllers/pharmacy/supplier.ts index f3efd11..21c3240 100644 --- a/src/controllers/pharmacy/supplier.ts +++ b/src/controllers/pharmacy/supplier.ts @@ -68,6 +68,31 @@ export class SupplierController { } } + static async option(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Pharmacy - Supplier'] + #swagger.security = [{ "bearerAuth": [] }] + */ + try { + const query = await SupplierModel.list(); + + query.select([ + "supplier.id", + "supplier.supplier_name", + ]); + + const total_count_data = await query.getCount(); + const list_data = await query.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, 1, total_count_data, list_data); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } + static async export(req: Request, res: Response, next: NextFunction): Promise { /* #swagger.tags = ['Pharmacy - Supplier'] @@ -110,7 +135,7 @@ export class SupplierController { var query = await SupplierModel.list(filter); const data = await query.getMany(); - + const filename = "supplier.csv"; res.setHeader('Content-Type', 'text/csv'); diff --git a/src/controllers/room.ts b/src/controllers/room.ts index 3787ef5..34ab3c7 100644 --- a/src/controllers/room.ts +++ b/src/controllers/room.ts @@ -71,14 +71,39 @@ export class RoomController { const total_count_data = await res_count.getCount(); const list_data = await res_list.getMany(); const mapped_data = list_data.map((item: any) => ({ - ...item, - picture: item.picture - ? photoBaseUrl + item.picture - : null - })); + ...item, + picture: item.picture + ? photoBaseUrl + item.picture + : null + })); const count_data = CommonHelper.countObject(list_data); - return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, mapped_data); + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, mapped_data); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } + + static async option(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Room'] + #swagger.security = [{ "bearerAuth": [] }] + */ + try { + const query = await RoomModel.list(); + + query.select([ + "Room.id", + "Room.room", + ]); + + const total_count_data = await query.getCount(); + const list_data = await query.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, 1, total_count_data, list_data); } catch (e: unknown) { log.error(e); const err = e as Error; diff --git a/src/routes/private.ts b/src/routes/private.ts index f1783bc..1b11a1f 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -130,6 +130,7 @@ export class RoutePrivate { app.put('/api/diagnostic-procedure/restore/:id', DiagnosticProcedureController.restore) app.get('/api/room/list', RoomController.list) + app.get('/api/room/option', RoomController.option) app.post('/api/room/create', RoomController.create) app.get('/api/room/detail/:id', RoomController.detail) app.put('/api/room/update/:id', RoomController.update) @@ -247,6 +248,7 @@ export class RoutePrivate { app.put('/api/pharmacy/item-group/restore/:id', ItemGroupController.restore) app.get('/api/pharmacy/item-origin/list', ItemOriginController.list) + app.get('/api/pharmacy/item-origin/option', ItemOriginController.option) app.get('/api/pharmacy/item-origin/export', ItemOriginController.export) app.post('/api/pharmacy/item-origin/create', ItemOriginController.create) app.put('/api/pharmacy/item-origin/update/:id', ItemOriginController.update) @@ -331,6 +333,7 @@ export class RoutePrivate { app.put('/api/pharmacy/factory/restore/:id', FactoryController.restore) app.get('/api/pharmacy/supplier/list', SupplierController.list) + app.get('/api/pharmacy/supplier/option', SupplierController.option) app.get('/api/pharmacy/supplier/export', SupplierController.export) app.post('/api/pharmacy/supplier/create', SupplierController.create) app.put('/api/pharmacy/supplier/update/:id', SupplierController.update) From b426f0ad83a016c22b258df29e759fda0244a40a Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 12 Mar 2026 12:09:59 +0700 Subject: [PATCH 09/12] update: add new module inital stock --- src/controllers/pharmacy/initial_stock.ts | 138 ++++++++++++++++++++++ src/helpers/orm.ts | 5 +- src/model/initial_stock.ts | 23 ++++ src/routes/private.ts | 4 + src/swagger/builder.js | 7 ++ 5 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 src/controllers/pharmacy/initial_stock.ts create mode 100644 src/model/initial_stock.ts diff --git a/src/controllers/pharmacy/initial_stock.ts b/src/controllers/pharmacy/initial_stock.ts new file mode 100644 index 0000000..bfcca11 --- /dev/null +++ b/src/controllers/pharmacy/initial_stock.ts @@ -0,0 +1,138 @@ +import { Response, NextFunction, Application } from "express"; +import { Request } from "express-jwt"; +import { ReturnHelper } from "../../helpers/express/return"; +import { OrmHelper } from "../../helpers/orm"; +import Joi from "joi"; +import { ILogObj, Logger } from "tslog"; +import { Language } from "../../langs/lang"; +import { InitialStock, ItemMaster, Room, ItemOrigin, Paging } from "entity"; +import CommonHelper from "../../helpers/common"; +import * as fastcsv from 'fast-csv'; +import dayjs from "dayjs"; +import { InitialStockModel } from "../../model/initial_stock"; + +const log: Logger = new Logger({ name: '[InitialStockController]', type: 'pretty' }); + +export class InitialStockController { + static async list(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Pharmacy - InitialStock'] + #swagger.security = [{ "bearerAuth": [] }] + #swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' } + #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } + #swagger.parameters['with_deleted'] = { in: 'query', required: true, type: 'boolean' } + #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' } + #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } } + */ + try { + const schema = Joi.object().keys({ + filter: Joi.string().allow("").optional().label("Filter"), + page: Joi.number().required().min(1).label("Page"), + limit: Joi.number().required().min(1).label("Limit"), + with_deleted: Joi.bool().required().label("With Deleted"), + order_field: Joi.string().required().label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"), + }); + + let param: any = await schema.validateAsync(req.query); + + let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + + var query = await InitialStockModel.list(filter); + + const offset = (param.page - 1) * param.limit; + let limit = param.limit; + + const res_count = query; + const res_list = query.select([ + 'InitialStock.id', + 'InitialStock.exp_date', + 'ItemMaster.item_name', + 'Room.room', + 'ItemOrigin.origin_name', + ]) + .leftJoin("InitialStock.itemmaster", "ItemMaster") + .leftJoin("InitialStock.room", "Room") + .leftJoin("InitialStock.itemorigin", "ItemOrigin") + .orderBy("InitialStock." + param.order_field, param.order_direction) + .offset(offset) + .limit(limit); + + if (param.with_deleted) { + res_count.withDeleted(); + res_list.withDeleted(); + } + + const current_page = param.page; + const total_count_data = await res_count.getCount(); + const list_data = await res_list.getMany(); + const count_data = CommonHelper.countObject(list_data); + + return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data); + } catch (e: unknown) { + log.error(e); + const err = e as Error; + return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_view, err.message); + } + } + + static async create(req: Request, res: Response, next: NextFunction): Promise { + /* + #swagger.tags = ['Pharmacy - InitialStock'] + #swagger.security = [{ + "bearerAuth": [] + }] + + #swagger.requestBody = { + required: true, + content: { + "application/json": { + schema: { + $ref: "#/components/schemas/initial_stock" + } + } + } + } + */ + const queryRunner = OrmHelper.DB.createQueryRunner(); + await queryRunner.startTransaction(); + try { + const schema = Joi.object().keys({ + itemmaster: Joi.string().uuid().required().label("Item Master ID"), + room: Joi.string().uuid().required().label("Room ID"), + itemorigin: Joi.string().uuid().required().label("Item Origin ID"), + batch: Joi.string().required().label("Batch"), + exp_date: Joi.date().required().label("Exp Date"), + }); + + const param: any = await schema.validateAsync(req.body); + + const itemmaster = OrmHelper.DB.getRepository(ItemMaster).findOneBy({ id: param.itemmaster }); + const room = OrmHelper.DB.getRepository(Room).findOneBy({ id: param.room }) + const itemorigin = OrmHelper.DB.getRepository(ItemOrigin).findOneBy({ id: param.itemorigin }); + + if (!itemmaster) throw { message: "Item Master not found" }; + if (!room) throw { message: "Room not found" }; + if (!itemorigin) throw { message: "Item Origin not found" }; + + const initial_stock = new InitialStock(); + initial_stock.itemmaster = param.itemmaster; + initial_stock.room = param.room; + initial_stock.itemorigin = param.itemorigin; + initial_stock.batch = param.batch; + initial_stock.exp_date = param.exp_date; + + await queryRunner.manager.save(initial_stock); + await queryRunner.commitTransaction(); + + return ReturnHelper.successResponseAny(res, 200, Language.lang.success_insert, initial_stock); + + } catch (e: unknown) { + log.error(e); + const err = e as Error; + + return ReturnHelper.errorResponse(res, 500, 401, Language.lang.failed_insert, err.message); + } + } +} \ No newline at end of file diff --git a/src/helpers/orm.ts b/src/helpers/orm.ts index cc89ebb..8e304f4 100644 --- a/src/helpers/orm.ts +++ b/src/helpers/orm.ts @@ -1,7 +1,7 @@ import config from 'config'; import { DataSource } from "typeorm"; import { ILogObj, Logger } from 'tslog'; -import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift,HospitalInformation, ItemOrigin, ItemType, ItemTypeDetail, Unit, ItemCategory, ItemStatus, UsageInstructions, UsageTime, ItemClass, ItemClassDetail, GenericName, Factory, Supplier, FactoryToSupplier, ItemMaster, ItemGroup, PharmacyInfo, ItemPrice, SellingPricePercentage, PatientGroup, PatientGuarantor } from 'entity' +import { Administrativu, Aldeia, District, Menu, Munisipo, Suco, Application, Nationality, Diagnosis, DiagnosticProcedure, Room, ServiceType, ServiceClass, Service, ServiceFare, ServicePackage, Department, DoctorSchedule, MeasurementUnit, ReferenceRange, QueueMonitoring, ExaminationDetail, ExaminationType, User, UserRole, HrmsEmployee, HrmsDepartment, HrmsPosition, HrmsShift,HospitalInformation, ItemOrigin, ItemType, ItemTypeDetail, Unit, ItemCategory, ItemStatus, UsageInstructions, UsageTime, ItemClass, ItemClassDetail, GenericName, Factory, Supplier, FactoryToSupplier, ItemMaster, ItemGroup, PharmacyInfo, ItemPrice, SellingPricePercentage, PatientGroup, PatientGuarantor,InitialStock } from 'entity' export class OrmHelper { static DB: DataSource = null @@ -40,7 +40,8 @@ export class OrmHelper { ItemPrice, SellingPricePercentage, PatientGroup, - PatientGuarantor + PatientGuarantor, + InitialStock ], subscribers: [], migrations: [], diff --git a/src/model/initial_stock.ts b/src/model/initial_stock.ts new file mode 100644 index 0000000..4ea9cdf --- /dev/null +++ b/src/model/initial_stock.ts @@ -0,0 +1,23 @@ +import { InitialStock } from "entity"; +import { SelectQueryBuilder } from "typeorm"; +import CommonHelper from "../helpers/common"; +import { OrmHelper } from "../helpers/orm"; + +export class InitialStockModel { + static async list(filter = {}): Promise> { + const repo = OrmHelper.DB.getRepository(InitialStock); + let whereAttr: string[] = []; + let whereVal: any = {}; + if (filter && Object.keys(filter).length > 0) { + whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter, "InitialStock").whereAttr]; + whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter, "InitialStock").whereVal }; + } + + var query = repo.createQueryBuilder("InitialStock"); + if (whereAttr.length != 0) { + query = query.where(whereAttr.join(" and "), whereVal); + } + + return query; + } +} \ No newline at end of file diff --git a/src/routes/private.ts b/src/routes/private.ts index 1b11a1f..4db2044 100644 --- a/src/routes/private.ts +++ b/src/routes/private.ts @@ -51,6 +51,7 @@ import { PatientGuarantorController } from '../controllers/patient_guarantor'; import { GenericNameController } from '../controllers/pharmacy/generic_name'; import { RefferalHospital } from 'entity'; import { RefferalHospitalController } from '../controllers/refferal_hospital'; +import { InitialStockController } from '../controllers/pharmacy/initial_stock'; export class RoutePrivate { static setup(app: express.Application) { @@ -399,5 +400,8 @@ export class RoutePrivate { app.put('/api/refferal-hospital/update/:id', RefferalHospitalController.update) app.delete('/api/refferal-hospital/delete/:id/:hard', RefferalHospitalController.delete) app.put('/api/refferal-hospital/restore/:id', RefferalHospitalController.restore) + + app.get('/api/initial-stock/list', InitialStockController.list) + app.post('/api/initial-stock/create', InitialStockController.create) } } \ No newline at end of file diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 52db881..6d4f397 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -298,6 +298,13 @@ const doc = { $selling_price: 'Selling Price (required, number, minimum 0)', $expired_date: 'Expired Date (required, date)' }, + initial_stock: { + $itemmaster: 'Item Master uuid', + $room: 'Room uuid', + $itemorigin: 'Item Origin uuid', + $batch: 'Batch', + $exp_date: 'Exp Date', + }, selling_price_percentage: { $item_master_id: 'Item Master ID (required, UUID)', $item_origin_id: 'Item Origin ID (required, UUID)', From 3f23e3e3197818d3c5191876f65dea5a41ff7a34 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 12 Mar 2026 12:16:04 +0700 Subject: [PATCH 10/12] update --- src/controllers/pharmacy/initial_stock.ts | 3 +++ src/swagger/builder.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/controllers/pharmacy/initial_stock.ts b/src/controllers/pharmacy/initial_stock.ts index bfcca11..bc5b7ef 100644 --- a/src/controllers/pharmacy/initial_stock.ts +++ b/src/controllers/pharmacy/initial_stock.ts @@ -48,6 +48,7 @@ export class InitialStockController { const res_list = query.select([ 'InitialStock.id', 'InitialStock.exp_date', + 'InitialStock.stock', 'ItemMaster.item_name', 'Room.room', 'ItemOrigin.origin_name', @@ -104,6 +105,7 @@ export class InitialStockController { itemorigin: Joi.string().uuid().required().label("Item Origin ID"), batch: Joi.string().required().label("Batch"), exp_date: Joi.date().required().label("Exp Date"), + stock: Joi.number().required().label("Stock"), }); const param: any = await schema.validateAsync(req.body); @@ -122,6 +124,7 @@ export class InitialStockController { initial_stock.itemorigin = param.itemorigin; initial_stock.batch = param.batch; initial_stock.exp_date = param.exp_date; + initial_stock.stock = param.stock; await queryRunner.manager.save(initial_stock); await queryRunner.commitTransaction(); diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 6d4f397..00dea49 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -304,6 +304,7 @@ const doc = { $itemorigin: 'Item Origin uuid', $batch: 'Batch', $exp_date: 'Exp Date', + $stock: 'Stock' }, selling_price_percentage: { $item_master_id: 'Item Master ID (required, UUID)', From aa9ec4bc067c89eb6041de782f9363edd01c5c5b Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 12 Mar 2026 13:44:46 +0700 Subject: [PATCH 11/12] update --- src/controllers/pharmacy/initial_stock.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/pharmacy/initial_stock.ts b/src/controllers/pharmacy/initial_stock.ts index bc5b7ef..3b44b48 100644 --- a/src/controllers/pharmacy/initial_stock.ts +++ b/src/controllers/pharmacy/initial_stock.ts @@ -103,7 +103,7 @@ export class InitialStockController { itemmaster: Joi.string().uuid().required().label("Item Master ID"), room: Joi.string().uuid().required().label("Room ID"), itemorigin: Joi.string().uuid().required().label("Item Origin ID"), - batch: Joi.string().required().label("Batch"), + batch: Joi.string().label("Batch"), exp_date: Joi.date().required().label("Exp Date"), stock: Joi.number().required().label("Stock"), }); From 4148cc77ad5a5f9fb6a8c4ad70625c4de59818a1 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Fri, 13 Mar 2026 09:36:15 +0700 Subject: [PATCH 12/12] update: add id in option item master --- src/controllers/pharmacy/item_master.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index 92c2f6c..472aa14 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -78,6 +78,7 @@ export class ItemMasterController { const query = await ItemMasterModel.list(); query.select([ + "item_master.id", "item_master.item_name", "unit.large_unit", "unit.small_unit",