ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mapping fix - Voll funktionsfähig

Browse Source
This commit is contained in:
Rene Evertz
2024-08-27 15:23:46 +02:00
parent d0756fad56
commit a746b323d5
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWo/ViewModel/WohnheimVM.cs
View File

@@ -489,6 +489,7 @@ namespace BeWo.ViewModel
//pDataContract.Wohneinheiten = _WohneinheitListVM.CopyToDCList(doCommit);
pDataContract.Wohneinheiten = null;
var einheit_vm2dc = new Dictionary<WohneinheitVM, WohneinheitDC>();
foreach (var vm in _WohneinheitListVM.VMList)
{
@@ -499,8 +500,7 @@ namespace BeWo.ViewModel
einheit_vm2dc.Add(vm, dc);
if(!pDataContract.Wohneinheiten.Contains(dc))
pDataContract.Wohneinheiten.Add(dc);
pDataContract.Wohneinheiten.Add(dc);
}
foreach (var vm in _WohneinheitBelegungListVM.VMList)

10
Model/Changes_2024_08_27 Wohneinheit Grundrisse.txt
View File

@@ -9,17 +9,21 @@ DROP INDEX `KEY_EMPLOYEE` ,
DROP INDEX `KEY_CUSTOMER` ;
;
ALTER TABLE `image`
ADD INDEX `FK_IMAGE_PERSON_idx` (`PersonOid` ASC) VISIBLE,
ADD INDEX `FK_IMAGE_WOHNEINHEIT_idx` (`WohneinheitOid` ASC) VISIBLE;
;
ALTER TABLE `image`
ADD CONSTRAINT `FK_IMAGE_PERSON`
FOREIGN KEY (`Oid`)
FOREIGN KEY (`PersonOid`)
REFERENCES `person` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE,
ADD CONSTRAINT `FK_IMAGE_WOHNEINHEIT`
FOREIGN KEY (`Oid`)
FOREIGN KEY (`WohneinheitOid`)
REFERENCES `wohneinheit` (`Oid`)
ON DELETE CASCADE
ON UPDATE CASCADE;
;
ALTER TABLE `image`
ADD COLUMN `Filename` VARCHAR(1024) NULL DEFAULT NULL AFTER `SystemEntryID`,
ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;

8
Service/DCEntityMapper/ImageDC_Image.cs
View File

@@ -15,6 +15,10 @@ namespace BeWo.Service.DCEntityMapper
{
public override ImageDC MergeWithDC(Image pEntity, ImageDC pDataContract)
{
pDataContract.Oid = pEntity.Oid;
pDataContract.Version = pEntity.Version;
pDataContract.Notice = pEntity.Notice;
pDataContract.Filename = pEntity.Filename;
pDataContract.Fullname = pEntity.Fullname;
pDataContract.Original = pEntity.Original;
@@ -26,6 +30,10 @@ namespace BeWo.Service.DCEntityMapper
public override Image MergeWithEntity(ImageDC pDataContract, Image pEntity)
{
pEntity.Oid = pDataContract.Oid;
pEntity.Version = pDataContract.Version;
pEntity.Notice = pDataContract.Notice;
pEntity.Filename = pDataContract.Filename;
pEntity.Fullname = pDataContract.Fullname;
pEntity.Original = pDataContract.Original;