diff --git a/ScheMe/Accettazione.aspx b/ScheMe/Accettazione.aspx index d06572a..4f39f53 100644 --- a/ScheMe/Accettazione.aspx +++ b/ScheMe/Accettazione.aspx @@ -87,7 +87,7 @@ - + diff --git a/ScheMe/Accettazione.aspx.cs b/ScheMe/Accettazione.aspx.cs index 3073e6d..d350308 100644 --- a/ScheMe/Accettazione.aspx.cs +++ b/ScheMe/Accettazione.aspx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -using MedPred_Data; +using ScheMe_Data; namespace MedPred { diff --git a/ScheMe/AccettazioneEdit.aspx b/ScheMe/AccettazioneEdit.aspx index 08ecf62..520777f 100644 --- a/ScheMe/AccettazioneEdit.aspx +++ b/ScheMe/AccettazioneEdit.aspx @@ -156,7 +156,7 @@ - + diff --git a/ScheMe/Properties/PublishProfiles/IIS02.pubxml b/ScheMe/Properties/PublishProfiles/IIS02.pubxml index 06943bc..8e7abe7 100644 --- a/ScheMe/Properties/PublishProfiles/IIS02.pubxml +++ b/ScheMe/Properties/PublishProfiles/IIS02.pubxml @@ -21,21 +21,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - + - + - + @@ -69,8 +69,8 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - - + + \ No newline at end of file diff --git a/ScheMe/Properties/PublishProfiles/WinLab.pubxml b/ScheMe/Properties/PublishProfiles/WinLab.pubxml index 668f411..b551c95 100644 --- a/ScheMe/Properties/PublishProfiles/WinLab.pubxml +++ b/ScheMe/Properties/PublishProfiles/WinLab.pubxml @@ -21,21 +21,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>True - + - + - + - + @@ -69,11 +69,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt DonotMerge - + Data Source=localhost\SQLExpress2008R2;Initial Catalog=ScheMe;Persist Security Info=True;User ID=sa;Password=keyhammer False - + Data Source=localhost\SQLExpress2008R2;Initial Catalog=ScheMe_files;Persist Security Info=True;User ID=sa;Password=keyhammer False diff --git a/ScheMe/VAC.aspx b/ScheMe/VAC.aspx index bc9ce0c..82ae7e9 100644 --- a/ScheMe/VAC.aspx +++ b/ScheMe/VAC.aspx @@ -344,7 +344,7 @@ - + @@ -393,91 +393,91 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/ScheMe/VBMA.aspx b/ScheMe/VBMA.aspx index 536fefb..3562656 100644 --- a/ScheMe/VBMA.aspx +++ b/ScheMe/VBMA.aspx @@ -468,7 +468,7 @@ - + @@ -526,7 +526,7 @@ - + diff --git a/ScheMe/VCP.aspx b/ScheMe/VCP.aspx index 30cfbb9..998f1b4 100644 --- a/ScheMe/VCP.aspx +++ b/ScheMe/VCP.aspx @@ -310,7 +310,7 @@ - + @@ -354,7 +354,7 @@ - + diff --git a/ScheMe/VL.aspx b/ScheMe/VL.aspx index b8908da..6f5490e 100644 --- a/ScheMe/VL.aspx +++ b/ScheMe/VL.aspx @@ -341,7 +341,7 @@ - + diff --git a/ScheMe/VP.aspx b/ScheMe/VP.aspx index 68fa23c..a5f7ca2 100644 --- a/ScheMe/VP.aspx +++ b/ScheMe/VP.aspx @@ -209,7 +209,7 @@ - + @@ -239,37 +239,37 @@ - + - + - + - + - + - + diff --git a/ScheMe/VRF.aspx b/ScheMe/VRF.aspx index e1abd7c..389a7f7 100644 --- a/ScheMe/VRF.aspx +++ b/ScheMe/VRF.aspx @@ -108,7 +108,7 @@ - + diff --git a/ScheMe/VSV.aspx b/ScheMe/VSV.aspx index 8c2d1b4..9a8f5f2 100644 --- a/ScheMe/VSV.aspx +++ b/ScheMe/VSV.aspx @@ -476,7 +476,7 @@ - + @@ -544,79 +544,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/ScheMe/Web.WinLab.config b/ScheMe/Web.WinLab.config index 3e836e9..8317475 100644 --- a/ScheMe/Web.WinLab.config +++ b/ScheMe/Web.WinLab.config @@ -24,8 +24,8 @@ - - + + diff --git a/ScheMe/Web.config b/ScheMe/Web.config index f504d34..26d932f 100644 --- a/ScheMe/Web.config +++ b/ScheMe/Web.config @@ -48,8 +48,8 @@ - - + + diff --git a/ScheMe/WebUserControls/mod_ElencoVisitePaziente.ascx b/ScheMe/WebUserControls/mod_ElencoVisitePaziente.ascx index 29d8e17..9f57aac 100644 --- a/ScheMe/WebUserControls/mod_ElencoVisitePaziente.ascx +++ b/ScheMe/WebUserControls/mod_ElencoVisitePaziente.ascx @@ -72,7 +72,7 @@ - + diff --git a/ScheMe/WebUserControls/mod_enrollByAuthKey.ascx.cs b/ScheMe/WebUserControls/mod_enrollByAuthKey.ascx.cs index f96aceb..0fa03f5 100644 --- a/ScheMe/WebUserControls/mod_enrollByAuthKey.ascx.cs +++ b/ScheMe/WebUserControls/mod_enrollByAuthKey.ascx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -using MedPred_Data; +using ScheMe_Data; namespace MedPred.WebUserControls { diff --git a/ScheMe/WebUserControls/mod_enrollByEmail.ascx.cs b/ScheMe/WebUserControls/mod_enrollByEmail.ascx.cs index b55a70d..2e98799 100644 --- a/ScheMe/WebUserControls/mod_enrollByEmail.ascx.cs +++ b/ScheMe/WebUserControls/mod_enrollByEmail.ascx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -using MedPred_Data; +using ScheMe_Data; namespace MedPred.WebUserControls { diff --git a/ScheMe/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs b/ScheMe/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs index fbd3ad7..846501b 100644 --- a/ScheMe/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs +++ b/ScheMe/WebUserControls/mod_enrollByJumperAuthKey.ascx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -using MedPred_Data; +using ScheMe_Data; namespace MedPred.WebUserControls { diff --git a/ScheMe/WebUserControls/mod_fileUpload.ascx b/ScheMe/WebUserControls/mod_fileUpload.ascx index fa8beac..dbe8f89 100644 --- a/ScheMe/WebUserControls/mod_fileUpload.ascx +++ b/ScheMe/WebUserControls/mod_fileUpload.ascx @@ -56,7 +56,7 @@ - + diff --git a/ScheMe/WebUserControls/mod_fileUpload.ascx.cs b/ScheMe/WebUserControls/mod_fileUpload.ascx.cs index e9781e1..81c7a56 100644 --- a/ScheMe/WebUserControls/mod_fileUpload.ascx.cs +++ b/ScheMe/WebUserControls/mod_fileUpload.ascx.cs @@ -8,7 +8,7 @@ using System.IO; using System.Data; using System.Data.SqlClient; using System.Configuration; -using MedPred_Data; +using ScheMe_Data; using System.Text; using SteamWare; @@ -61,7 +61,7 @@ namespace MedPred.WebUserControls int idxFile = int.Parse((sender as LinkButton).CommandArgument); byte[] bytes; string fileName, contentType; - MedPred_Data.DS_Utility.tblFilesRow fileRow = DtProxy.man.taFile.getByKey(idxFile)[0]; + ScheMe_Data.DS_Utility.tblFilesRow fileRow = DtProxy.man.taFile.getByKey(idxFile)[0]; bytes = fileRow.Data; contentType = fileRow.ContentType; fileName = fileRow.FileName; diff --git a/ScheMe/WebUserControls/mod_header.ascx.cs b/ScheMe/WebUserControls/mod_header.ascx.cs index deaf4b0..1ab92c4 100644 --- a/ScheMe/WebUserControls/mod_header.ascx.cs +++ b/ScheMe/WebUserControls/mod_header.ascx.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using MedPred_Data; +using ScheMe_Data; using SteamWare; namespace MedPred.WebUserControls diff --git a/ScheMe/WebUserControls/mod_reportVisita.ascx.cs b/ScheMe/WebUserControls/mod_reportVisita.ascx.cs index 05f057e..65bf8af 100644 --- a/ScheMe/WebUserControls/mod_reportVisita.ascx.cs +++ b/ScheMe/WebUserControls/mod_reportVisita.ascx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; using Microsoft.Reporting.WebForms; using System.Data; using SteamWare; -using MedPred_Data; +using ScheMe_Data; namespace MedPred.WebUserControls { diff --git a/ScheMe/bin/MedPred.dll b/ScheMe/bin/MedPred.dll index 68767d4..02d7522 100644 Binary files a/ScheMe/bin/MedPred.dll and b/ScheMe/bin/MedPred.dll differ diff --git a/ScheMe/bin/MedPred.dll.config b/ScheMe/bin/MedPred.dll.config index f504d34..26d932f 100644 --- a/ScheMe/bin/MedPred.dll.config +++ b/ScheMe/bin/MedPred.dll.config @@ -48,8 +48,8 @@ - - + + diff --git a/ScheMe/bin/MedPred_Data.dll b/ScheMe/bin/MedPred_Data.dll index f8833dc..1918caa 100644 Binary files a/ScheMe/bin/MedPred_Data.dll and b/ScheMe/bin/MedPred_Data.dll differ diff --git a/ScheMe/bin/SteamWare.dll b/ScheMe/bin/SteamWare.dll index 8017730..86caffa 100644 Binary files a/ScheMe/bin/SteamWare.dll and b/ScheMe/bin/SteamWare.dll differ diff --git a/ScheMe_Data/bin/Debug/MedPred_Data.dll b/ScheMe_Data/bin/Debug/MedPred_Data.dll index f8833dc..1918caa 100644 Binary files a/ScheMe_Data/bin/Debug/MedPred_Data.dll and b/ScheMe_Data/bin/Debug/MedPred_Data.dll differ diff --git a/ScheMe_Data/bin/Debug/SteamWare.dll b/ScheMe_Data/bin/Debug/SteamWare.dll index 8017730..86caffa 100644 Binary files a/ScheMe_Data/bin/Debug/SteamWare.dll and b/ScheMe_Data/bin/Debug/SteamWare.dll differ