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

Datenbanknamen aus Waldemars Change-Files entfernt.

Browse Source
This commit is contained in:
staccatomamba
2017-08-18 16:33:26 +02:00
parent b43202e46f
commit 6e52a0c928
7 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/BeWo.csproj
View File

@@ -881,8 +881,6 @@
<Compile Include="View\EmployeeArbeitszeitView.xaml.cs">
<DependentUpon>EmployeeArbeitszeitView.xaml</DependentUpon>
</Compile>
<Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
<DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>
<Compile Include="View\Navigation\CustomerTeamNavigationView.xaml.cs">
<DependentUpon>CustomerTeamNavigationView.xaml</DependentUpon>
</Compile>

19
Data/Data.csproj
View File

@@ -567,22 +567,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<Content Include="Mappings\CustomerTeam.hbm.xml" /><EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Employee2Token.hbm.xml" />
<EmbeddedResource Include="Mappings\Customer2Token.hbm.xml" />
<EmbeddedResource Include="Mappings\Token.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource><<<<<<< .mine
=======
<Content Include="Mappings\CustomerTeam.hbm.xml" />
<EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Employee2Token.hbm.xml" />
@@ -590,7 +576,6 @@
<EmbeddedResource Include="Mappings\Token.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
>>>>>>> .theirs
<EmbeddedResource Include="Mappings\ArbeitszeitEintrag.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>

6
Model/Changes_2017_06_22.txt
View File

@@ -1,4 +1,4 @@
CREATE TABLE `1234567890`.`token` (
CREATE TABLE `token` (
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
`Tid` INT(10) NULL COMMENT '',
@@ -18,7 +18,7 @@ CREATE TABLE `1234567890`.`token` (
CREATE TABLE `1234567890`.`customer2token` (
CREATE TABLE `customer2token` (
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
`CustomerOid` BIGINT(19) NULL COMMENT '',
@@ -39,7 +39,7 @@ CREATE TABLE `1234567890`.`customer2token` (
CREATE TABLE `1234567890`.`employee2token` (
CREATE TABLE `employee2token` (
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
`EmployeeOid` BIGINT(19) NULL COMMENT '',

2
Model/Changes_2017_07_26.txt
View File

@@ -1,4 +1,4 @@
ALTER TABLE `1234567890`.`servicerecord`
ALTER TABLE `servicerecord`
ADD COLUMN `RTFNotice1` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `ServiceRecordFormat`,

2
Model/Changes_2017_08_08.txt
View File

@@ -1,4 +1,4 @@
CREATE TABLE `1234567890`.`quittierungscheck` (
CREATE TABLE `quittierungscheck` (
`Oid` BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT '',
`EmployeeOid` BIGINT(19) NULL COMMENT '',

4
Model/Changes_2017_08_09.txt
View File

@@ -1,9 +1,9 @@
ALTER TABLE `1234567890`.`quittierungscheck`
ALTER TABLE `quittierungscheck`
ADD COLUMN `QuittierungsbelegGedrucktAm` DATETIME NULL DEFAULT NULL COMMENT '' AFTER `QuittierungsbelegUnterschrieben`;
ALTER TABLE `1234567890`.`quittierungscheck`
ALTER TABLE `quittierungscheck`
DROP COLUMN `EmployeeOid`,
ADD COLUMN `QuittierungsbelegUnterschriebenVon`
BIGINT(19) NULL DEFAULT NULL COMMENT '' AFTER `QuittierungsbelegGedrucktAm`,

10
Shared/BeWoEntityEnums.cs
View File

@@ -122,18 +122,14 @@ namespace BS.Shared
MedRecord = 115,
ChatMessage = 116,
ChatMediaMessage = 117,
<<<<<<< .mine
NewestChatMessage = 118,
=======
NewestChatMessage = 118,
>>>>>>> .theirs
Customer2Token = 119,
CustomerTeam = 119
Token = 120,
Vertretung = 121,
Employee2Token = 122,
QuittierungsCheck = 123
}
QuittierungsCheck = 123,
CustomerTeam = 124,
}
public enum SystemEntryID
{