Egalware/SSC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix traduzioen anceh x parametri misura...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-26 09:41:16 +01:00
parent ac444f5e1d
commit 55cfe1f914
11 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/DS_Applicazione.Designer.cs
Generated
+34 -7
View File
@@ -2397,7 +2397,7 @@ namespace CMS_SC_Data {
this.columnTipoValMisura.AllowDBNull = false;
this.columnTipoValMisura.MaxLength = 50;
this.columnNomePar.AllowDBNull = false;
this.columnNomePar.MaxLength = 50;
this.columnNomePar.MaxLength = 100;
this.columnCodVisib.AllowDBNull = false;
this.columnCodVisib.MaxLength = 50;
}
@@ -4131,6 +4131,8 @@ namespace CMS_SC_Data {
private global::System.Data.DataColumn columnOrdinale;
private global::System.Data.DataColumn columnRev;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public MisureDataTable() {
@@ -4340,6 +4342,14 @@ namespace CMS_SC_Data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn RevColumn {
get {
return this.columnRev;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -4399,7 +4409,8 @@ namespace CMS_SC_Data {
double LSVal,
string CodSchedaVersNum,
string CodVisib,
int Ordinale) {
int Ordinale,
int Rev) {
MisureRow rowMisureRow = ((MisureRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdxDossier,
@@ -4423,7 +4434,8 @@ namespace CMS_SC_Data {
LSVal,
CodSchedaVersNum,
CodVisib,
Ordinale};
Ordinale,
Rev};
if ((parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1 != null)) {
columnValuesArray[5] = parentAnagFasiRowByFK_IstanzeMisura_AnagFasi1[0];
}
@@ -4483,6 +4495,7 @@ namespace CMS_SC_Data {
this.columnCodSchedaVersNum = base.Columns["CodSchedaVersNum"];
this.columnCodVisib = base.Columns["CodVisib"];
this.columnOrdinale = base.Columns["Ordinale"];
this.columnRev = base.Columns["Rev"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4532,6 +4545,8 @@ namespace CMS_SC_Data {
base.Columns.Add(this.columnCodVisib);
this.columnOrdinale = new global::System.Data.DataColumn("Ordinale", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnOrdinale);
this.columnRev = new global::System.Data.DataColumn("Rev", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnRev);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnIdxDossier,
this.columnCodScheda,
@@ -4558,7 +4573,7 @@ namespace CMS_SC_Data {
this.columnCodDeroga.AllowDBNull = false;
this.columnCodDeroga.MaxLength = 50;
this.columnNomeMisura.AllowDBNull = false;
this.columnNomeMisura.MaxLength = 50;
this.columnNomeMisura.MaxLength = 500;
this.columnTipoValMisura.AllowDBNull = false;
this.columnTipoValMisura.MaxLength = 50;
this.columnNomePar.AllowDBNull = false;
@@ -4568,6 +4583,7 @@ namespace CMS_SC_Data {
this.columnCodVisib.AllowDBNull = false;
this.columnCodVisib.MaxLength = 50;
this.columnOrdinale.AllowDBNull = false;
this.columnRev.AllowDBNull = false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8416,6 +8432,17 @@ namespace CMS_SC_Data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public int Rev {
get {
return ((int)(this[this.tableMisure.RevColumn]));
}
set {
this[this.tableMisure.RevColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public AnagFasiRow AnagFasiRow {
@@ -14853,6 +14880,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
tableMapping.ColumnMappings.Add("CodVisib", "CodVisib");
tableMapping.ColumnMappings.Add("Codschedaversnum", "Codschedaversnum");
tableMapping.ColumnMappings.Add("Ordinale", "Ordinale");
tableMapping.ColumnMappings.Add("CodSchedaVersNum", "CodSchedaVersNum");
tableMapping.ColumnMappings.Add("Rev", "Rev");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -14869,9 +14898,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOr" +
"a, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar" +
", MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure";
this._commandCollection[0].CommandText = "SELECT * FROM v_Misure";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
CMS-SC-Data/DS_Applicazione.xsd
+6 -3
View File
@@ -1031,7 +1031,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.v_Misure" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT IdxDossier, CodScheda, Vers, NumScheda, CodMisura, Fase, Operatore, DataOra, ValorePar, ValoreMis, OkValMis, CodDeroga, NomeMisura, TipoValMisura, NomePar, MinPar, MaxPar, LIVal, LSVal, CodVisib, Ordinale FROM v_Misure</CommandText>
<CommandText>SELECT * FROM v_Misure</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
@@ -1060,6 +1060,8 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin
<Mapping SourceColumn="CodVisib" DataSetColumn="CodVisib" />
<Mapping SourceColumn="Codschedaversnum" DataSetColumn="Codschedaversnum" />
<Mapping SourceColumn="Ordinale" DataSetColumn="Ordinale" />
<Mapping SourceColumn="CodSchedaVersNum" DataSetColumn="CodSchedaVersNum" />
<Mapping SourceColumn="Rev" DataSetColumn="Rev" />
</Mappings>
<Sources>
<DbSource ConnectionRef="CMS_SCConnectionString (Settings)" DbObjectName="[CMS-SC].dbo.stp_Mis_Deroga" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deroga" Modifier="Public" Name="deroga" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deroga">
@@ -1699,7 +1701,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
<xs:element name="NomePar" msprop:Generator_ColumnVarNameInTable="columnNomePar" msprop:Generator_ColumnPropNameInRow="NomePar" msprop:Generator_ColumnPropNameInTable="NomeParColumn" msprop:Generator_UserColumnName="NomePar">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1935,7 +1937,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
<xs:element name="NomeMisura" msprop:Generator_ColumnVarNameInTable="columnNomeMisura" msprop:Generator_ColumnPropNameInRow="NomeMisura" msprop:Generator_ColumnPropNameInTable="NomeMisuraColumn" msprop:Generator_UserColumnName="NomeMisura">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
<xs:maxLength value="500" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -1972,6 +1974,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa
</xs:simpleType>
</xs:element>
<xs:element name="Ordinale" msprop:Generator_ColumnVarNameInTable="columnOrdinale" msprop:Generator_ColumnPropNameInRow="Ordinale" msprop:Generator_ColumnPropNameInTable="OrdinaleColumn" msprop:Generator_UserColumnName="Ordinale" type="xs:int" />
<xs:element name="Rev" msprop:Generator_ColumnVarNameInTable="columnRev" msprop:Generator_ColumnPropNameInRow="Rev" msprop:Generator_ColumnPropNameInTable="RevColumn" msprop:Generator_UserColumnName="Rev" type="xs:int" />
</xs:sequence>
</xs:complexType>
</xs:element>
CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
CMS_SC/WebUserControls/mod_DettScheda.ascx
+11 -3
View File
@@ -83,9 +83,17 @@
<asp:Label ID="Label1" runat="server" Text='<%# Bind("TipoValMisura") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="NomePar" HeaderText="Nome Par." SortExpression="NomePar" ControlStyle-Width="16em" >
<ControlStyle Width="16em"></ControlStyle>
</asp:BoundField>
<asp:TemplateField HeaderText="Nome Par." SortExpression="NomePar">
<EditItemTemplate>
<asp:TextBox ID="TextBox2" runat="server" Text='<%# Bind("NomePar") %>' CssClass="form-control form-control-sm small" TextMode="MultiLine" Height="8em" Font-Size="0.9em" />
<p><b>[IT]</b>Versione testo in Italiano<b>[/IT]</b><br />
<b>[EN]</b>English version text<b>[/EN]</b></p>
</EditItemTemplate>
<ItemTemplate>
<uc1:mod_textTrans runat="server" ID="mod_textTrans2" fullText='<%# Eval("NomePar") %>' tagOpen="[IT]" tagClose="[/IT]" showAllLang="true" />
</ItemTemplate>
<ControlStyle Width="16em" />
</asp:TemplateField>
<asp:BoundField DataField="CodVisib" HeaderText="Visib." SortExpression="CodVisib" ControlStyle-Width="3em" >
<ControlStyle Width="3em"></ControlStyle>
</asp:BoundField>
CMS_SC/WebUserControls/mod_collaudi.ascx
+1
View File
@@ -1,5 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_collaudi.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
<%@ Register Src="~/WebUserControls/mod_textTrans.ascx" TagPrefix="uc1" TagName="mod_textTrans" %>
<script type="text/javascript">
function enter(obj) {
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
CMS_SC/sql/Update_3.1.sql
+2
View File
@@ -42,6 +42,8 @@ UPDATE AnagSchede SET Descrizione = '[IT]' + Descrizione + '[/IT]' + CHAR(10) +
ALTER TABLE Dettscheda ALTER COLUMN NomeMisura NVARCHAR(500) NOT NULL
--aggiorno DETTAGLIO scheda...
UPDATE Dettscheda SET NomeMisura = '[IT]' + NomeMisura + '[/IT]' + CHAR(10) + '[EN]' + NomeMisura + '[/EN]'
-- SOLO parametri PRESENTI...
UPDATE Dettscheda SET NomePar = '[IT]' + NomePar + '[/IT]' + CHAR(10) + '[EN]' + NomePar + '[/EN]' WHERE NomePar <> ''
-- modifica colonna SchemaCollFamMacc.Descrizione in NVARCHAR(500)
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4200']) {
withEnv(['NEXT_BUILD_NUMBER=4205']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'
VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.