diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index b239979..d5669c3 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.8.028.43")] -[assembly: AssemblyFileVersion("0.8.028.43")] +[assembly: AssemblyVersion("0.9.030.43")] +[assembly: AssemblyFileVersion("0.9.030.43")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 01b4f94..0f61f65 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.8.028.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.8.028.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.9.030.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.9.030.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 62e3ca5..28f4645 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 202915a..961cd84 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 62e3ca5..28f4645 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index f6b0a10..2b6321a 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Squadra.aspx b/WebSCR/Squadra.aspx index 511de9d..86aacd1 100644 --- a/WebSCR/Squadra.aspx +++ b/WebSCR/Squadra.aspx @@ -4,6 +4,7 @@ <%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %> <%@ Register Src="~/WebUserControls/mod_ImpegnoSmall.ascx" TagPrefix="uc1" TagName="mod_ImpegnoSmall" %> <%@ Register Src="~/WebUserControls/mod_gestIntSquadra.ascx" TagPrefix="uc1" TagName="mod_gestIntSquadra" %> +<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %> @@ -11,8 +12,11 @@
- - - + + +
+ +
+
diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs index 2b15056..f6aaf45 100644 --- a/WebSCR/Squadra.aspx.cs +++ b/WebSCR/Squadra.aspx.cs @@ -42,6 +42,7 @@ namespace WebSCR mod_consegne.Visible = true; mod_dettInt.Visible = false; mod_ImpegnoSmall.Visible = false; + divFile.Visible = false; mod_gestIntSquadra.Visible = false; if (qsVal("Data") != "") { @@ -50,6 +51,7 @@ namespace WebSCR mod_gestIntSquadra.Visible = true; mod_ImpegnoSmall.Visible = true; mod_dettInt.Visible = true; + divFile.Visible = true; mod_consegne.Visible = false; } else diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs index fcf6c8f..e384932 100644 --- a/WebSCR/Squadra.aspx.designer.cs +++ b/WebSCR/Squadra.aspx.designer.cs @@ -39,6 +39,24 @@ namespace WebSCR { /// protected global::WebSCR.WebUserControls.mod_ImpegnoSmall mod_ImpegnoSmall; + /// + /// divFile control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFile; + + /// + /// mod_fileUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_fileUpload mod_fileUpload; + /// /// mod_dettInt control. /// diff --git a/WebSCR/WebUserControls/mod_consegne.ascx b/WebSCR/WebUserControls/mod_consegne.ascx index d4b451e..706622b 100644 --- a/WebSCR/WebUserControls/mod_consegne.ascx +++ b/WebSCR/WebUserControls/mod_consegne.ascx @@ -14,7 +14,7 @@ - Nessun risultato + Nessuna Consegna diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx b/WebSCR/WebUserControls/mod_fileUpload.ascx index 47bf42e..b85a5fd 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx @@ -6,11 +6,11 @@
-
+
-
- +
+
@@ -31,19 +31,19 @@ - - - +
+ + + +
+
+ + +
- - - - - -
@@ -56,23 +56,23 @@ - + - + - - + + - - + + diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs index 6b4e97a..cec741e 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs @@ -29,33 +29,30 @@ namespace WebSCR.WebUserControls { string filename = Path.GetFileName(FileUpload1.PostedFile.FileName); string contentType = FileUpload1.PostedFile.ContentType; - string gruppo = memLayer.ML.StringSessionObj("Gruppo"); - int idxPaziente = memLayer.ML.IntSessionObj("IdxPaziente"); + int idxImpegno = memLayer.ML.QSI("idxImpegno"); using (Stream fs = FileUpload1.PostedFile.InputStream) { using (BinaryReader br = new BinaryReader(fs)) { byte[] bytes = br.ReadBytes((Int32)fs.Length); - // controllo se sia caricamento o update... - if (grView.SelectedIndex != -1) + // PROCEDO SOLO SE HO UN FILE!!!! ovvero bytes <> null + if (bytes.Length > 0) { - try + // controllo se sia caricamento o update... + if (grView.SelectedIndex != -1) { - int orig_idxFile = Convert.ToInt32(grView.SelectedValue); - // FARE!!! -#if false - DtProxy.man.taFile.UpdateQuery(gruppo, idxPaziente, filename, contentType, bytes, orig_idxFile); -#endif + try + { + int orig_idxFile = Convert.ToInt32(grView.SelectedValue); + DtProxy.man.taFile.UpdateQuery(idxImpegno, 0, filename, contentType, bytes, orig_idxFile); + } + catch + { } + } + else + { + DtProxy.man.taFile.InsertQuery(idxImpegno, 0, filename, contentType, bytes); } - catch - { } - } - else - { - // FARE!!! -#if false - DtProxy.man.taFile.InsertQuery(gruppo, idxPaziente, filename, contentType, bytes); -#endif } } } @@ -86,13 +83,13 @@ namespace WebSCR.WebUserControls { // mostro controllo x edit... fisVisFU(true); - btnUpload.Text = "Aggiorna File"; + btnUpload.Text = "Sostituisci File"; } protected void btnAdd_Click(object sender, EventArgs e) { fisVisFU(true); - btnUpload.Text = "Carica Nuovo"; + btnUpload.Text = "Carica Nuovo File"; } /// /// fix visibilità controllo file upload diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx index 63ff124..16cd648 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx @@ -23,7 +23,6 @@ -
diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs index bbbe74f..cf8283c 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs @@ -107,7 +107,7 @@ namespace WebSCR.WebUserControls lbFineInt.Visible = iniziato && !finito; if (divNote.Visible) { - lbNoteInt.Text = "Annulla edit note"; + lbNoteInt.Text = "Chiudi Note Intervento"; } else { @@ -151,11 +151,6 @@ namespace WebSCR.WebUserControls reportEvent(); } - protected void lbFileInt_Click(object sender, EventArgs e) - { - fixVisibility(); - reportEvent(); - } /// /// Aggiungo nota... /// diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs index 887640e..e3a7c87 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs @@ -57,15 +57,6 @@ namespace WebSCR.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbNoteInt; - /// - /// lbFileInt control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbFileInt; - /// /// divNote control. /// diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index ff002c1..1c54fc0 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 85e3111..c5d053a 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ