diff --git a/01_SMART_UP_TOOLS/10_ENVELOPE_CREATOR/Update/1.5.6.sql b/01_SMART_UP_TOOLS/10_ENVELOPE_CREATOR/Update/1.5.6.sql index 1752198..35f3ce9 100644 --- a/01_SMART_UP_TOOLS/10_ENVELOPE_CREATOR/Update/1.5.6.sql +++ b/01_SMART_UP_TOOLS/10_ENVELOPE_CREATOR/Update/1.5.6.sql @@ -18,4 +18,148 @@ DELETE FROM TBSIG_ENVELOPE where GUID = @ENV_GUID; GO ALTER TABLE TBSIG_DOCUMENT_RECEIVER_ELEMENT ADD CONSTRAINT UQTBSIG_DOCUMENT_RECEIVER_ELEMENT_DocID_PosX_PosY UNIQUE (DOCUMENT_ID, POSITION_X, POSITION_Y); -GO \ No newline at end of file +GO + +--Changed 14.07.2025 MS Termination of commands, Fehler Rückgabe von select +--Changed 22.05.2025 MS Ablehnung über insert mit Envelope-Creator als User +--Changed 23.04.2025 MS Neuer Dokumenten und Withdrawn-Status +--CHANGED 06.06.2024 MS Status 2007, emailMeldungen integriert +--CHANGED 11.06.2024 MS Status 2007, Cursor für andere REceiver +ALTER TRIGGER [dbo].[TBSIG_ENVELOPE_HISTORY_AFT_INS] ON [dbo].[TBSIG_ENVELOPE_HISTORY] +WITH EXECUTE AS CALLER +FOR INSERT +AS +BEGIN TRY + DECLARE + @GUID BIGINT, + @ENVELOPE_ID INTEGER, + @STATUS INTEGER, + @USER_REFERENCE VARCHAR(100) + SELECT + @GUID = GUID, + @ENVELOPE_ID = ENVELOPE_ID, + @STATUS = STATUS, + @USER_REFERENCE = USER_REFERENCE + FROM INSERTED + PRINT 'STATUS IS: ' + CONVERT(VARCHAR(10),@STATUS) + --PRÜFEN OB ES EIN STATUS VOM WEBCLIENT IST 0 2 + IF LEFT(CONVERT(VARCHAR(5),@STATUS),1) = 1 + BEGIN + PRINT 'REGULÄRER 1erStatus.. ' + IF @STATUS IN (1001, 1002, 1003, 1007, 1008, 1009,10009) /*ENVELOPE QUEUED*/ + UPDATE TBSIG_ENVELOPE SET STATUS = @STATUS WHERE GUID = @ENVELOPE_ID; + END + ELSE IF LEFT(CONVERT(VARCHAR(5),@STATUS),1) = 2 + BEGIN + + IF @STATUS = 2005 /*DOKUMENT SIGINIERT*/ + BEGIN + DECLARE @COUNT_SIGNED INT, @COUNT_SIGNERS INT + SELECT @COUNT_SIGNED = COUNT(GUID) FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = @ENVELOPE_ID AND STATUS = 2005 + SELECT @COUNT_SIGNERS = COUNT(REC_ID) FROM VWSIG_ENVELOPE_RECEIVER WHERE ENV_ID = @ENVELOPE_ID + IF @COUNT_SIGNED = @COUNT_SIGNERS + BEGIN + UPDATE TBSIG_ENVELOPE SET STATUS = 1006 WHERE GUID = @ENVELOPE_ID; /*FULLY SIGNED*/ + INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID, USER_REFERENCE, STATUS, ACTION_DATE) VALUES (@ENVELOPE_ID, 'System', 1006, DATEADD(second, 5, GETDATE())); + END + ELSE + UPDATE TBSIG_ENVELOPE SET STATUS = 1005 WHERE GUID = @ENVELOPE_ID; /*PARTLY SIGNED*/ + END + ELSE IF @STATUS = 2007 /*VORGANG DURCH USER ABGELEHNT*/ + BEGIN + DECLARE @COMMENT VARCHAR(500),@REC_EMAIL VARCHAR(200),@EML_BODY_ADM VARCHAR(3000),@EML_SUBJ_ADM VARCHAR(3000),@EML_BODY_REC VARCHAR(3000),@EML_SUBJ_REC VARCHAR(3000), + @EML_BODY_REC2 VARCHAR(3000),@EML_SUBJ_REC2 VARCHAR(3000) + ,@ADM_MAIL VARCHAR(250),@ADM_NAME VARCHAR(200),@TITLE VARCHAR(200),@NAME_PORTAL VARCHAR(100),@NAME_RECEIVER VARCHAR(150),@SENDING_PROFILE INT,@ENV_UUID VARCHAR(200) + SELECT @COMMENT = COMMENT,@REC_EMAIL = USER_REFERENCE FROM INSERTED; + SELECT @NAME_PORTAL = [EXTERNAL_PROGRAM_NAME],@SENDING_PROFILE = SENDING_PROFILE FROM [DD_ECM].[dbo].[TBSIG_CONFIG]; + SELECT @EML_BODY_ADM = BODY,@EML_SUBJ_ADM = SUBJECT FROM TBSIG_EMAIL_TEMPLATE WHERE NAME = 'DocumentRejected_ADM'; + SELECT @EML_BODY_REC = BODY,@EML_SUBJ_REC = SUBJECT FROM TBSIG_EMAIL_TEMPLATE WHERE NAME = 'DocumentRejected_REC'; + SELECT @EML_BODY_REC2 = BODY,@EML_SUBJ_REC2 = SUBJECT FROM TBSIG_EMAIL_TEMPLATE WHERE NAME = 'DocumentRejected_REC_2'; + + SELECT @ADM_MAIL = USER_EMAIL,@ADM_NAME = USER_PRE_NAME, @TITLE = TITLE,@ENV_UUID = [ENVELOPE_UUID] FROM VWSIG_ENVELOPE_DATA WHERE ENVELOPE_ID = @ENVELOPE_ID; + + SELECT @NAME_RECEIVER = [NAME] FROM [DD_ECM].[dbo].[VWSIG_ENVELOPE_RECEIVER] where ENV_ID = @ENVELOPE_ID AND REC_EMAIL = @REC_EMAIL; + IF @NAME_RECEIVER IS NULL + BEGIN + SET @NAME_RECEIVER = 'signFLOW - SYSTEM' + END + SET @EML_BODY_ADM = REPLACE(@EML_BODY_ADM,'[NAME_RECEIVER]',@NAME_RECEIVER) + SET @EML_BODY_ADM = REPLACE(@EML_BODY_ADM,'[NAME_SENDER]',@ADM_NAME) + --PRINT '#1' + @EML_BODY_ADM + --PRINT '#2' + @EML_BODY_ADM + SET @EML_BODY_ADM = REPLACE(@EML_BODY_ADM,'[DOCUMENT_TITLE]',@TITLE) + --PRINT '#3' + @EML_BODY_ADM + SET @EML_BODY_ADM = REPLACE(@EML_BODY_ADM,'[REASON]',@COMMENT) + --PRINT '#4' + @EML_BODY_ADM + SET @EML_BODY_ADM = REPLACE(@EML_BODY_ADM,'[NAME_PORTAL]',@NAME_PORTAL) + PRINT '@EML_BODY_ADM: ' + PRINT @EML_BODY_ADM + SET @EML_SUBJ_ADM = REPLACE(@EML_SUBJ_ADM,'[DOCUMENT_TITLE]',@TITLE) + PRINT '@EML_SUBJ_ADM: ' + PRINT @EML_SUBJ_ADM + PRINT 'EMAIL1...' + INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID) + VALUES (@ADM_MAIL, @EML_SUBJ_ADM, @EML_BODY_ADM, 'SIG RECEIVER REJECTED1', @SENDING_PROFILE, @ENVELOPE_ID, @ENV_UUID, 202377, @STATUS); + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[NAME_SENDER]',@ADM_NAME) + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[NAME_RECEIVER]',@NAME_RECEIVER) + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[DOCUMENT_TITLE]',@TITLE) + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[REASON]',@COMMENT) + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[NAME_PORTAL]',@NAME_PORTAL) + SET @EML_BODY_REC = REPLACE(@EML_BODY_REC,'[DOCUMENT_TITLE]',@TITLE) + SET @EML_SUBJ_REC = REPLACE(@EML_SUBJ_REC,'[DOCUMENT_TITLE]',@TITLE) + + IF @REC_EMAIL <> @ADM_MAIL + BEGIN + PRINT 'EMAIL2...' + INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID) + VALUES (@REC_EMAIL, @EML_SUBJ_REC, @EML_BODY_REC, 'SIG RECEIVER REJECTED2', @SENDING_PROFILE, @ENVELOPE_ID, @ENV_UUID, 202377, @STATUS); + END + + /*Andere Receiver über die Ablehnung informieren*/ + SET @EML_SUBJ_REC2 = REPLACE(@EML_SUBJ_REC2,'[DOCUMENT_TITLE]',@TITLE) + DECLARE @BODY_RECEIVER NVARCHAR(MAX),@EML_RECEIVER2 VARCHAR(250) + DECLARE cursReceiver_TBSIG_ENVELOPE_HISTORY CURSOR FOR + SELECT [NAME], [REC_EMAIL] FROM [DD_ECM].[dbo].[VWSIG_ENVELOPE_RECEIVER] where ENV_ID = @ENVELOPE_ID AND REC_EMAIL <> @REC_EMAIL + OPEN cursReceiver_TBSIG_ENVELOPE_HISTORY + FETCH NEXT FROM cursReceiver_TBSIG_ENVELOPE_HISTORY INTO @NAME_RECEIVER,@EML_RECEIVER2 + WHILE @@FETCH_STATUS = 0 + BEGIN + PRINT '@EML_BODY_REC2: ' + @EML_BODY_REC2 + SET @BODY_RECEIVER = @EML_BODY_REC2 + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[NAME_SENDER]',@ADM_NAME) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[NAME_RECEIVER]',@NAME_RECEIVER) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[DOCUMENT_TITLE]',@TITLE) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[REASON]',@COMMENT) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[NAME_PORTAL]',@NAME_PORTAL) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[DOCUMENT_TITLE]',@TITLE) + SET @BODY_RECEIVER = REPLACE(@BODY_RECEIVER,'[DOCUMENT_TITLE]',@TITLE) + PRINT 'EMAIL3...' + INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID) + VALUES (@EML_RECEIVER2, @EML_SUBJ_REC2, @BODY_RECEIVER, 'SIG RECEIVER REJECTED3', @SENDING_PROFILE, @ENVELOPE_ID, @ENV_UUID, 202377, @STATUS); + FETCH NEXT FROM cursReceiver_TBSIG_ENVELOPE_HISTORY INTO @NAME_RECEIVER,@EML_RECEIVER2 + END + CLOSE cursReceiver_TBSIG_ENVELOPE_HISTORY + DEALLOCATE cursReceiver_TBSIG_ENVELOPE_HISTORY + UPDATE TBSIG_ENVELOPE SET STATUS = 10007,COMMENT = @COMMENT WHERE GUID = @ENVELOPE_ID; /*Umschlag abgelehnt*/ + END + END + ELSE IF LEFT(CONVERT(VARCHAR(5),@STATUS),1) = 3 + IF @STATUS = 3001 /*EMAIL OUT SIGNATUREINLADUNG*/ + BEGIN + DECLARE @COUNT_MSG_OUT INT, @COUNT_USERS2_SIGN INT + SELECT @COUNT_MSG_OUT = COUNT(GUID) FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = @ENVELOPE_ID AND STATUS = 3001 ; + PRINT '@COUNT_MSG_OUT:' + CONVERT(VARCHAR(3),@COUNT_MSG_OUT) + SELECT @COUNT_USERS2_SIGN = COUNT(REC_ID) FROM VWSIG_ENVELOPE_RECEIVER WHERE ENV_ID = @ENVELOPE_ID; + PRINT '@@COUNT_USERS2_SIGN:' + CONVERT(VARCHAR(3),@COUNT_USERS2_SIGN) + IF @COUNT_MSG_OUT = @COUNT_USERS2_SIGN + UPDATE TBSIG_ENVELOPE SET STATUS = 1004 WHERE GUID = @ENVELOPE_ID; /*ALL INVITATIONS SENT*/ +-- INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID,USER_REFERENCE,STATUS,ACTION_DATE) VALUES (@ENVELOPE_ID,'Digital Data Email-Service',1004,GETDATE()) + END + +END TRY +BEGIN CATCH + PRINT 'ERROR IN PROCEDURE: ' + CONVERT(VARCHAR(30),ERROR_PROCEDURE()) + + ' - ERROR-MESSAGE: ' + + CONVERT(VARCHAR(500),ERROR_MESSAGE()) +END CATCH +GO \ No newline at end of file diff --git a/12_MWF/CreateDBObjects.sql b/12_MWF/CreateDBObjects.sql index 997ec44..79345dc 100644 --- a/12_MWF/CreateDBObjects.sql +++ b/12_MWF/CreateDBObjects.sql @@ -1,6 +1,14 @@ INSERT INTO TBDD_MODULES(GUID,NAME,SHORT_NAME,LICENSE,STRING1,ACTIVE) VALUES (9,'Mobile Workflow','MWF','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=','',1) GO +--DROP TABLE TBMWF_CONFIG; +--DROP TABLE TBMWF_PROF_BUTTONS; +--DROP TABLE TBMWF_PROF_CONTROLS_TF; +--DROP TABLE TBMWF_TF_FILES; +--DROP TABLE TBMWF_PROFILE_OBJ_STATE; +--DROP TABLE TBMWF_WF_STATE; +--DROP TABLE TBMWF_PROFILE_USER; +--DROP TABLE TBMWF_PROFILE INSERT INTO [dbo].[TBDD_GROUPS] ([NAME] ,[INTERNAL] ,[ACTIVE] ,[COMMENT]) VALUES ('MWF_USERS' @@ -19,11 +27,11 @@ GO CREATE TABLE TBMWF_CONFIG ( GUID INTEGER NOT NULL IDENTITY (1, 1), - CONF_TITLE VARCHAR(100) NOT NULL, - CONF_STRING VARCHAR(900) NOT NULL, - ADDED_WHO VARCHAR(30) NOT NULL DEFAULT 'SYSTEM', + CONF_TITLE NVARCHAR(100) NOT NULL, + CONF_STRING NVARCHAR(900) NOT NULL, + ADDED_WHO NVARCHAR(30) NOT NULL DEFAULT 'SYSTEM', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), - CHANGED_WHO VARCHAR(30), + CHANGED_WHO NVARCHAR(30), CHANGED_WHEN DATETIME, CONSTRAINT PK_TBMWF_CONFIG PRIMARY KEY (GUID), CONSTRAINT UQ_TBMWF_CONFIG_TITLE UNIQUE (CONF_TITLE) @@ -42,18 +50,19 @@ INSERT INTO TBMWF_CONFIG (CONF_TITLE,CONF_STRING) VALUES ------------------------------------------------------------------------------ +--DROP TABLE TBMWF_PROFILE CREATE TABLE TBMWF_PROFILE ( GUID INTEGER IDENTITY(1,1), - INTL_NAME VARCHAR(200) NOT NULL DEFAULT 0, + INTL_NAME NVARCHAR(200) NOT NULL DEFAULT 0, PM_PROFILE_ID INTEGER NOT NULL, [TYPE_ID] TINYINT NOT NULL DEFAULT 1, --1 TaskFlow,2 AblageFlow, 3 SignFlow ACTIVE BIT NOT NULL DEFAULT 0, - FORE_COLOR VARCHAR(100), - BACK_COLOR VARCHAR(100), - ADDED_WHO VARCHAR(30) NOT NULL DEFAULT 'SYSTEM', + FORE_COLOR NVARCHAR(100), + BACK_COLOR NVARCHAR(100), + ADDED_WHO NVARCHAR(30) NOT NULL DEFAULT 'SYSTEM', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), - CHANGED_WHO VARCHAR(30), + CHANGED_WHO NVARCHAR(30), CHANGED_WHEN DATETIME, CONSTRAINT PK_TBMWF_PROFILE_GUID PRIMARY KEY(GUID), CONSTRAINT UQ_TBMWF_PROFILE UNIQUE (INTL_NAME,PM_PROFILE_ID) @@ -75,9 +84,9 @@ CREATE TABLE TBMWF_PROFILE_CONTROLS_UPDATE MWF_PROFILE_ID INTEGER NOT NULL, USR_ID INTEGER NOT NULL, OBJ_ID BIGINT NOT NULL, - ATTR_NAME VARCHAR(100) NOT NULL, + ATTR_NAME NVARCHAR(100) NOT NULL, ATTR_VALUE NVARCHAR(3000) NOT NULL, - ADDED_WHO VARCHAR(30) NOT NULL DEFAULT 'SYS', + ADDED_WHO NVARCHAR(30) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), CONSTRAINT PK_TBMWF_PROFILE_CONTROLS_UPDATE PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_PROFILE_CONTROLS_UPDATE_PROFILE FOREIGN KEY (MWF_PROFILE_ID) REFERENCES TBMWF_PROFILE (GUID), @@ -88,8 +97,8 @@ GO CREATE TABLE TBMWF_WF_STATE ( GUID INTEGER NOT NULL IDENTITY (1, 1), - INTL_STATE VARCHAR(100) NOT NULL, - ADDED_WHO VARCHAR(30) NOT NULL DEFAULT 'SYS', + INTL_STATE NVARCHAR(100) NOT NULL, + ADDED_WHO NVARCHAR(30) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), CONSTRAINT PK_TBMWF_WF_STATE PRIMARY KEY (GUID), CONSTRAINT UQ_TBMWF_WF_STATE UNIQUE(INTL_STATE) @@ -108,9 +117,9 @@ CREATE TABLE TBMWF_PROFILE_OBJ_STATE STATE2 NVARCHAR(100), STATE3 NVARCHAR(100), STATE4 NVARCHAR(100), - ADDED_WHO VARCHAR(100) NOT NULL DEFAULT 'SYS', + ADDED_WHO NVARCHAR(100) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), - CHANGED_WHO VARCHAR(100), + CHANGED_WHO NVARCHAR(100), CHANGED_WHEN DATETIME, CONSTRAINT PK_TBMWF_PROFILE_OBJ_STATE PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_PROFILE_OBJ_STATE_STID FOREIGN KEY (STATE_ID) REFERENCES TBMWF_WF_STATE (GUID), @@ -118,7 +127,7 @@ CREATE TABLE TBMWF_PROFILE_OBJ_STATE ) GO - +--DROP TABLE TBMWF_PROFILE_OBJ_STATE_HISTORY CREATE TABLE TBMWF_PROFILE_OBJ_STATE_HISTORY ( GUID BIGINT NOT NULL IDENTITY (1, 1), @@ -129,43 +138,41 @@ CREATE TABLE TBMWF_PROFILE_OBJ_STATE_HISTORY STATE2 NVARCHAR(100), STATE3 NVARCHAR(100), STATE4 NVARCHAR(100), - CHANGED_WHO VARCHAR(100), + CHANGED_WHO NVARCHAR(100), CHANGED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), CONSTRAINT PK_TBMWF_PROFILE_OBJ_STATE_HISTORY PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_PROFILE_OBJ_STATE_HISTORY_STID FOREIGN KEY (STATE_ID) REFERENCES TBMWF_WF_STATE (GUID), CONSTRAINT FK_TBMWF_PROFILE_OBJ_STATE_HISTORY_PID FOREIGN KEY (MWF_PROFILE_ID) REFERENCES TBMWF_PROFILE (GUID) ) GO -USE [DD_ECM] -GO - -ALTER TRIGGER [dbo].[TBMWF_PROFILE_OBJ_STATE_AFT_UPD] ON [dbo].[TBMWF_PROFILE_OBJ_STATE] +CREATE TRIGGER [dbo].[TBMWF_PROFILE_OBJ_STATE_AFT_UPD] ON [dbo].[TBMWF_PROFILE_OBJ_STATE] FOR UPDATE AS - DECLARE @CHANGED_WHO VARCHAR(100) + DECLARE @CHANGED_WHO NVARCHAR(100) SELECT @CHANGED_WHO = CHANGED_WHO FROM inserted INSERT INTO TBMWF_PROFILE_OBJ_STATE_HISTORY (MWF_PROFILE_ID,USR_ID,OBJ_ID,STATE_ID,STATE2,STATE3,STATE4,CHANGED_WHO) SELECT MWF_PROFILE_ID,USR_ID,OBJ_ID,STATE_ID,STATE2,STATE3,STATE4,CHANGED_WHO FROM inserted UPDATE TBMWF_PROFILE_OBJ_STATE SET CHANGED_WHEN = GETDATE(),CHANGED_WHO = @CHANGED_WHO FROM INSERTED WHERE TBMWF_PROFILE_OBJ_STATE.GUID = INSERTED.GUID - +GO ------------------------------------------------------------------------------ +--DROP TABLE TBMWF_PROF_CONTROLS_TF CREATE TABLE TBMWF_PROF_CONTROLS_TF ( GUID BIGINT NOT NULL IDENTITY (1, 1), OBJ_STATE_ID BIGINT NOT NULL, DIALOG_NO TINYINT NOT NULL DEFAULT 1, - ATTR_NAME VARCHAR(100) NOT NULL, - CTRL_TYPE VARCHAR(10) NOT NULL, --TXT,CMB,DTP - CAPTION VARCHAR(100) NOT NULL, - [TEXT] VARCHAR(500) NOT NULL, - ICON VARCHAR(100) , + ATTR_NAME NVARCHAR(100) NOT NULL, + CTRL_TYPE NVARCHAR(10) NOT NULL, --TXT,CMB,DTP + CAPTION NVARCHAR(100) NOT NULL, + [TEXT] NVARCHAR(500) NOT NULL, + ICON NVARCHAR(100) , MANDATORY BIT NOT NULL DEFAULT 0, CHOICE_LIST NVARCHAR(MAX), [READ_ONLY] BIT NOT NULL DEFAULT 0, SEQU TINYINT DEFAULT 0, - ADDED_WHO VARCHAR(100) NOT NULL DEFAULT 'SYS', + ADDED_WHO NVARCHAR(100) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), CONSTRAINT PK_TBMWF_PROF_CONTROLS PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_PROF_CONTROLS_TF_OSID FOREIGN KEY (OBJ_STATE_ID) REFERENCES TBMWF_PROFILE_OBJ_STATE (GUID), @@ -178,11 +185,11 @@ CREATE TABLE TBMWF_TF_FILES GUID BIGINT NOT NULL IDENTITY (1, 1), OBJ_STATE_ID BIGINT NOT NULL, F_FAPTH NVARCHAR(512) NOT NULL, - HEADLINE VARCHAR(100) NOT NULL, - SUBLINE VARCHAR(100), - COMMENT VARCHAR(250), - ICON VARCHAR(100), - ADDED_WHO VARCHAR(100) NOT NULL DEFAULT 'SYS', + HEADLINE NVARCHAR(100) NOT NULL, + SUBLINE NVARCHAR(100), + COMMENT NVARCHAR(250), + ICON NVARCHAR(100), + ADDED_WHO NVARCHAR(100) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), CONSTRAINT PK_TBMWF_TF_FILES PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_TF_FILES_OSID FOREIGN KEY (OBJ_STATE_ID) REFERENCES TBMWF_PROFILE_OBJ_STATE (GUID) @@ -194,17 +201,17 @@ CREATE TABLE TBMWF_PROF_BUTTONS GUID INT NOT NULL IDENTITY (1, 1), MWF_PROFILE_ID INT NOT NULL, DIALOG_NO TINYINT NOT NULL DEFAULT 1, - BTN_TYPE VARCHAR(20) NOT NULL, --BUTTON_MAIN, BUTTON_1,BUTTON_2 - [TEXT] VARCHAR(500) NOT NULL, - ICON VARCHAR(100) , - FORE_COLOR VARCHAR(100) NOT NULL DEFAULT 'Black', - BACK_COLOR VARCHAR(100) NOT NULL DEFAULT '', + BTN_TYPE NVARCHAR(20) NOT NULL, --BUTTON_MAIN, BUTTON_1,BUTTON_2 + [TEXT] NVARCHAR(500) NOT NULL, + ICON NVARCHAR(100) , + FORE_COLOR NVARCHAR(100) NOT NULL DEFAULT 'Black', + BACK_COLOR NVARCHAR(100) NOT NULL DEFAULT '', COMMAND NVARCHAR(MAX) NOT NULL DEFAULT '', DIALOG_COMMAND NVARCHAR(MAX) NOT NULL DEFAULT '', CONFIRMATION_TEXT NVARCHAR(250) NOT NULL DEFAULT '', - ADDED_WHO VARCHAR(100) NOT NULL DEFAULT 'SYS', + ADDED_WHO NVARCHAR(100) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), - CHANGED_WHO VARCHAR(100), + CHANGED_WHO NVARCHAR(100), CHANGED_WHEN DATETIME, CONSTRAINT PK_TBMWF_PROF_BUTTONS PRIMARY KEY (GUID), CONSTRAINT FK_TBMWF_PROF_BUTTONS_PID FOREIGN KEY (MWF_PROFILE_ID) REFERENCES TBMWF_PROFILE (GUID), @@ -219,18 +226,18 @@ AS WHERE TBMWF_PROF_BUTTONS.GUID = INSERTED.GUID GO -CREATE TABLE TBMFI_PROFILE_USER +CREATE TABLE TBMWF_PROFILE_USER ( GUID BIGINT NOT NULL IDENTITY (1, 1), MWF_PROFILE_ID INTEGER NOT NULL, USR_ID INTEGER NOT NULL, - ADDED_WHO VARCHAR(100) NOT NULL DEFAULT 'SYS', + ADDED_WHO NVARCHAR(100) NOT NULL DEFAULT 'SYS', ADDED_WHEN DATETIME NOT NULL DEFAULT (GETDATE()), - CHANGED_WHO VARCHAR(100), + CHANGED_WHO NVARCHAR(100), CHANGED_WHEN DATETIME, - CONSTRAINT PK_TBMFI_PROFILE_USER PRIMARY KEY (GUID), - CONSTRAINT FK_TBMFI_PROFILE_USER_PID FOREIGN KEY (MWF_PROFILE_ID) REFERENCES TBMWF_PROFILE (GUID), - CONSTRAINT UQ_TBMFI_PROFILE_USER UNIQUE(MWF_PROFILE_ID,USR_ID) + CONSTRAINT PK_TBMWF_PROFILE_USER PRIMARY KEY (GUID), + CONSTRAINT FK_TBMWF_PROFILE_USER_PID FOREIGN KEY (MWF_PROFILE_ID) REFERENCES TBMWF_PROFILE (GUID), + CONSTRAINT UQ_TBMWF_PROFILE_USER UNIQUE(MWF_PROFILE_ID,USR_ID) ) GO @@ -245,12 +252,13 @@ INSERT INTO TBDD_GUI_LANGUAGE_PHRASE ( VALUES ( 'MFI', 1, '9', 'Title 9', 'de-DE','Title', 'Fotodokumentation','subtitle Fotodoku') GO + CREATE FUNCTION [dbo].[FNMWF_GET_PROFILES] (@pUSR_ID INTEGER) -RETURNS @TABLE_RETURN TABLE (PID INTEGER,[TYPE_ID] TINYINT, CAPTION VARCHAR(100),SUBTITLE VARCHAR(150), COUNTOBJ INT, FORE_COLOR VARCHAR(100) , BACK_COLOR VARCHAR(100)) +RETURNS @TABLE_RETURN TABLE (PID INTEGER,[TYPE_ID] TINYINT, CAPTION NVARCHAR(100),SUBTITLE NVARCHAR(150), COUNTOBJ INT, FORE_COLOR NVARCHAR(100) , BACK_COLOR NVARCHAR(100)) AS BEGIN INSERT INTO @TABLE_RETURN (PID,[TYPE_ID],CAPTION,SUBTITLE,COUNTOBJ, FORE_COLOR,BACK_COLOR) - SELECT A.MWF_PROFILE_ID,1,C.STRING1,C.String2,COUNT(A.GUID), B.FORE_COLOR,B.BACK_COLOR FROM TBMWF_PROFILE_OBJ_STATE A INNER JOIN TBMWF_PROFILE B ON A.MWF_PROFILE_ID = B.GUID + SELECT A.MWF_PROFILE_ID,1,C.STRING1,C.String2,COUNT(A.GUID),B.FORE_COLOR,B.BACK_COLOR FROM TBMWF_PROFILE_OBJ_STATE A INNER JOIN TBMWF_PROFILE B ON A.MWF_PROFILE_ID = B.GUID INNER JOIN (SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE = 'MWF') C ON A.MWF_PROFILE_ID = C.OBJ_NAME INNER JOIN TBDD_USER D ON A.USR_ID = D.GUID WHERE D.GUID = @pUSR_ID AND D.LANGUAGE = C.LANGUAGE AND A.STATE_ID = 1 @@ -258,7 +266,8 @@ BEGIN INSERT INTO @TABLE_RETURN (PID,[TYPE_ID],CAPTION,SUBTITLE,COUNTOBJ, FORE_COLOR,BACK_COLOR) - SELECT A.MWF_PROFILE_ID,2,C.STRING1,C.String2,0, B.FORE_COLOR,B.BACK_COLOR FROM TBMFI_PROFILE_USER A INNER JOIN TBMWF_PROFILE B ON A.MWF_PROFILE_ID = B.GUID + SELECT A.MWF_PROFILE_ID,2,C.STRING1,C.String2,0, B.FORE_COLOR,B.BACK_COLOR + FROM TBMWF_PROFILE_USER A INNER JOIN TBMWF_PROFILE B ON A.MWF_PROFILE_ID = B.GUID INNER JOIN (SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE = 'MFI') C ON A.MWF_PROFILE_ID = C.OBJ_NAME INNER JOIN TBDD_USER D ON A.USR_ID = D.GUID WHERE D.GUID = @pUSR_ID AND C.LANGUAGE = D.LANGUAGE @@ -267,8 +276,8 @@ BEGIN RETURN END GO -CREATE FUNCTION [dbo].[FNMWF_GET_ITEMS] (@pUSR_ID INTEGER,@pMWF_PID INTEGER) -RETURNS @TABLE_RETURN TABLE (ObjStateID BIGINT,ObjectID BIGINT,Headline1 VARCHAR(100),Headline2 VARCHAR(150),Subline1 VARCHAR(100),Subline2 VARCHAR(100),CMD_CheckIn NVARCHAR(MAX)) +CREATE OR ALTER FUNCTION [dbo].[FNMWF_GET_ITEMS] (@pUSR_ID INTEGER,@pMWF_PID INTEGER) +RETURNS @TABLE_RETURN TABLE (ObjStateID BIGINT,ObjectID BIGINT,Headline1 NVARCHAR(100),Headline2 NVARCHAR(150),Subline1 NVARCHAR(100),Subline2 NVARCHAR(100),CMD_CheckIn NVARCHAR(MAX)) AS BEGIN INSERT INTO @TABLE_RETURN (ObjStateID,ObjectID,Headline1,Headline2,Subline1,Subline2,CMD_CheckIn) diff --git a/12_MWF/Insert Objects DEV.sql b/12_MWF/Insert Objects DEV.sql index c797547..ac42a80 100644 --- a/12_MWF/Insert Objects DEV.sql +++ b/12_MWF/Insert Objects DEV.sql @@ -1,24 +1,61 @@ -INSERT INTO TBDD_GUI_LANGUAGE_PHRASE ( - MODULE, INTERNAL, OBJ_NAME, TITLE, LANGUAGE,CAPT_TYPE, STRING1,String2) - VALUES - ( 'MWF', 1, '1', 'Title 1', 'de-DE','Title', 'VA Freigabe','Freigabe in Rolle Verantwortlich') +--INSERT INTO TBDD_GUI_LANGUAGE_PHRASE ( +-- MODULE, INTERNAL, OBJ_NAME, TITLE, LANGUAGE,CAPT_TYPE, STRING1,String2) +-- VALUES +-- ( 'MWF', 1, '1', 'Title 1', 'de-DE','Title', 'VA Freigabe','Freigabe in Rolle Verantwortlich') +--GO +--INSERT INTO TBDD_GUI_LANGUAGE_PHRASE ( +-- MODULE, INTERNAL, OBJ_NAME, TITLE, LANGUAGE,CAPT_TYPE, STRING1,String2) +-- VALUES +-- ( 'MWF', 1, '3', 'Title 93', 'de-DE','Title', 'Finale Freigabe','Freigabe in Rolle Finaler Freigeber') +--GO +select * from TBMWF_PROFILE + +INSERT INTO [dbo].[TBMWF_PROFILE] + ([INTL_NAME] + ,[PM_PROFILE_ID] + ,[TYPE_ID] + ,[ACTIVE] + ,[FORE_COLOR] + ,[BACK_COLOR] ) + VALUES + ('TEST PROFIL MobileWorkflow - ' + ,6 + ,1 + ,1 + ,'Yellow' + ,'Black') GO -INSERT INTO TBDD_GUI_LANGUAGE_PHRASE ( - MODULE, INTERNAL, OBJ_NAME, TITLE, LANGUAGE,CAPT_TYPE, STRING1,String2) - VALUES - ( 'MWF', 1, '3', 'Title 93', 'de-DE','Title', 'Finale Freigabe','Freigabe in Rolle Finaler Freigeber') + +INSERT INTO [dbo].[TBMWF_PROFILE] + ([INTL_NAME] + ,[PM_PROFILE_ID] + ,[TYPE_ID] + ,[ACTIVE] + ,[FORE_COLOR] + ,[BACK_COLOR] ) + VALUES + ('TEST PROFIL MobileWorkflow - Finale Freigabe' + ,9 + ,1 + ,1 + ,'Green' + ,'Black') GO +select * from TBMWF_PROFILE_OBJ_STATE + INSERT INTO TBMWF_PROFILE_OBJ_STATE (MWF_PROFILE_ID,USR_ID,OBJ_ID,STATE_ID) VALUES (1,1,12968,1); +DECLARE @GUID BIGINT +SELECT @GUID = MAX(GUID) FROM TBMWF_PROFILE_OBJ_STATE; INSERT INTO TBMWF_PROF_CONTROLS_TF ( OBJ_STATE_ID,ATTR_NAME, CTRL_TYPE, CAPTION, TEXT, ICON, MANDATORY, CHOICE_LIST, READ_ONLY, SEQU) -VALUES (1, 'INV_NO', 'TXT', 'Rechnungs-Nummer', 'RE-4711', 'bookmark', 0, '', 1, 0), - (1, 'CREDITOR', 'TXT', 'Kreditor-Name', 'Europcar GmbH', 'credit-card', 0, '', 1, 1), - (1, 'Combobox1','CMB', 'Ein Combo-Feld:', '', 'check2-circle',1, 'Eintrag1;Eintrag2', 0, 2), - (1, 'Comment','TXT', 'Bemerkung', '', 'chat-square-text', 0, '', 0, 3); +VALUES (@GUID, 'INV_NO', 'TXT', 'Rechnungs-Nummer', 'RE-4711', 'bookmark', 0, '', 1, 0), + (@GUID, 'CREDITOR', 'TXT', 'Kreditor-Name', 'Europcar GmbH', 'credit-card', 0, '', 1, 1), + (@GUID, 'Combobox1','CMB', 'Ein Combo-Feld:', '', 'check2-circle',1, 'Eintrag1;Eintrag2', 0, 2), + (@GUID, 'Comment','TXT', 'Bemerkung', '', 'chat-square-text', 0, '', 0, 3); -INSERT INTO TBMFI_PROFILE_USER (MWF_PROFILE_ID,USR_ID) VALUES (6,1),(9,1); +INSERT INTO TBMWF_PROFILE_USER (MWF_PROFILE_ID,USR_ID) VALUES (1,1),(2,1); INSERT INTO [dbo].[TBMWF_PROF_BUTTONS] ([MWF_PROFILE_ID] ,[BTN_TYPE] @@ -30,7 +67,7 @@ INSERT INTO [dbo].[TBMWF_PROF_BUTTONS] ,ADDED_WHO ) VALUES - (3 + (1 ,1 ,'Genehmigen' ,'check-square-fill' @@ -50,7 +87,7 @@ INSERT INTO [dbo].[TBMWF_PROF_BUTTONS] ,ADDED_WHO ) VALUES - (3 + (1 ,2 ,'Ablehnen' ,'sign-stop-fill'