This commit is contained in:
wayanrivan
2026-04-21 13:37:57 +07:00
parent 344c27be86
commit 48016bfa88
2 changed files with 27 additions and 37 deletions

View File

@ -5,7 +5,7 @@ import { OrmHelper } from "../../helpers/orm";
import Joi from "joi";
import { ILogObj, Logger } from "tslog";
import { Language } from "../../langs/lang";
import { PharmacyInfo, Paging } from "entity";
import { PharmacyInfo, Paging, Subdistrict } from "entity";
import CommonHelper from "../../helpers/common";
import * as fastcsv from 'fast-csv';
import dayjs from "dayjs";
@ -261,11 +261,11 @@ 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.address = param.address
// 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
@ -329,35 +329,25 @@ export class PharmacyInfoController {
.required()
.label('Address'),
munisipiu: Joi.string()
province: Joi.string()
.uuid()
.required()
.label('Munisipiu'),
.allow("", null)
.label('Province'),
postu_admin: Joi.string()
city: Joi.string()
.uuid()
.required()
.label('Postu Admin'),
.allow("", null)
.label('City'),
suco: Joi.string()
subdistrict: Joi.string()
.uuid()
.required()
.label('Suco'),
.allow("", null)
.label('Subdistrict'),
aldeia: Joi.string()
ward: Joi.string()
.uuid()
.required()
.label('Aldeia'),
phone: Joi.string()
.max(30)
.optional()
.label('Phone'),
default_room_id: Joi.string()
.uuid()
.required()
.label('Default Room'),
.allow("", null)
.label('Ward'),
});
req.body.id = req.params['id'];
@ -370,11 +360,11 @@ 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.address = param.address
// 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

View File

@ -329,10 +329,10 @@ const doc = {
$logo: "Logo (string, max 256)",
$name: "Name (string, max 256)",
$address: "Address (string, max 500)",
$munisipiu: "Munisipiu ID (UUID)",
$postu_admin: "Postu Admin ID (UUID)",
$suco: "Suco ID (UUID)",
$aldeia: "Aldeia ID (UUID)",
// $munisipiu: "Munisipiu ID (UUID)",
// $postu_admin: "Postu Admin ID (UUID)",
// $suco: "Suco ID (UUID)",
// $aldeia: "Aldeia ID (UUID)",
$phone: "Phone (string, max 30, optional)",
$default_room_id: "Default Room ID (UUID)",
$province: "Province Code",