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

56
src/controllers/hospital_information.ts
View File

@ -25,10 +25,14 @@ const hospitalCreateUpdateSchema = {
address: Joi.string().required().label("Hospital Address"),
phone: Joi.string().required().label("Hospital Phone"),
logo: Joi.string().allow(null, "").label("Hospital Logo"),
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"),
munisipo: Joi.string().allow(null, "").label("Munisipo ID"),
administrativu: Joi.string().allow(null, "").label("Administrativu ID"),
aldeia: Joi.string().allow(null, "").label("Aldeia ID"),
suco: Joi.string().allow(null, "").label("Suco ID"),
};
interface FileUploadRequest extends Request {
@ -46,10 +50,14 @@ export class HospitalInformationController {
try {
const hospital = await OrmHelper.DB.getRepository(HospitalInformation)
.createQueryBuilder("HospitalInformation")
.leftJoinAndSelect("HospitalInformation.province", "province")
.leftJoinAndSelect("HospitalInformation.city", "city")
.leftJoinAndSelect("HospitalInformation.subdistrict", "subdistrict")
.leftJoinAndSelect("HospitalInformation.ward", "ward")
.leftJoinAndSelect("HospitalInformation.munisipo", "munisipo")
.leftJoinAndSelect("HospitalInformation.administrativu", "administrativu")
.leftJoinAndSelect("HospitalInformation.aldeia", "aldeia")
.leftJoinAndSelect("HospitalInformation.suco", "suco")
// .leftJoinAndSelect("HospitalInformation.province", "province")
// .leftJoinAndSelect("HospitalInformation.city", "city")
// .leftJoinAndSelect("HospitalInformation.subdistrict", "subdistrict")
// .leftJoinAndSelect("HospitalInformation.ward", "ward")
.getOne();
if (!hospital) return ReturnHelper.errorResponse(res, 404, 404, Language.lang.failed_view, "Hospital not found");
@ -66,10 +74,10 @@ export class HospitalInformationController {
phone: hospital.phone,
logo: hospitallogo,
file: hospital.logo,
province: hospital.province,
city: hospital.city,
subdistrict: hospital.subdistrict,
ward: hospital.ward
munisipo: hospital.munisipo,
administrativu: hospital.administrativu,
aldeia: hospital.aldeia,
suco: hospital.suco
};
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, result);
@ -105,10 +113,14 @@ export class HospitalInformationController {
hospitalinformation.address = param.address;
hospitalinformation.phone = param.phone;
hospitalinformation.logo = param.logo || existing.logo; // ✅ pertahankan logo lama kalau kosong
hospitalinformation.province = param.province;
hospitalinformation.city = param.city;
hospitalinformation.subdistrict = param.subdistrict;
hospitalinformation.ward = param.ward;
// hospitalinformation.province = param.province;
// hospitalinformation.city = param.city;
// hospitalinformation.subdistrict = param.subdistrict;
// hospitalinformation.ward = param.ward;
hospitalinformation.suco = param.suco;
hospitalinformation.administrativu = param.administrativu;
hospitalinformation.aldeia = param.aldeia;
hospitalinformation.munisipo = param.munisipo;
hospitalinformation.updated_by = req.auth?.data.name;
} else {
// ── INSERT ─────────────────────────────────────────────
@ -117,10 +129,14 @@ export class HospitalInformationController {
hospitalinformation.address = param.address;
hospitalinformation.phone = param.phone;
hospitalinformation.logo = param.logo;
hospitalinformation.province = param.province;
hospitalinformation.city = param.city;
hospitalinformation.subdistrict = param.subdistrict;
hospitalinformation.ward = param.ward;
// hospitalinformation.province = param.province;
// hospitalinformation.city = param.city;
// hospitalinformation.subdistrict = param.subdistrict;
// hospitalinformation.ward = param.ward;
hospitalinformation.suco = param.suco;
hospitalinformation.administrativu = param.administrativu;
hospitalinformation.aldeia = param.aldeia;
hospitalinformation.munisipo = param.munisipo;
hospitalinformation.created_by = req.auth?.data.name;
hospitalinformation.updated_by = req.auth?.data.name;
}