Vers 0.5.*

Creato profilo pubblicazione su WinLab
Fix creazione nuova visita generale (con data della richiesta...)
Pubblicato su WinLab!
This commit is contained in:
Samuele E. Locatelli
2014-04-24 17:31:01 +02:00
parent c13ab96e6f
commit 1788b5671e
12 changed files with 137 additions and 67 deletions
+2 -37
View File
@@ -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
+13
View File
@@ -334,6 +334,7 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</Content>
<None Include="Properties\PublishProfiles\WinLab.pubxml" />
<None Include="Scripts\jquery-2.1.0.intellisense.js" />
<Content Include="Scripts\jquery-2.1.0.js" />
<Content Include="Scripts\jquery-2.1.0.min.js" />
@@ -344,6 +345,9 @@
<Content Include="Web.config" />
<Content Include="Scripts\jquery.mobile-1.4.2.min.map" />
<Content Include="Scripts\jquery-2.1.0.min.map" />
<None Include="Web.WinLab.config">
<DependentUpon>Web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="Accettazione.aspx.cs">
@@ -471,6 +475,15 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'WinLab|AnyCPU'">
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+4 -4
View File
@@ -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.*")]
+18 -4
View File
@@ -10,10 +10,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://10.74.82.218:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MedPred</DeployIisAppPath>
@@ -23,5 +19,23 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>administrator</UserName>
<_SavePWD>True</_SavePWD>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MedPred_Data.Properties.Settings.MedPredConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MedPred_Data.Properties.Settings.MedPredConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
</PropertyGroup>
</Project>
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>WinLab</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://winlab.steamware.net:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>MedPred</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>Administrator</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MedPred_Data.Properties.Settings.MedPredConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MedPred_Data.Properties.Settings.MedPredConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MedPred_Data.Properties.Settings.MedPredConnectionString-Web.config Connection String" />
</ItemGroup>
</Project>
+1 -2
View File
@@ -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
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<appSettings>
<add key="MedPredConnectionString" value="Data Source=localhost\SQLExpress2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<connectionStrings>
<add name="MedPred_Data.Properties.Settings.MedPredConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=MedPred;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>
+3 -13
View File
@@ -1,18 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="MedPred.WebUserControls.mod_header" %>
<h1>MedPred - <%: titolo %>
</h1>
<a href="http://medpred.steamware.net" data-icon="home" class="ui-btn-left">Steamware
<asp:Label ID="lblVers" runat="server" Font-Bold="false" Font-Size="0.8em" /></a>
<h1>MedPred - <%: titolo %></h1>
<a href="#" data-icon="gear" class="ui-btn-right">Options</a>
<div style="text-align: center; font-size: 0.8em; font-weight: 100;">
<%: pazienteSel %>
</div>
<%--<div data-role="navbar">
<ul>
<li><a href="#">Generale</a></li>
<li><a href="#">CicloErgom</a></li>
<li><a href="#">Cardio</a></li>
<li><a href="#">BioMecc</a></li>
<li><a href="#">Laboratorio</a></li>
<li><a href="#">Psico</a></li>
</ul>
</div>--%>
<!-- /navbar -->
@@ -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);
}
}
/// <summary>
+14 -7
View File
@@ -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.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MedPred.WebUserControls
{
public partial class mod_header
{
namespace MedPred.WebUserControls {
public partial class mod_header {
/// <summary>
/// lblVers control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblVers;
}
}
Binary file not shown.
Binary file not shown.