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

View File

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