TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: change province, ward,subdistrict, city to tl administration

Browse Source
This commit is contained in:
wayanrivan
2026-04-26 10:50:37 +07:00
parent d40838eb51
commit 2a33abd39a
5 changed files with 137 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/controllers/pharmacy/pharmacy_info.ts
View File

@ -251,10 +251,10 @@ export class PharmacyInfoController {
.required()
.label('Default Room'),
province: Joi.string().allow("").optional().label("Province Code"),
city: Joi.string().allow("").optional().label("City Code"),
subdistrict: Joi.string().allow("").optional().label("Subdistrict Code"),
ward: Joi.string().allow("").optional().label("Ward Code"),
// province: Joi.string().allow("").optional().label("Province Code"),
// city: Joi.string().allow("").optional().label("City Code"),
// subdistrict: Joi.string().allow("").optional().label("Subdistrict Code"),
// ward: Joi.string().allow("").optional().label("Ward Code"),
});
const param: any = await schema.validateAsync(req.body);
@ -262,17 +262,17 @@ export class PharmacyInfoController {
const data = new PharmacyInfo()
data.name = param.name,
data.address = param.address
// data.munisipiu = param.munisipiu,
// data.postu_admin = param.postu_admin
// data.suco = param.suco
// data.aldeia = param.aldeia
data.munisipiu = param.munisipiu,
data.postu_admin = param.postu_admin
data.suco = param.suco
data.aldeia = param.aldeia
data.phone = param.phone
data.default_room = param.default_room_id
data.logo = param.logo
data.province = param.province
data.city = param.city
data.subdistrict = param.subdistrict
data.ward = param.ward
// data.province = param.province
// data.city = param.city
// data.subdistrict = param.subdistrict
// data.ward = param.ward
data.created_by = req.auth?.data.name;
await OrmHelper.DB.manager.save(data);
@ -329,21 +329,42 @@ export class PharmacyInfoController {
.required()
.label('Address'),
province: Joi.string()
.allow("", null)
.label('Province'),
munisipiu: Joi.string()
.uuid()
.required()
.label('Munisipiu'),
city: Joi.string()
.allow("", null)
.label('City'),
postu_admin: Joi.string()
.uuid()
.required()
.label('Postu Admin'),
subdistrict: Joi.string()
.allow("", null)
.label('Subdistrict'),
suco: Joi.string()
.uuid()
.required()
.label('Suco'),
ward: Joi.string()
.allow("", null)
.label('Ward'),
aldeia: Joi.string()
.uuid()
.required()
.label('Aldeia'),
// province: Joi.string()
// .allow("", null)
// .label('Province'),
// city: Joi.string()
// .allow("", null)
// .label('City'),
// subdistrict: Joi.string()
// .allow("", null)
// .label('Subdistrict'),
// ward: Joi.string()
// .allow("", null)
// .label('Ward'),
});
req.body.id = req.params['id'];
@ -357,17 +378,17 @@ export class PharmacyInfoController {
if (data != null) {
data.name = param.name,
data.address = param.address
// data.munisipiu = param.munisipiu,
// data.postu_admin = param.postu_admin
// data.suco = param.suco
// data.aldeia = param.aldeia
data.munisipiu = param.munisipiu,
data.postu_admin = param.postu_admin
data.suco = param.suco
data.aldeia = param.aldeia
data.phone = param.phone
data.default_room = param.default_room_id
data.logo = param.logo
data.province = param.province
data.city = param.city
data.subdistrict = param.subdistrict
data.ward = param.ward
// data.province = param.province
// data.city = param.city
// data.subdistrict = param.subdistrict
// data.ward = param.ward
data.updated_by = req.auth?.data.name;
await repo.save(data);
@ -419,7 +440,7 @@ export class PharmacyInfoController {
await OrmHelper.DB.manager.save(existData);
}
const affected = (!param.hard ? await repo.softDelete({ id: param.id }) : await repo.delete({ id: param.id })).affected;
const affected = (!param.hard ? await repo.softDelete({ id: param.id }) : await repo.delete({ id: param.id })).affected ?? 0;
if (affected > 0) {
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
@ -457,7 +478,7 @@ export class PharmacyInfoController {
const repo = OrmHelper.DB.getRepository(PharmacyInfo);
const affected = (await repo.restore({ id: param.id })).affected;
const affected = (await repo.restore({ id: param.id })).affected ?? 0;
if (affected > 0) {
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});