diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index c649cfd05..daf6f1b8f 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -39,16 +39,16 @@
false
true
false
- http://app.beyondsoft.de/dev/
+ http://app.beyondsoft.de/sbd/
de-DE
BeWoPlaner
beyondSoft GmbH
- 2.0.1.130
+ 2.0.1.135
true
publish.htm
false
true
- 131
+ 136
2.0.1.%2a
false
true
@@ -117,6 +117,7 @@
+
@@ -1975,7 +1976,7 @@
-
+
{8a83c4dc-a0b1-4a51-ae1d-366d7a05b298}
ChatController
@@ -2308,6 +2309,16 @@
True
Assembly
+
+ False
+
+
+
+
+ Include
+ True
+ Assembly
+
False
diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index 8cebe3f88..f6318788f 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -1,8 +1,8 @@
- D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish4\
- http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/|http://app.beyondsoft.de/|http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/deploy/
+ D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\
+ http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/
diff --git a/BeWo/View/BeWoFileView.xaml b/BeWo/View/BeWoFileView.xaml
index 4b28d98fd..78d21de65 100644
--- a/BeWo/View/BeWoFileView.xaml
+++ b/BeWo/View/BeWoFileView.xaml
@@ -76,7 +76,7 @@
-
+
diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index 871e32b6d..e212893dc 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -1032,8 +1032,8 @@
-
-
+
+
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 7657bd76a..1c545bbcd 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -523,7 +523,7 @@ namespace BeWo.View.Detail
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings))
{
- grid_EmployeeRelation.Columns["Chatpartner"].Visible = false;
+ //grid_EmployeeRelation.Columns["Chatpartner"].Visible = false;
}
}
diff --git a/BeWo/View/Detail/Report/QueryView.xaml.cs b/BeWo/View/Detail/Report/QueryView.xaml.cs
index a1a4d3559..983996158 100644
--- a/BeWo/View/Detail/Report/QueryView.xaml.cs
+++ b/BeWo/View/Detail/Report/QueryView.xaml.cs
@@ -631,7 +631,7 @@ namespace BeWo.View.Detail.Report
{
return s.ExecuteQuery(query.Oid, parameterList);
}
- catch
+ catch (Exception e)
{
}
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index c5dc8e3ba..2402afb89 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1343,17 +1343,17 @@ namespace BeWo.View
{
//fehlermeldungen weiter Spezifizieren
MessageBox.Show(
- "Es konnte keine Verbindung hergestellt werden.\nBitte versuchen sie es später erneut");
+ "Es konnte keine Verbindung hergestellt werden.\nBitte versuchen Sie es später erneut");
}
}
else
{
- MessageBox.Show("Sie benötgen einen gültigen Chat-Code.", "Info");
+ MessageBox.Show("Sie benötigen einen gültigen Chat-Code.", "Info");
}
}
else
{
- MessageBox.Show("Sie benötgen einen gültigen zugang zum Chat. Bitte wenden sie sich an den Support.", "Info");
+ MessageBox.Show("Sie benötigen einen gültigen Zugang zum Chat. Bitte wenden Sie sich an den Support.", "Info");
}
}
diff --git a/BeWo/View/Report/AnnualReport/AnnualReportView.xaml.cs b/BeWo/View/Report/AnnualReport/AnnualReportView.xaml.cs
index 8dea78df6..18796ac73 100644
--- a/BeWo/View/Report/AnnualReport/AnnualReportView.xaml.cs
+++ b/BeWo/View/Report/AnnualReport/AnnualReportView.xaml.cs
@@ -42,9 +42,9 @@ namespace BeWo.View.Report.AnnualReport
this.Dispatch(
delegate
{
- var vle = new ValueListEntryDC();
- cb.Add(vle);
- vle.TypeDescription = "";
+ //var vle = new ValueListEntryDC();
+ //cb.Add(vle);
+ //vle.TypeDescription = "";
this.combobox_customercaretype.ItemsSource = cb.OrderBy(a => a.TypeDescription).ToList();
}));
diff --git a/BeWo/ViewModel/AbstractBaseVM.cs b/BeWo/ViewModel/AbstractBaseVM.cs
index 15e1cdb3d..fe0490311 100644
--- a/BeWo/ViewModel/AbstractBaseVM.cs
+++ b/BeWo/ViewModel/AbstractBaseVM.cs
@@ -28,10 +28,10 @@ namespace BeWo.ViewModel
protected bool AreDifferent(object pMember, object pNewValue)
{
- if (pNewValue is string && pNewValue != null)
- {
- pNewValue = (pNewValue as string).Trim();
- }
+ //if (pNewValue is string && pNewValue != null)
+ //{
+ // pNewValue = (pNewValue as string).Trim();
+ //}
if (pNewValue is string && ((string) pNewValue) == string.Empty)
{
diff --git a/BeWo/app.config b/BeWo/app.config
index 13f5a141a..6fdaab64d 100644
--- a/BeWo/app.config
+++ b/BeWo/app.config
@@ -1,84 +1,85 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Model/Changes_2017_10_09.txt b/Model/Changes_2017_10_09.txt
index 3fa7dd29d..b51af5b4e 100644
--- a/Model/Changes_2017_10_09.txt
+++ b/Model/Changes_2017_10_09.txt
@@ -1,4 +1,2 @@
-ALTER TABLE `applicationuser`
-ADD COLUMN `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL COMMENT '';
ALTER TABLE textbaustein ADD COLUMN `IsParent` TINYINT(1);
\ No newline at end of file
diff --git a/Model/Changes_alle_bis_2017_09_14.txt b/Model/Changes_alle_bis_2017_09_14.txt
index f3d981465..00420bb51 100644
--- a/Model/Changes_alle_bis_2017_09_14.txt
+++ b/Model/Changes_alle_bis_2017_09_14.txt
@@ -1,7 +1,295 @@
+
+
+ALTER TABLE `supportconcept`
+CHANGE COLUMN `Notice` `Notice` MEDIUMTEXT NULL;
+
+
+ALTER TABLE `overtime`
+CHANGE COLUMN `Betrag` `Betrag` DECIMAL(18,10) NULL DEFAULT NULL ;
+
+
+ALTER TABLE `customer2person`
+ADD COLUMN `IstFamilie` TINYINT(4) NULL DEFAULT NULL COMMENT '';
+
+
+ALTER TABLE `image`
+ADD COLUMN `PersonOid` bigint(19) DEFAULT NULL;
+
+update image set personoid = (select personoid from customer c where c.oid = customeroid) where customeroid is not null and personoid is null;
+
+update image set personoid = (select personoid from employee e where e.oid = employeeoid) where employeeoid is not null and personoid is null;
+
+
+
+CREATE TABLE `chatmessages` (
+ `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+ `SenderPersonOid` bigint(19) DEFAULT NULL,
+ `EmpfaengerPersonOid` bigint(19) DEFAULT NULL,
+ `Tid` int(10) DEFAULT NULL,
+ `Notice` varchar(1024) DEFAULT NULL,
+ `InsTs` datetime DEFAULT NULL,
+ `InsUser` varchar(1024) DEFAULT NULL,
+ `Version` bigint(19) DEFAULT NULL,
+ `UdpUser` varchar(256) DEFAULT NULL,
+ `isActive` tinyint(4) DEFAULT NULL,
+ `SystemEntryID` int(10) DEFAULT NULL,
+ `ChatText` longblob,
+ `Uhrzeit` datetime DEFAULT NULL,
+ `IstZugestellt` tinyint(4) DEFAULT NULL,
+ `IstGelesen` tinyint(4) DEFAULT NULL,
+ `TeamOid` bigint(19) DEFAULT NULL,
+ `MessageId` VARCHAR(1024) DEFAULT NULL,
+ `MediaTyp` INT(10) NULL DEFAULT NULL COMMENT '',
+ PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE `chatmediamessage` (
+ `Oid` BIGINT(19) AUTO_INCREMENT COMMENT '',
+ `ChatMessageOid` BIGINT(19) NULL COMMENT '',
+ `Tid` INT(10) NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `isActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `Media` LONGBLOB NULL DEFAULT NULL COMMENT '',
+ `ImageThumpNail` LONGBLOB NULL DEFAULT NULL COMMENT '',
+
+ PRIMARY KEY (`Oid`) COMMENT '');
+
+ALTER TABLE `chatmediamessage`
+ADD INDEX `ChatMessage_IDX` (`ChatMessageOid` ASC) COMMENT '';
+
+
+CREATE TABLE `employeeappcode` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
+ `Employeeoid` BIGINT(19) NULL,
+ `Tid` INT(10) NULL,
+ `Notice` VARCHAR(1024) NULL,
+ `InsTs` DATETIME NULL,
+ `InsUser` VARCHAR(1024) NULL,
+ `Version` BIGINT(19) NULL,
+ `UdpUser` VARCHAR(256) NULL,
+ `IsActive` TINYINT(4) NULL,
+ `SystemEntryID` INT(10) NULL,
+ `EmployeeCode` VARCHAR(512) NULL,
+ `EmployeeCodegenDate` DATETIME NULL,
+ `IsChatActive` INT DEFAULT 0,
+ `NotfallStatement` VARCHAR(1024) NULL,
+ PRIMARY KEY (`Oid`),
+ UNIQUE INDEX `EmployeeCode_UNIQUE` (`EmployeeCode` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE `customerappcode` (
+ `Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+ `CustomerOid` bigint(19) DEFAULT NULL,
+ `Tid` int(10) DEFAULT NULL,
+ `Notice` varchar(1024) DEFAULT NULL,
+ `InsTs` datetime DEFAULT NULL,
+ `InsUser` varchar(1024) DEFAULT NULL,
+ `Version` bigint(19) DEFAULT NULL,
+ `UdpUser` varchar(256) DEFAULT NULL,
+ `IsActive` tinyint(4) DEFAULT NULL,
+ `SystemEntryID` int(10) DEFAULT NULL,
+ `CustomerCodeGenDate` datetime DEFAULT NULL,
+ `CustomerCode` varchar(512) DEFAULT NULL,
+ `IsChatActive` INT DEFAULT 0,
+ PRIMARY KEY (`Oid`),
+ UNIQUE KEY `CustomerCode_UNIQUE` (`CustomerCode`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `employee2customer`
+ADD COLUMN `Chatpartner` TINYINT(4) NULL DEFAULT 0 COMMENT '' AFTER `SystemEntryID`;
+
+
+ALTER TABLE `servicerecord`
+ADD COLUMN `DurationInStunden`
+INT(10) NULL DEFAULT NULL COMMENT '' AFTER `Notice5`;
+
+ALTER TABLE `servicerecord`
+ADD COLUMN `ServiceRecordFormat`
+INT(10) NULL DEFAULT NULL COMMENT '' AFTER `DurationInStunden`;
+
+CREATE TABLE `passwortverlauf` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+ `ApplicationUserOid` BIGINT(19) NULL COMMENT '',
+ `Tid` INT(10) NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `isActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `ErstellDatum` DATETIME NULL COMMENT '',
+ `Passwort` VARCHAR(64) NULL COMMENT '',
+ `Salt` VARCHAR(128) NULL COMMENT '',
+ PRIMARY KEY (`Oid`) COMMENT '')
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = latin1;
+
+
+CREATE TABLE `newestchatmessage` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT,
+ `Tid` INT(10) DEFAULT NULL,
+ `IsActive` TINYINT(1) DEFAULT NULL,
+ `Notice` VARCHAR(1024) DEFAULT NULL,
+ `InsTs` DATETIME DEFAULT NULL,
+ `InsUser` VARCHAR(256) DEFAULT NULL,
+ `Version` BIGINT(19) DEFAULT NULL,
+ `UdpUser` VARCHAR(256) DEFAULT NULL,
+ `SystemEntryID` INT(10) DEFAULT NULL,
+ `RecipientPersonOid` BIGINT(19) DEFAULT NULL,
+ `SenderPersonOid` BIGINT(19) DEFAULT NULL,
+ `ChatMessageOid` BIGINT(19) DEFAULT NULL,
+ `IsTeam` TINYINT(1) DEFAULT NULL,
+ PRIMARY KEY (`Oid`),
+ KEY `NEWESTCHATMESSAGE_RECIPIENT_FK` (`RecipientPersonOid`),
+ CONSTRAINT `FK_NEWESTCHATMESSAGE_RECIPIENT` FOREIGN KEY (`RecipientPersonOid`) REFERENCES `Person` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+
+ KEY `NEWESTCHATMESSAGE_SENDER_FK` (`SenderPersonOid`),
+ CONSTRAINT `FK_NEWESTCHATMESSAGE_SENDER` FOREIGN KEY (`SenderPersonOid`) REFERENCES `Person` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION,
+
+ KEY `NEWESTCHATMESSAGE_CHATMESSAGE_FK` (`ChatMessageOid`),
+ CONSTRAINT `FK_NEWESTCHATMESSAGE_CHATMESSAGE` FOREIGN KEY (`ChatMessageOid`) REFERENCES `ChatMessages` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
+) ENGINE=InnoDB
+AUTO_INCREMENT=1 CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
+
+
+ALTER TABLE `customer2person`
+ADD COLUMN `OrganisationOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `SystemEntryID`;
+
+
+ALTER TABLE `customer2organisation`
+ADD COLUMN `PersonOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `SystemEntryID`;
+
+
+ALTER TABLE `organisation2person`
+ADD COLUMN `RolleInOrganisationValueListOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `SystemEntryID`;
+
+
+
+
+ALTER TABLE `supportconceptapprovalperiod2employee`
+ADD COLUMN `IsAbsolut` INT(10) NULL DEFAULT 0 COMMENT '' AFTER `Betreuungsschluessel`;
+
+ALTER TABLE `organisation`
+ADD COLUMN `FunctionValueListEntryOid` BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `AccountNumber`;
+
+
+
+
+
+ALTER TABLE `contract`
+ADD COLUMN `MonthlyTotalHours` DECIMAL(18,10) NULL DEFAULT NULL COMMENT '' AFTER `WeeklyDays`;
+
+
+
+ALTER TABLE `person`
+ADD COLUMN `IsMigrant` TINYINT(4) NULL DEFAULT NULL COMMENT '' AFTER `FunctionValueListEntryOid`;
+
+
+
+ALTER TABLE `person`
+ADD COLUMN `NationalitaetValueListEntryOid`
+BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `IsMigrant`;
+
+
+ALTER TABLE `person`
+ADD COLUMN `AufenthaltsStatusValueListEntryOid`
+BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `NationalitaetValueListEntryOid`;
+
+
+ALTER TABLE `contract`
+ADD COLUMN
+`MonthlyFLS` DECIMAL(18,10) NULL DEFAULT NULL COMMENT '' AFTER `MonthlyTotalHours`;
+
+
+CREATE TABLE `vertretung`
+ (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+ `MitarbeiterOid` BIGINT(19) NULL COMMENT '',
+ `KlientOid` BIGINT(19) NULL COMMENT '',
+ `Tid` INT(10) NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `IsActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `VertretungsZeitraumVon` DATETIME NULL COMMENT '',
+ `VertretungsZeitraumBis` DATETIME NULL COMMENT '',
+ `VertretenderMitarbeiterOid` BIGINT(19) NULL DEFAULT 0 COMMENT '',
+ `AbsenceTimeOid` BIGINT(19) NULL DEFAULT NULL COMMENT '',
+ PRIMARY KEY (`Oid`) COMMENT '');
+
+ALTER TABLE `absencetime`
+ADD COLUMN `KrankheitsMeldung` DATETIME NULL DEFAULT NULL COMMENT '' AFTER `EmployeeOid`;
+
+
+
+CREATE TABLE `kriterien` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+ `KlientenOid` BIGINT(19) NULL DEFAULT NULL COMMENT '',
+ `Tid` INT(10) NULL DEFAULT NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL DEFAULT NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `IsActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `AusschlussKriterien` VARCHAR(1024) NULL COMMENT '',
+ `WunschKriterien` VARCHAR(1024) NULL COMMENT '',
+ PRIMARY KEY (`Oid`) COMMENT '');
+
+
+CREATE TABLE `arbeitszeit` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+ `EmployeeOid` BIGINT(19) NULL COMMENT '',
+ `Tid` INT(10) NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `isActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `GueltigVon` DATETIME NULL COMMENT '',
+ `GueltigBis` DATETIME NULL COMMENT '',
+ PRIMARY KEY (`Oid`) COMMENT '');
+
+
+
+
+CREATE TABLE `arbeitszeiteintrag` (
+ `Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
+ `ArbeitszeitOid` BIGINT(19) NULL COMMENT '',
+ `Tid` INT(10) NULL COMMENT '',
+ `Notice` VARCHAR(1024) NULL COMMENT '',
+ `InsTs` DATETIME NULL COMMENT '',
+ `InsUser` VARCHAR(1024) NULL COMMENT '',
+ `Version` BIGINT(19) NULL COMMENT '',
+ `UdpUser` VARCHAR(256) NULL COMMENT '',
+ `isActive` TINYINT(4) NULL COMMENT '',
+ `SystemEntryID` INT(10) NULL COMMENT '',
+ `Tag` INT(10) NULL COMMENT '',
+ `UhrzeitVon` VARCHAR(256) NULL COMMENT '',
+ `UhrzeitBis` VARCHAR(256) NULL COMMENT '',
+ PRIMARY KEY (`Oid`) COMMENT '');
+
+
+
ALTER TABLE `mandator`
ADD COLUMN `ApiKey` VARCHAR(256) NULL DEFAULT NULL COMMENT '' AFTER `IsMedicationAllowed`;
-
+ALTER TABLE `applicationuser`
+ADD COLUMN `PasswordHash` VARCHAR(1024) NULL DEFAULT NULL COMMENT '';
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index bccc60bf8..10be261ce 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -40,6 +40,7 @@ namespace BeWo.Service.Plugins
//t = "5805202339"; // Wegweiser Betreuungsdienst
//t = "2301474784"; // Hauskrankenpflege Leiendecker
//t = "8243565510"; // Der Karren
+ t = "7709306800"; // Der Karren SBD
//t = "2499262621"; // HPH Bersenbrück
//t = "4950382346"; // Holsinger
//t = "5973016645"; // Verein Lebensgestaltung Hanau
@@ -156,12 +157,12 @@ namespace BeWo.Service.Plugins
//t = "9800364930"; // BeWo Leverkusen
//t = "4439874912"; //BeWo Sahin
//t = "1873138856"; // BUG e.V.
- //t = "6463422907"; // Caritas Leverkusen
- //t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
- //t = "6548202677"; // VKM Aachen SBD
- //t = "7803602698"; // Taubblindendienst
- //t = "5518600303"; //Wetterleuchten e.V.
- //t = "4096649015"; // AWO Dortmund
+ //t = "6463422907"; // Caritas Leverkusen
+ //t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch
+ //t = "6548202677"; // VKM Aachen SBD
+ //t = "7803602698"; // Taubblindendienst
+ //t = "5518600303"; //Wetterleuchten e.V.
+ //t = "4096649015"; // AWO Dortmund
return t;
#else
if (MultitenancyOperationContextExt.Current != null)
diff --git a/Service/SBD/Vertretung/VertretungsAlgorithmus.cs b/Service/SBD/Vertretung/VertretungsAlgorithmus.cs
index 849bfbaf4..d5dc62fc0 100644
--- a/Service/SBD/Vertretung/VertretungsAlgorithmus.cs
+++ b/Service/SBD/Vertretung/VertretungsAlgorithmus.cs
@@ -202,10 +202,11 @@ namespace BeWo.Service.SBD.Vertretung
{
foreach (var v2o in e2c.ValueList)
{
- if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue &&
- v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
- {
- klientoids.Add(e2c.CustomerOid.Value);
+ //if (v2o.Entry.Type == ValueListEntryType.StaffRoleType && v2o.Entry.SystemEntryID.HasValue &&
+ // v2o.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)
+ if (v2o.Entry.Type == ValueListEntryType.StaffRoleType)
+ {
+ klientoids.Add(e2c.CustomerOid.Value);
}
}
}
@@ -341,18 +342,17 @@ namespace BeWo.Service.SBD.Vertretung
foreach (var ars in _schulbegleitenderDienst.AbsenceTimeliste)
{
- item = BuildVertertungslisteItems();
-
- item.Abwesenheitskategorie = ars.Reason;
- item.Absencetime = ars;
-
-
- AddKrankheitsZeitraumAndMeldungToItem(item, ars);
-
-
if (ars.Start.Value.Date <= _auswerteDatum.Date && ars.End.Value.Date >= _auswerteDatum.Date)
{
- foreach (var emp in _schulbegleitenderDienst.Employeesliste)
+ item = BuildVertertungslisteItems();
+
+ item.Abwesenheitskategorie = ars.Reason;
+ item.Absencetime = ars;
+
+
+ AddKrankheitsZeitraumAndMeldungToItem(item, ars);
+
+ foreach (var emp in _schulbegleitenderDienst.Employeesliste)
{
if (ars.EmployeeOid == emp.EmployeeOid)
{