Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

Ein Arsch voll Konflikte.
This commit is contained in:
Lyndon Jetten
2020-08-19 12:15:10 +02:00
1083 changed files with 313104 additions and 18615 deletions

View File

@@ -0,0 +1,19 @@
CREATE TABLE `dienst` (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`IsActive` tinyint(4) 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,
`Dienstname` varchar(1024) DEFAULT NULL,
`Kurz` varchar(128) DEFAULT NULL,
`Farbe` varchar(16) DEFAULT NULL,
`Start` datetime DEFAULT NULL,
`Ende` datetime DEFAULT NULL,
`Pause` int(10) DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1

View File

@@ -0,0 +1,57 @@
ALTER TABLE `valuelistentry2object` ADD COLUMN `RatingTypeOid` BIGINT(19) NULL DEFAULT NULL;
CREATE TABLE `ratingtype` (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`IsActive` tinyint(4) 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,
`DisplayName` varchar(1024) DEFAULT NULL,
`RatingId` int(10) DEFAULT NULL,
`Position` int(10) DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `rating` (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`IsActive` tinyint(4) 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,
`StartDate` datetime DEFAULT NULL,
`DisplayName` varchar(1024) DEFAULT NULL,
`RatingId` int(10) DEFAULT NULL,
`RTFNotice` MEDIUMTEXT NULL DEFAULT NULL,
`SupportConceptOid` bigint(19) DEFAULT NULL,
PRIMARY KEY (`Oid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE `goalrating` (
`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
`Tid` int(10) DEFAULT NULL,
`IsActive` tinyint(4) 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,
`RatingOid` bigint(19) DEFAULT NULL,
`ValueListEntryOid` bigint(19) DEFAULT NULL,
`RatingTypeOid` bigint(19) DEFAULT NULL,
PRIMARY KEY(`Oid`),
KEY `GOALRATING_RATING_FK` (`RatingOid`),
CONSTRAINT `FK_GOALRATING_RATING` FOREIGN KEY (`RatingOid`) REFERENCES `rating` (`Oid`) ON DELETE NO ACTION ON UPDATE NO ACTION
)ENGINE=InnoDB DEFAULT CHARSET=latin1;