From cf4d1eadc91fc27cc4fe85d03989da76d68063e0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Mar 2018 18:13:32 +0100 Subject: [PATCH] fix SQL x controlli --- Jenkinsfile | 2 +- SQL Utils/SqlUpdate_5.0.sql | 82 ++++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2871396a..6fa7a81a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=723']) { + withEnv(['NEXT_BUILD_NUMBER=725']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/SQL Utils/SqlUpdate_5.0.sql b/SQL Utils/SqlUpdate_5.0.sql index be17af63..a509adf7 100644 --- a/SQL Utils/SqlUpdate_5.0.sql +++ b/SQL Utils/SqlUpdate_5.0.sql @@ -175,4 +175,84 @@ WHERE conditio IS NULL AND IdxMacchina = CASE WHEN @IdxMacchina <> '0' THEN @IdxMacchina ELSE IdxMacchina END RETURN -GO \ No newline at end of file +GO + + + +CREATE VIEW [dbo].[v_selListVal] +AS +SELECT TableName + '-' + FieldName + '-' + value AS value, label +FROM dbo.ListValues + +GO + + + +/****** Object: StoredProcedure [dbo].[stp_listValues_getValidValues] Script Date: 15/03/2018 18:02:25 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +-- ============================================= +-- STORED stp_getValidValues +-- +-- Author: S.E.L. +-- Create date: 2011.05.26 +-- Description: gestione selezione dati parametrici +-- ============================================= +create PROCEDURE [dbo].[stp_listValues_getValidValues] +( + @TableName NVARCHAR(50), + @FieldName NVARCHAR(50) +) +AS +BEGIN + SET NOCOUNT ON; + + SELECT value, label + FROM ListValues + WHERE TableName = @TableName + AND FieldName = @FieldName + ORDER BY ordinal +END +GO + + +/****** Object: StoredProcedure [dbo].[stp_listValues_getValidValuesTrad] Script Date: 15/03/2018 18:02:41 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +-- ============================================= +-- STORED stp_getValidValues +-- +-- Author: S.E.L. +-- Create date: 2015.09.15 +-- Description: gestione selezione dati parametrici tradotti +-- ============================================= +CREATE PROCEDURE [dbo].[stp_listValues_getValidValuesTrad] +( + @TableName NVARCHAR(50), + @FieldName NVARCHAR(50), + @Lingua NVARCHAR(3) +) +AS +BEGIN + SET NOCOUNT ON; + + SELECT lv.value, ISNULL(v.Traduzione, lv.TableName+lv.FieldName+lv.value) AS label + FROM ListValues lv LEFT OUTER JOIN Vocabolario v + ON lv.TableName+lv.FieldName+lv.value = v.Lemma + AND v.Lingua = @Lingua + WHERE lv.TableName = @TableName + AND lv.FieldName = @FieldName + ORDER BY lv.ordinal +END +GO +