diff --git a/MedPred.sln b/MedPred.sln index 7188c0a..a9d7e48 100644 --- a/MedPred.sln +++ b/MedPred.sln @@ -10,61 +10,26 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - EQUA|Any CPU = EQUA|Any CPU - ETS|Any CPU = ETS|Any CPU - ETS-218|Any CPU = ETS-218|Any CPU Release|Any CPU = Release|Any CPU - SomaschiniUSA|Any CPU = SomaschiniUSA|Any CPU - Steamware|Any CPU = Steamware|Any CPU WinLab|Any CPU = WinLab|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.EQUA|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.EQUA|Any CPU.Build.0 = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.ETS|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.ETS|Any CPU.Build.0 = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.ETS-218|Any CPU.Build.0 = Release|Any CPU {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Release|Any CPU.ActiveCfg = Release|Any CPU {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Release|Any CPU.Build.0 = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Steamware|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.Steamware|Any CPU.Build.0 = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.WinLab|Any CPU.Build.0 = Release|Any CPU + {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {87AFEC5A-E097-44F5-A9D3-ADCF468CC330}.WinLab|Any CPU.Build.0 = WinLab|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = EQUA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = ETS|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = ETS-218|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = ETS-218|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Steamware|Any CPU - {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Steamware|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = WinLab|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.EQUA|Any CPU.ActiveCfg = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.EQUA|Any CPU.Build.0 = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.ETS|Any CPU.ActiveCfg = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.ETS|Any CPU.Build.0 = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.ETS-218|Any CPU.Build.0 = Release|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Release|Any CPU.Build.0 = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Steamware|Any CPU.ActiveCfg = Release|Any CPU - {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.Steamware|Any CPU.Build.0 = Release|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.WinLab|Any CPU.ActiveCfg = Release|Any CPU {E1579F2C-67E1-441E-9F71-BF6BAAC04F61}.WinLab|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/MedPred/MedPred.csproj b/MedPred/MedPred.csproj index c007bf4..f52fccc 100644 --- a/MedPred/MedPred.csproj +++ b/MedPred/MedPred.csproj @@ -334,6 +334,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + @@ -344,6 +345,9 @@ + + Web.config + @@ -471,6 +475,15 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + bin\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/MedPred/Properties/AssemblyInfo.cs b/MedPred/Properties/AssemblyInfo.cs index 09ae3a3..2f3f163 100644 --- a/MedPred/Properties/AssemblyInfo.cs +++ b/MedPred/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("MedPred")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Gestioen database Medicina Predittiva")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Steamware")] [assembly: AssemblyProduct("MedPred")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.5.*")] +[assembly: AssemblyFileVersion("0.5.*")] diff --git a/MedPred/Properties/PublishProfiles/218.pubxml b/MedPred/Properties/PublishProfiles/218.pubxml index db369f5..7751084 100644 --- a/MedPred/Properties/PublishProfiles/218.pubxml +++ b/MedPred/Properties/PublishProfiles/218.pubxml @@ -10,10 +10,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - True - True - False - DonotMerge True https://10.74.82.218:8172/MsDeploy.axd Default Web Site/MedPred @@ -23,5 +19,23 @@ by editing this MSBuild file. In order to learn more about this please visit htt True administrator <_SavePWD>True + True + True + False + DonotMerge + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MedPred/Properties/PublishProfiles/WinLab.pubxml b/MedPred/Properties/PublishProfiles/WinLab.pubxml new file mode 100644 index 0000000..8e97cf9 --- /dev/null +++ b/MedPred/Properties/PublishProfiles/WinLab.pubxml @@ -0,0 +1,44 @@ + + + + + MSDeploy + WinLab + Any CPU + + True + True + https://winlab.steamware.net:8172/MsDeploy.axd + MedPred + + False + WMSVC + True + Administrator + <_SavePWD>True + + + + + + + + + + + + + + + True + True + False + DonotMerge + + + + + \ No newline at end of file diff --git a/MedPred/VGen.aspx.cs b/MedPred/VGen.aspx.cs index 00555c4..51bd0e6 100644 --- a/MedPred/VGen.aspx.cs +++ b/MedPred/VGen.aspx.cs @@ -21,10 +21,9 @@ namespace MedPred if (cmd == "new") { // creo nuova visita in data odierna - DateTime dataVisita = DateTime.Now.Date; + DateTime dataVisita = Convert.ToDateTime(memLayer.ML.objSessionObj("DataVisita")); DtProxy.man.taVGen.InsertQuery(IdxPaziente, dataVisita, 0, 0, 0, 0, 0, 0); // Redirect senza creazione nuovo! - memLayer.ML.setSessionVal("DataVisita", dataVisita); Response.Redirect("VGen?cmd=sel"); } // se ho idxRow selezionata imposto diff --git a/MedPred/Web.WinLab.config b/MedPred/Web.WinLab.config new file mode 100644 index 0000000..3980104 --- /dev/null +++ b/MedPred/Web.WinLab.config @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MedPred/WebUserControls/mod_header.ascx b/MedPred/WebUserControls/mod_header.ascx index fcb0c7c..4dad603 100644 --- a/MedPred/WebUserControls/mod_header.ascx +++ b/MedPred/WebUserControls/mod_header.ascx @@ -1,18 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="MedPred.WebUserControls.mod_header" %> -

MedPred - <%: titolo %> -

+Steamware + +

MedPred - <%: titolo %>

Options
<%: pazienteSel %>
-<%----%> - diff --git a/MedPred/WebUserControls/mod_header.ascx.cs b/MedPred/WebUserControls/mod_header.ascx.cs index f582a3f..86de428 100644 --- a/MedPred/WebUserControls/mod_header.ascx.cs +++ b/MedPred/WebUserControls/mod_header.ascx.cs @@ -15,6 +15,7 @@ namespace MedPred.WebUserControls if (!Page.IsPostBack) { Page.Title = Request.Url.ToString(); + lblVers.Text = string.Format("v.{0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); } } /// diff --git a/MedPred/WebUserControls/mod_header.ascx.designer.cs b/MedPred/WebUserControls/mod_header.ascx.designer.cs index 1efe720..e4184e5 100644 --- a/MedPred/WebUserControls/mod_header.ascx.designer.cs +++ b/MedPred/WebUserControls/mod_header.ascx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace MedPred.WebUserControls -{ - - - public partial class mod_header - { +namespace MedPred.WebUserControls { + + + public partial class mod_header { + + /// + /// lblVers control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblVers; } } diff --git a/MedPred_Data/bin/Release/MedPred_Data.dll b/MedPred_Data/bin/Release/MedPred_Data.dll index b02ebc0..2e7e0ef 100644 Binary files a/MedPred_Data/bin/Release/MedPred_Data.dll and b/MedPred_Data/bin/Release/MedPred_Data.dll differ diff --git a/MedPred_Data/bin/Release/SteamWare.dll b/MedPred_Data/bin/Release/SteamWare.dll index e3bf691..773daba 100644 Binary files a/MedPred_Data/bin/Release/SteamWare.dll and b/MedPred_Data/bin/Release/SteamWare.dll differ