diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index e250d3b..3a7d55e 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + diff --git a/GIM_data/DS_applicazione.xsd b/GIM_data/DS_applicazione.xsd index 83fbcdd..6bd3c90 100644 --- a/GIM_data/DS_applicazione.xsd +++ b/GIM_data/DS_applicazione.xsd @@ -1857,7 +1857,7 @@ FROM v_mtzProgExp - + dbo.stp_elencoIntByIntervDateUserFiltExtended @@ -1875,7 +1875,7 @@ FROM v_mtzProgExp - + @@ -1894,6 +1894,8 @@ FROM v_mtzProgExp + + @@ -2391,7 +2393,7 @@ FROM v_mtzProgExp - + @@ -2476,7 +2478,7 @@ FROM v_mtzProgExp - + @@ -2501,7 +2503,7 @@ FROM v_mtzProgExp - + @@ -2535,7 +2537,7 @@ FROM v_mtzProgExp - + @@ -2613,7 +2615,7 @@ FROM v_mtzProgExp - + @@ -2637,7 +2639,7 @@ FROM v_mtzProgExp - + @@ -2680,6 +2682,20 @@ FROM v_mtzProgExp + + + + + + + + + + + + + + @@ -2793,22 +2809,22 @@ FROM v_mtzProgExp - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GIM_data/DS_applicazione.xss b/GIM_data/DS_applicazione.xss index fb552e5..7d75441 100644 --- a/GIM_data/DS_applicazione.xss +++ b/GIM_data/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -30,7 +30,7 @@ - + diff --git a/GIM_data/DS_applicazione1.Designer.cs b/GIM_data/DS_applicazione1.Designer.cs index fefe514..9a0d55f 100644 --- a/GIM_data/DS_applicazione1.Designer.cs +++ b/GIM_data/DS_applicazione1.Designer.cs @@ -9647,7 +9647,7 @@ namespace GIM_data { private global::System.Data.DataColumn columndescrCausale; - private global::System.Data.DataColumn columndescrizione; + private global::System.Data.DataColumn columndescrizRichiesta; private global::System.Data.DataColumn columndescrizioneIntervento; @@ -9685,6 +9685,10 @@ namespace GIM_data { private global::System.Data.DataColumn columntotQtaHR; + private global::System.Data.DataColumn columndescrAmbitoGuasto; + + private global::System.Data.DataColumn columnisExt; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ElencoIntervExtDataTable() { @@ -9744,9 +9748,9 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn descrizioneColumn { + public global::System.Data.DataColumn descrizRichiestaColumn { get { - return this.columndescrizione; + return this.columndescrizRichiesta; } } @@ -9894,6 +9898,22 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn descrAmbitoGuastoColumn { + get { + return this.columndescrAmbitoGuasto; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn isExtColumn { + get { + return this.columnisExt; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -9935,7 +9955,7 @@ namespace GIM_data { string codImpianto, string codMacchina, string descrCausale, - string descrizione, + string descrizRichiesta, string descrizioneIntervento, double durataMtz, double durataOff, @@ -9953,13 +9973,15 @@ namespace GIM_data { bool isFermo, bool scheduled, decimal totImpMat, - decimal totQtaHR) { + decimal totQtaHR, + string descrAmbitoGuasto, + string isExt) { ElencoIntervExtRow rowElencoIntervExtRow = ((ElencoIntervExtRow)(this.NewRow())); object[] columnValuesArray = new object[] { codImpianto, codMacchina, descrCausale, - descrizione, + descrizRichiesta, descrizioneIntervento, durataMtz, durataOff, @@ -9977,7 +9999,9 @@ namespace GIM_data { isFermo, scheduled, totImpMat, - totQtaHR}; + totQtaHR, + descrAmbitoGuasto, + isExt}; rowElencoIntervExtRow.ItemArray = columnValuesArray; this.Rows.Add(rowElencoIntervExtRow); return rowElencoIntervExtRow; @@ -10010,7 +10034,7 @@ namespace GIM_data { this.columncodImpianto = base.Columns["codImpianto"]; this.columncodMacchina = base.Columns["codMacchina"]; this.columndescrCausale = base.Columns["descrCausale"]; - this.columndescrizione = base.Columns["descrizione"]; + this.columndescrizRichiesta = base.Columns["descrizRichiesta"]; this.columndescrizioneIntervento = base.Columns["descrizioneIntervento"]; this.columndurataMtz = base.Columns["durataMtz"]; this.columndurataOff = base.Columns["durataOff"]; @@ -10029,6 +10053,8 @@ namespace GIM_data { this.columnscheduled = base.Columns["scheduled"]; this.columntotImpMat = base.Columns["totImpMat"]; this.columntotQtaHR = base.Columns["totQtaHR"]; + this.columndescrAmbitoGuasto = base.Columns["descrAmbitoGuasto"]; + this.columnisExt = base.Columns["isExt"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10040,8 +10066,8 @@ namespace GIM_data { base.Columns.Add(this.columncodMacchina); this.columndescrCausale = new global::System.Data.DataColumn("descrCausale", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columndescrCausale); - this.columndescrizione = new global::System.Data.DataColumn("descrizione", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columndescrizione); + this.columndescrizRichiesta = new global::System.Data.DataColumn("descrizRichiesta", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndescrizRichiesta); this.columndescrizioneIntervento = new global::System.Data.DataColumn("descrizioneIntervento", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columndescrizioneIntervento); this.columndurataMtz = new global::System.Data.DataColumn("durataMtz", typeof(double), null, global::System.Data.MappingType.Element); @@ -10078,14 +10104,18 @@ namespace GIM_data { base.Columns.Add(this.columntotImpMat); this.columntotQtaHR = new global::System.Data.DataColumn("totQtaHR", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columntotQtaHR); + this.columndescrAmbitoGuasto = new global::System.Data.DataColumn("descrAmbitoGuasto", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndescrAmbitoGuasto); + this.columnisExt = new global::System.Data.DataColumn("isExt", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnisExt); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnnumIntMtz}, true)); this.columncodImpianto.MaxLength = 50; this.columncodMacchina.MaxLength = 50; this.columndescrCausale.ReadOnly = true; this.columndescrCausale.MaxLength = 50; - this.columndescrizione.AllowDBNull = false; - this.columndescrizione.MaxLength = 2500; + this.columndescrizRichiesta.AllowDBNull = false; + this.columndescrizRichiesta.MaxLength = 2500; this.columndescrizioneIntervento.ReadOnly = true; this.columndescrizioneIntervento.MaxLength = 2500; this.columndurataMtz.ReadOnly = true; @@ -10103,6 +10133,9 @@ namespace GIM_data { this.columnisFermo.AllowDBNull = false; this.columntotImpMat.ReadOnly = true; this.columntotQtaHR.ReadOnly = true; + this.columndescrAmbitoGuasto.MaxLength = 50; + this.columnisExt.ReadOnly = true; + this.columnisExt.MaxLength = 1; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14402,12 +14435,12 @@ namespace GIM_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string descrizione { + public string descrizRichiesta { get { - return ((string)(this[this.tableElencoIntervExt.descrizioneColumn])); + return ((string)(this[this.tableElencoIntervExt.descrizRichiestaColumn])); } set { - this[this.tableElencoIntervExt.descrizioneColumn] = value; + this[this.tableElencoIntervExt.descrizRichiestaColumn] = value; } } @@ -14665,6 +14698,38 @@ namespace GIM_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string descrAmbitoGuasto { + get { + try { + return ((string)(this[this.tableElencoIntervExt.descrAmbitoGuastoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'descrAmbitoGuasto\' in table \'ElencoIntervExt\' is DBNull.", e); + } + } + set { + this[this.tableElencoIntervExt.descrAmbitoGuastoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string isExt { + get { + try { + return ((string)(this[this.tableElencoIntervExt.isExtColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'isExt\' in table \'ElencoIntervExt\' is DBNull.", e); + } + } + set { + this[this.tableElencoIntervExt.isExtColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IscodImpiantoNull() { @@ -14832,6 +14897,30 @@ namespace GIM_data { public void SettotQtaHRNull() { this[this.tableElencoIntervExt.totQtaHRColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsdescrAmbitoGuastoNull() { + return this.IsNull(this.tableElencoIntervExt.descrAmbitoGuastoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetdescrAmbitoGuastoNull() { + this[this.tableElencoIntervExt.descrAmbitoGuastoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsisExtNull() { + return this.IsNull(this.tableElencoIntervExt.isExtColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetisExtNull() { + this[this.tableElencoIntervExt.isExtColumn] = global::System.Convert.DBNull; + } } /// @@ -24783,7 +24872,7 @@ namespace GIM_data.DS_applicazioneTableAdapters { tableMapping.ColumnMappings.Add("codImpianto", "codImpianto"); tableMapping.ColumnMappings.Add("codMacchina", "codMacchina"); tableMapping.ColumnMappings.Add("descrCausale", "descrCausale"); - tableMapping.ColumnMappings.Add("descrizione", "descrizione"); + tableMapping.ColumnMappings.Add("descrizRichiesta", "descrizRichiesta"); tableMapping.ColumnMappings.Add("descrizioneIntervento", "descrizioneIntervento"); tableMapping.ColumnMappings.Add("durataMtz", "durataMtz"); tableMapping.ColumnMappings.Add("durataOff", "durataOff"); @@ -24802,6 +24891,8 @@ namespace GIM_data.DS_applicazioneTableAdapters { tableMapping.ColumnMappings.Add("scheduled", "scheduled"); tableMapping.ColumnMappings.Add("totImpMat", "totImpMat"); tableMapping.ColumnMappings.Add("totQtaHR", "totQtaHR"); + tableMapping.ColumnMappings.Add("descrAmbitoGuasto", "descrAmbitoGuasto"); + tableMapping.ColumnMappings.Add("isExt", "isExt"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/GIM_data/DS_utility.Designer.cs b/GIM_data/DS_utility.Designer.cs index f698f13..598b427 100644 --- a/GIM_data/DS_utility.Designer.cs +++ b/GIM_data/DS_utility.Designer.cs @@ -7068,8 +7068,8 @@ namespace GIM_data { this.columnvalue.AllowDBNull = false; this.columnvalue.Unique = true; this.columnvalue.MaxLength = 50; - this.columnlabel.MaxLength = 151; - this.columnconditio.MaxLength = 4; + this.columnlabel.MaxLength = 250; + this.columnconditio.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7331,8 +7331,8 @@ namespace GIM_data { base.Columns.Add(this.columnvalue); this.columnlabel = new global::System.Data.DataColumn("label", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnlabel); - this.columnvalue.MaxLength = 4; - this.columnlabel.MaxLength = 24; + this.columnvalue.MaxLength = 50; + this.columnlabel.MaxLength = 250; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -14326,7 +14326,7 @@ namespace GIM_data.DS_utilityTableAdapters { this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT value, label FROM dbo.v_selGrpCodRicAmm"; + this._commandCollection[0].CommandText = "SELECT value, label FROM dbo.v_selGrpCodRicAmm\r\nORDER BY label"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } diff --git a/GIM_data/DS_utility.xsd b/GIM_data/DS_utility.xsd index 350b215..c7ac668 100644 --- a/GIM_data/DS_utility.xsd +++ b/GIM_data/DS_utility.xsd @@ -692,8 +692,9 @@ FROM v_mtzProgPendingExp - - SELECT value, label FROM dbo.v_selGrpCodRicAmm + + SELECT value, label FROM dbo.v_selGrpCodRicAmm +ORDER BY label @@ -1146,7 +1147,7 @@ FROM v_mtzProgPendingExp - + @@ -1166,7 +1167,7 @@ FROM v_mtzProgPendingExp - + @@ -1186,7 +1187,7 @@ FROM v_mtzProgPendingExp - + @@ -1221,7 +1222,7 @@ FROM v_mtzProgPendingExp - + @@ -1234,34 +1235,34 @@ FROM v_mtzProgPendingExp - + - + - + - + - + diff --git a/GIM_data/DS_utility.xss b/GIM_data/DS_utility.xss index c79a517..5fbe2e0 100644 --- a/GIM_data/DS_utility.xss +++ b/GIM_data/DS_utility.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/GIM_data/bin/GIM_data.dll b/GIM_data/bin/GIM_data.dll index d1512a9..aaad07f 100644 Binary files a/GIM_data/bin/GIM_data.dll and b/GIM_data/bin/GIM_data.dll differ diff --git a/GIM_data/bin/SteamWare.dll b/GIM_data/bin/SteamWare.dll index 0ff3678..0b7e1ee 100644 Binary files a/GIM_data/bin/SteamWare.dll and b/GIM_data/bin/SteamWare.dll differ diff --git a/GIM_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GIM_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 80ae1fc..5e77c85 100644 Binary files a/GIM_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GIM_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache index 1d894ab..42f2511 100644 Binary files a/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache and b/GIM_data/obj/Debug/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/GIM_data/obj/Debug/TempPE/DS_applicazione1.Designer.cs.dll b/GIM_data/obj/Debug/TempPE/DS_applicazione1.Designer.cs.dll index 60ece54..a859ac1 100644 Binary files a/GIM_data/obj/Debug/TempPE/DS_applicazione1.Designer.cs.dll and b/GIM_data/obj/Debug/TempPE/DS_applicazione1.Designer.cs.dll differ diff --git a/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll b/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll index 008487a..ea0be4f 100644 Binary files a/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll and b/GIM_data/obj/Debug/TempPE/DS_utility.Designer.cs.dll differ diff --git a/GIM_site/ExcelExportReportIntAll.aspx b/GIM_site/ExcelExportReportIntAll.aspx index 5d9d83e..65e0ff9 100644 --- a/GIM_site/ExcelExportReportIntAll.aspx +++ b/GIM_site/ExcelExportReportIntAll.aspx @@ -22,7 +22,7 @@ - + @@ -41,6 +41,9 @@ + + + + Always @@ -799,7 +800,6 @@ - diff --git a/GIM_site/GIM_site.csproj.user b/GIM_site/GIM_site.csproj.user index 610bfda..bb9532f 100644 --- a/GIM_site/GIM_site.csproj.user +++ b/GIM_site/GIM_site.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - WinLab + Somaschini-ITA false disabled enabled diff --git a/GIM_site/Properties/PublishProfiles/218.pubxml b/GIM_site/Properties/PublishProfiles/218.pubxml new file mode 100644 index 0000000..c864def --- /dev/null +++ b/GIM_site/Properties/PublishProfiles/218.pubxml @@ -0,0 +1,23 @@ + + + + + MSDeploy + Release + Any CPU + + True + False + https://10.74.82.218:8172/MsDeploy.axd + Default Web Site/WebGIM + + True + WMSVC + True + samuele + <_SavePWD>True + + \ No newline at end of file diff --git a/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml.user b/GIM_site/Properties/PublishProfiles/218.pubxml.user similarity index 52% rename from GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml.user rename to GIM_site/Properties/PublishProfiles/218.pubxml.user index 5d1dfa6..879cba9 100644 --- a/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml.user +++ b/GIM_site/Properties/PublishProfiles/218.pubxml.user @@ -5,7 +5,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt --> - 2013-02-18T17:23:39.8554171+01:00 - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA7gr2JUxpGk+kgETgdPCX3gAAAAACAAAAAAADZgAAwAAAABAAAAAYZhHxMHg3PYUb1pwQBmqrAAAAAASAAACgAAAAEAAAAJgnDas++91dJ3aJwtqNmp4YAAAA4oUQ3U1wc4o00tIvbJunvwZxhRASRurnFAAAAECAjHKtx6yvGzeMtHWEakjAMnA4 + 2017-01-30T09:56:36.6209292+01:00 + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAADfdPkbM5mUeaV6YvQx8NEwAAAAACAAAAAAADZgAAwAAAABAAAADlCYjFFvzSZes6DVdoDHvPAAAAAASAAACgAAAAEAAAAK66imnsr3lYMHl6RlwLaPYQAAAArhQ3FNNAxrbXFQ59NsI+QBQAAAD5zw6dj2bqGSTpBYCBGv/9RmcMPw== \ No newline at end of file diff --git a/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml b/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml deleted file mode 100644 index 5c04fce..0000000 --- a/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - MSDeploy - Release - Any CPU - - True - True - https://IIS02:8172/MsDeploy.axd - Default Web Site/WebGIM - - False - WMSVC - True - steamw\Administrator - <_SavePWD>True - - - - - - - - - - - - - - - - - - - - - - - - - False - True - True - False - DonotMerge - - - - False - - - False - - - \ No newline at end of file diff --git a/GIM_site/Properties/PublishProfiles/WinLab.pubxml b/GIM_site/Properties/PublishProfiles/WinLab.pubxml index f1f5b36..3c120a3 100644 --- a/GIM_site/Properties/PublishProfiles/WinLab.pubxml +++ b/GIM_site/Properties/PublishProfiles/WinLab.pubxml @@ -10,13 +10,13 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - True + False https://winlab.steamware.net:8172/MsDeploy.axd Default Web Site/WebGIM - False + True WMSVC - True + False Administrator <_SavePWD>True @@ -43,10 +43,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt - True - True - False - DonotMerge diff --git a/GIM_site/Properties/PublishProfiles/WinLab.pubxml.user b/GIM_site/Properties/PublishProfiles/WinLab.pubxml.user index 1fb21d6..6cc135f 100644 --- a/GIM_site/Properties/PublishProfiles/WinLab.pubxml.user +++ b/GIM_site/Properties/PublishProfiles/WinLab.pubxml.user @@ -5,7 +5,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt --> - 2013-02-18T17:23:39.8554171+01:00 - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAARBxIIZk0hEq8Sf3uyTVbWAAAAAACAAAAAAADZgAAwAAAABAAAACLBowd2wC09L9RYVTfDIo7AAAAAASAAACgAAAAEAAAADNkWwKfNYCXXqN5eqZuYbcYAAAA5wKUHwO1vYp08LCZuqxaxkyt+nbG/zFMFAAAAP7O6KvSPqIPo+LUM8OQCnNgyphJ + 2017-01-30T09:56:36.6209292+01:00 + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAADfdPkbM5mUeaV6YvQx8NEwAAAAACAAAAAAADZgAAwAAAABAAAAA/tNUTMx2aPO/TMNb5PH5qAAAAAASAAACgAAAAEAAAAAJb5Iy3trKT4zmRJUqir30YAAAA9O77zB5hfNy9oJKYz0A5y3CHkv8J2KIYFAAAANq6ss3kld8PPTCBRTqOHAk4rEUl \ No newline at end of file diff --git a/GIM_site/WebUserControls/mod_magRic.ascx b/GIM_site/WebUserControls/mod_magRic.ascx index c36f7ad..f3d3d75 100644 --- a/GIM_site/WebUserControls/mod_magRic.ascx +++ b/GIM_site/WebUserControls/mod_magRic.ascx @@ -10,9 +10,10 @@
<%: traduci("lblNewDescr") %>  |   - +  |  - + +
<%: traduci("addNewItem") %> @@ -164,9 +165,8 @@ - - - + +
diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 0ff3678..0b7e1ee 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 3d1e6ed..91a8051 100644 Binary files a/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache index 3bc5106..08f6c81 100644 Binary files a/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache and b/GIM_site/obj/Debug/GIM_site.csprojResolveAssemblyReference.cache differ