feat(room): add room number as column
This commit is contained in:
@ -67,6 +67,7 @@ export class RoomController {
|
|||||||
new Brackets((qb) => {
|
new Brackets((qb) => {
|
||||||
qb.where("Room.code ILIKE :searchVal", { searchVal: anyVal })
|
qb.where("Room.code ILIKE :searchVal", { searchVal: anyVal })
|
||||||
.orWhere("Room.room ILIKE :searchVal", { searchVal: anyVal })
|
.orWhere("Room.room ILIKE :searchVal", { searchVal: anyVal })
|
||||||
|
.orWhere("Room.number ILIKE :searchVal", { searchVal: anyVal })
|
||||||
.orWhere("department.name ILIKE :searchVal", { searchVal: anyVal });
|
.orWhere("department.name ILIKE :searchVal", { searchVal: anyVal });
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@ -154,6 +155,7 @@ export class RoomController {
|
|||||||
const schema = Joi.object().keys({
|
const schema = Joi.object().keys({
|
||||||
room: Joi.string().max(256).required().label("Room"),
|
room: Joi.string().max(256).required().label("Room"),
|
||||||
code: Joi.string().max(128).required().label("Code"),
|
code: Joi.string().max(128).required().label("Code"),
|
||||||
|
number: Joi.string().allow("").max(128).optional().label("Number"),
|
||||||
description: Joi.string().allow("").max(512).optional().label("Description"),
|
description: Joi.string().allow("").max(512).optional().label("Description"),
|
||||||
department_id: Joi.string().uuid().required().label("Department ID"),
|
department_id: Joi.string().uuid().required().label("Department ID"),
|
||||||
serviceclass: Joi.string().uuid().required().label("Service Class ID"),
|
serviceclass: Joi.string().uuid().required().label("Service Class ID"),
|
||||||
@ -180,6 +182,7 @@ export class RoomController {
|
|||||||
let room = new Room();
|
let room = new Room();
|
||||||
room.room = param.room;
|
room.room = param.room;
|
||||||
room.code = param.code;
|
room.code = param.code;
|
||||||
|
room.number = param.number || null;
|
||||||
room.description = param.description || null;
|
room.description = param.description || null;
|
||||||
room.department = department;
|
room.department = department;
|
||||||
room.serviceclass = param.serviceclass;
|
room.serviceclass = param.serviceclass;
|
||||||
@ -240,6 +243,7 @@ export class RoomController {
|
|||||||
id: Joi.string().uuid().required().label("Room ID"),
|
id: Joi.string().uuid().required().label("Room ID"),
|
||||||
room: Joi.string().max(256).required().label("Room"),
|
room: Joi.string().max(256).required().label("Room"),
|
||||||
code: Joi.string().max(128).required().label("Code"),
|
code: Joi.string().max(128).required().label("Code"),
|
||||||
|
number: Joi.string().allow("").max(128).optional().label("Number"),
|
||||||
description: Joi.string().allow("").max(512).optional().label("Description"),
|
description: Joi.string().allow("").max(512).optional().label("Description"),
|
||||||
department_id: Joi.string().uuid().required().label("Department ID"),
|
department_id: Joi.string().uuid().required().label("Department ID"),
|
||||||
serviceclass: Joi.string().uuid().required().label("Service Class ID"),
|
serviceclass: Joi.string().uuid().required().label("Service Class ID"),
|
||||||
@ -267,6 +271,7 @@ export class RoomController {
|
|||||||
|
|
||||||
room.room = param.room;
|
room.room = param.room;
|
||||||
room.code = param.code;
|
room.code = param.code;
|
||||||
|
room.number = param.number || null;
|
||||||
room.description = param.description || null;
|
room.description = param.description || null;
|
||||||
room.serviceclass = param.serviceclass;
|
room.serviceclass = param.serviceclass;
|
||||||
room.department = department;
|
room.department = department;
|
||||||
|
|||||||
@ -129,6 +129,7 @@ const doc = {
|
|||||||
room: {
|
room: {
|
||||||
$room: "Room name",
|
$room: "Room name",
|
||||||
$code: "R001",
|
$code: "R001",
|
||||||
|
number: "101",
|
||||||
$description: "Optional description",
|
$description: "Optional description",
|
||||||
$department_id: "uuid-string",
|
$department_id: "uuid-string",
|
||||||
$serviceclass: "uuid-string",
|
$serviceclass: "uuid-string",
|
||||||
|
|||||||
Reference in New Issue
Block a user