diff --git a/WebDoorCreator.Data/DbModels/DoorModel.cs b/WebDoorCreator.Data/DbModels/DoorModel.cs index 2682d47..011dc09 100644 --- a/WebDoorCreator.Data/DbModels/DoorModel.cs +++ b/WebDoorCreator.Data/DbModels/DoorModel.cs @@ -101,6 +101,7 @@ namespace WebDoorCreator.Data.DbModels DoorModel answ = new DoorModel() { MeasureUnit = MeasureUnit, + OrderId = OrderId, TypeId = TypeId, DoorExtCode = DoorExtCode, DateIns = adesso, @@ -108,6 +109,7 @@ namespace WebDoorCreator.Data.DbModels DateMod = adesso, UserIdMod = userId, DoorDescript = DoorDescript, + Quantity = Quantity, UnitCost = UnitCost, DateLockExpiry = DateLockExpiry, UserIdLock = UserIdLock diff --git a/WebDoorCreator.Data/DbModels/DoorOpModel.cs b/WebDoorCreator.Data/DbModels/DoorOpModel.cs index defd827..cede43b 100644 --- a/WebDoorCreator.Data/DbModels/DoorOpModel.cs +++ b/WebDoorCreator.Data/DbModels/DoorOpModel.cs @@ -158,25 +158,45 @@ namespace WebDoorCreator.Data.DbModels /// /// /// - public DoorOpModel ObjClone(string userId) + public DoorOpModel ObjClone(string userId, int doorId) { + DoorOpModel answ = new DoorOpModel(); DateTime adesso = DateTime.Now; - DoorOpModel answ = new DoorOpModel() + if (doorId == 0) { - DateIns = adesso, - DateMod = adesso, - UserIdIns = userId, - UserIdMod = userId, - ObjectId = ObjectId, - DoorId = DoorId, - JsoncConfigVal = JsoncConfigVal, - JsoncActVal = JsoncActVal, - userConfirm = userConfirm, - DtConfirm = DtConfirm - }; + answ = new DoorOpModel() + { + DateIns = adesso, + DateMod = adesso, + UserIdIns = userId, + UserIdMod = userId, + ObjectId = ObjectId, + DoorId = DoorId, + JsoncConfigVal = JsoncConfigVal, + JsoncActVal = JsoncActVal, + userConfirm = userConfirm, + DtConfirm = DtConfirm + }; + } + else + { + answ = new DoorOpModel() + { + DateIns = adesso, + DateMod = adesso, + UserIdIns = userId, + UserIdMod = userId, + ObjectId = ObjectId, + DoorId = doorId, + JsoncConfigVal = JsoncConfigVal, + JsoncActVal = JsoncActVal, + userConfirm = userConfirm, + DtConfirm = DtConfirm + }; + } return answ; } - + } }