diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 7c75edb..db3daf6 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide b/.vs/MedAP/v15/Server/sqlite3/storage.ide index 3b118f1..748a92a 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide and b/.vs/MedAP/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal index 6fea4ac..16d44c6 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal and b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal differ diff --git a/MedAP/DocArchive.aspx.cs b/MedAP/DocArchive.aspx.cs index a1313ba..0dbfb28 100644 --- a/MedAP/DocArchive.aspx.cs +++ b/MedAP/DocArchive.aspx.cs @@ -71,6 +71,12 @@ namespace MedAP break; case ucEvType.ReqUpdateParent: mod_searchParam.doUpdate(); + // se ha eliminato indica NON selezionato anche in elenco... + if (mod_DocsDetail.idxDoc <= 0) + { + mod_DocsArchive.resetSelezione(); + divDetail.Visible = false; + } mod_DocsArchive.doUpdate(); break; case ucEvType.Selected: diff --git a/MedAP/WebUserControl/mod_DocsDetail.ascx b/MedAP/WebUserControl/mod_DocsDetail.ascx index 41a2ada..440c437 100644 --- a/MedAP/WebUserControl/mod_DocsDetail.ascx +++ b/MedAP/WebUserControl/mod_DocsDetail.ascx @@ -189,9 +189,9 @@
  -   -   - +   +   +
diff --git a/MedAP/WebUserControl/mod_DocsDetail.ascx.cs b/MedAP/WebUserControl/mod_DocsDetail.ascx.cs index a42b011..c3eae6f 100644 --- a/MedAP/WebUserControl/mod_DocsDetail.ascx.cs +++ b/MedAP/WebUserControl/mod_DocsDetail.ascx.cs @@ -1,4 +1,5 @@ -using SteamWare; +using MedAP_data; +using SteamWare; using System; using System.Collections.Generic; using System.Data; @@ -46,14 +47,14 @@ namespace MedAP.WebUserControl BillingProxy.man.taDocs.clone(idxDoc); raiseEvent(ucEvType.New); } - protected void ChiudiButton_Click(object sender, EventArgs e) + protected void CancellaButton_Click(object sender, EventArgs e) { - BillingProxy.man.taDocs.forceSetPagato(idxDoc, DateTime.Now.Date, true); - frmViewTestata.DataBind(); + // cancellazione fattura... + MedAPModel.DocumentiDelete(idxDoc); + // imposto idxDoc a 0... + idxDoc = 0; raiseEvent(ucEvType.ReqUpdateParent); } - - /// /// elenco colonne del datagrid /// diff --git a/MedAP/bin/MedAP_data.dll b/MedAP/bin/MedAP_data.dll index 9aa9fbd..b080048 100644 Binary files a/MedAP/bin/MedAP_data.dll and b/MedAP/bin/MedAP_data.dll differ diff --git a/MedAP/bin/MedAP_data.pdb b/MedAP/bin/MedAP_data.pdb index 3fe1ca5..947e630 100644 Binary files a/MedAP/bin/MedAP_data.pdb and b/MedAP/bin/MedAP_data.pdb differ diff --git a/MedAP/bin/SHERPA.dll b/MedAP/bin/SHERPA.dll index 4a98a25..29f381b 100644 Binary files a/MedAP/bin/SHERPA.dll and b/MedAP/bin/SHERPA.dll differ diff --git a/MedAP/bin/SHERPA.pdb b/MedAP/bin/SHERPA.pdb index bbc10e8..d419db3 100644 Binary files a/MedAP/bin/SHERPA.pdb and b/MedAP/bin/SHERPA.pdb differ diff --git a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache index 5e394a8..78add78 100644 Binary files a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache and b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache differ diff --git a/MedAP/obj/Debug/SHERPA.dll b/MedAP/obj/Debug/SHERPA.dll index 4a98a25..29f381b 100644 Binary files a/MedAP/obj/Debug/SHERPA.dll and b/MedAP/obj/Debug/SHERPA.dll differ diff --git a/MedAP/obj/Debug/SHERPA.pdb b/MedAP/obj/Debug/SHERPA.pdb index bbc10e8..d419db3 100644 Binary files a/MedAP/obj/Debug/SHERPA.pdb and b/MedAP/obj/Debug/SHERPA.pdb differ diff --git a/MedAP_data/APModel.Context.cs b/MedAP_data/APModel.Context.cs index 5f16fe3..6b6bd04 100644 --- a/MedAP_data/APModel.Context.cs +++ b/MedAP_data/APModel.Context.cs @@ -227,5 +227,135 @@ namespace MedAP_data return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_clienti_update", original_idxCliParameter, ragSocParameter, sessoParameter, pOBirthParameter, dOBirthParameter, p_ivaParameter, c_FiscParameter, viaParameter, localitaParameter, capParameter, provinciaParameter, pagamentoParameter, emailParameter, telParameter, noteParameter, idxGruppoParameter); } + + public virtual int stp_docs_clone(Nullable idxFatt) + { + var idxFattParameter = idxFatt.HasValue ? + new ObjectParameter("IdxFatt", idxFatt) : + new ObjectParameter("IdxFatt", typeof(int)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_clone", idxFattParameter); + } + + public virtual int stp_docs_delete(Nullable original_idxDoc) + { + var original_idxDocParameter = original_idxDoc.HasValue ? + new ObjectParameter("Original_idxDoc", original_idxDoc) : + new ObjectParameter("Original_idxDoc", typeof(int)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_delete", original_idxDocParameter); + } + + public virtual ObjectResult stp_docs_getByKey(Nullable idxDoc) + { + var idxDocParameter = idxDoc.HasValue ? + new ObjectParameter("idxDoc", idxDoc) : + new ObjectParameter("idxDoc", typeof(int)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_getByKey", idxDocParameter); + } + + public virtual ObjectResult stp_docs_getFilt(Nullable anno, Nullable idxCli, string tipo, string gruppo, string ragSoc, Nullable inizio, Nullable fine, Nullable aperta, string search) + { + var annoParameter = anno.HasValue ? + new ObjectParameter("anno", anno) : + new ObjectParameter("anno", typeof(int)); + + var idxCliParameter = idxCli.HasValue ? + new ObjectParameter("idxCli", idxCli) : + new ObjectParameter("idxCli", typeof(int)); + + var tipoParameter = tipo != null ? + new ObjectParameter("tipo", tipo) : + new ObjectParameter("tipo", typeof(string)); + + var gruppoParameter = gruppo != null ? + new ObjectParameter("gruppo", gruppo) : + new ObjectParameter("gruppo", typeof(string)); + + var ragSocParameter = ragSoc != null ? + new ObjectParameter("ragSoc", ragSoc) : + new ObjectParameter("ragSoc", typeof(string)); + + var inizioParameter = inizio.HasValue ? + new ObjectParameter("inizio", inizio) : + new ObjectParameter("inizio", typeof(System.DateTime)); + + var fineParameter = fine.HasValue ? + new ObjectParameter("fine", fine) : + new ObjectParameter("fine", typeof(System.DateTime)); + + var apertaParameter = aperta.HasValue ? + new ObjectParameter("aperta", aperta) : + new ObjectParameter("aperta", typeof(int)); + + var searchParameter = search != null ? + new ObjectParameter("search", search) : + new ObjectParameter("search", typeof(string)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_getFilt", annoParameter, idxCliParameter, tipoParameter, gruppoParameter, ragSocParameter, inizioParameter, fineParameter, apertaParameter, searchParameter); + } + + public virtual int stp_docs_insert(Nullable anno, Nullable num, Nullable idxCli, string tipo, Nullable emesso, Nullable ritenuta) + { + var annoParameter = anno.HasValue ? + new ObjectParameter("anno", anno) : + new ObjectParameter("anno", typeof(int)); + + var numParameter = num.HasValue ? + new ObjectParameter("num", num) : + new ObjectParameter("num", typeof(int)); + + var idxCliParameter = idxCli.HasValue ? + new ObjectParameter("idxCli", idxCli) : + new ObjectParameter("idxCli", typeof(int)); + + var tipoParameter = tipo != null ? + new ObjectParameter("tipo", tipo) : + new ObjectParameter("tipo", typeof(string)); + + var emessoParameter = emesso.HasValue ? + new ObjectParameter("emesso", emesso) : + new ObjectParameter("emesso", typeof(System.DateTime)); + + var ritenutaParameter = ritenuta.HasValue ? + new ObjectParameter("ritenuta", ritenuta) : + new ObjectParameter("ritenuta", typeof(double)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_insert", annoParameter, numParameter, idxCliParameter, tipoParameter, emessoParameter, ritenutaParameter); + } + + public virtual int stp_docs_update(Nullable original_idxDoc, Nullable anno, Nullable num, Nullable idxCli, string tipo, Nullable emesso, Nullable ritenuta) + { + var original_idxDocParameter = original_idxDoc.HasValue ? + new ObjectParameter("Original_idxDoc", original_idxDoc) : + new ObjectParameter("Original_idxDoc", typeof(int)); + + var annoParameter = anno.HasValue ? + new ObjectParameter("anno", anno) : + new ObjectParameter("anno", typeof(int)); + + var numParameter = num.HasValue ? + new ObjectParameter("num", num) : + new ObjectParameter("num", typeof(int)); + + var idxCliParameter = idxCli.HasValue ? + new ObjectParameter("idxCli", idxCli) : + new ObjectParameter("idxCli", typeof(int)); + + var tipoParameter = tipo != null ? + new ObjectParameter("tipo", tipo) : + new ObjectParameter("tipo", typeof(string)); + + var emessoParameter = emesso.HasValue ? + new ObjectParameter("emesso", emesso) : + new ObjectParameter("emesso", typeof(System.DateTime)); + + var ritenutaParameter = ritenuta.HasValue ? + new ObjectParameter("ritenuta", ritenuta) : + new ObjectParameter("ritenuta", typeof(double)); + + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_docs_update", original_idxDocParameter, annoParameter, numParameter, idxCliParameter, tipoParameter, emessoParameter, ritenutaParameter); + } } } diff --git a/MedAP_data/APModel.edmx b/MedAP_data/APModel.edmx index 328ace1..aef2f6e 100644 --- a/MedAP_data/APModel.edmx +++ b/MedAP_data/APModel.edmx @@ -190,6 +190,43 @@ avviso 6002: Nessuna chiave primaria definita per la tabella/visualizzazione 'Me + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -325,6 +362,43 @@ avviso 6002: Nessuna chiave primaria definita per la tabella/visualizzazione 'Me + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -468,6 +542,46 @@ avviso 6002: Nessuna chiave primaria definita per la tabella/visualizzazione 'Me + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,6 +696,58 @@ avviso 6002: Nessuna chiave primaria definita per la tabella/visualizzazione 'Me + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MedAP_data/MedAPModel.cs b/MedAP_data/MedAPModel.cs index 311d196..1ef65e1 100644 --- a/MedAP_data/MedAPModel.cs +++ b/MedAP_data/MedAPModel.cs @@ -114,31 +114,7 @@ namespace MedAP_data // refresh EF context ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Clienti); } - - - #endregion - - #region funzioni TEMPLATE - - /// - /// elenco completo - /// - /// - public static IEnumerable ElencoDocTemplate() - { - var result = from r in ctx.DocTemplate.OrderBy(s => s.Descrizione) select r; - return result; - } - /// - /// elenco completo - /// - /// - public static IEnumerable ElencoRowTemplate() - { - var result = from r in ctx.RowTemplate.OrderBy(s => s.Descrizione) select r; - return result; - } - + #endregion #region funzioni Documenti @@ -192,6 +168,62 @@ namespace MedAP_data } return query.Count(); } + /// + /// Restituisce DOCUMENTO specifico + /// + /// + /// + public static Clienti DocumentoSel(int idxDoc) + { + IQueryable query; + query = ctx.Clienti.Where(s => s.idxCli == idxDoc); + var result = from r in query select r; + return result.FirstOrDefault(); + } + /// + /// Add record DOCUMENTO + /// + /// + public static void DocumentiInsert(Documenti rigaDoc) + { + // imposto parametri opzionali... + //rigaDoc.Pagamento = ""; + //rigaDoc.idxGruppo = ""; + ctx.Documenti.Add(rigaDoc); + ctx.SaveChanges(); + } + /// + /// Update record DOCUMENTO + /// + /// + public static void DocumentiUpdate(Documenti rigaDoc) + { + //rigaDoc.Pagamento = ""; + //rigaDoc.idxGruppo = ""; + ctx.stp_docs_update(rigaDoc.idxDoc, rigaDoc.anno, rigaDoc.num, rigaDoc.idxCli, rigaDoc.tipo, rigaDoc.emesso, rigaDoc.ritenuta); + // refresh EF context + ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Documenti); + } + /// + /// Delete record DOCUMENTO + /// + /// + public static void DocumentiDelete(Documenti rigaDoc) + { + ctx.stp_docs_delete(rigaDoc.idxDoc); + // refresh EF context + ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Documenti); + } + /// + /// Delete record DOCUMENTO da chiave + /// + /// + public static void DocumentiDelete(int idxDoc) + { + ctx.stp_docs_delete(idxDoc); + // refresh EF context + ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Documenti); + } #endregion @@ -280,5 +312,28 @@ namespace MedAP_data #endregion + #region funzioni TEMPLATE + + /// + /// elenco completo + /// + /// + public static IEnumerable ElencoDocTemplate() + { + var result = from r in ctx.DocTemplate.OrderBy(s => s.Descrizione) select r; + return result; + } + /// + /// elenco completo + /// + /// + public static IEnumerable ElencoRowTemplate() + { + var result = from r in ctx.RowTemplate.OrderBy(s => s.Descrizione) select r; + return result; + } + + #endregion + } } diff --git a/MedAP_data/MedAP_data.csproj b/MedAP_data/MedAP_data.csproj index 941a84f..78fb9fb 100644 --- a/MedAP_data/MedAP_data.csproj +++ b/MedAP_data/MedAP_data.csproj @@ -84,6 +84,12 @@ APModel.tt + + APModel.tt + + + APModel.tt + diff --git a/MedAP_data/bin/Debug/MedAP_data.dll b/MedAP_data/bin/Debug/MedAP_data.dll index 9aa9fbd..b080048 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.dll and b/MedAP_data/bin/Debug/MedAP_data.dll differ diff --git a/MedAP_data/bin/Debug/MedAP_data.pdb b/MedAP_data/bin/Debug/MedAP_data.pdb index 3fe1ca5..947e630 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.pdb and b/MedAP_data/bin/Debug/MedAP_data.pdb differ diff --git a/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache b/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache index c0d7e82..cd51e7d 100644 --- a/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache +++ b/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8ce9d2598119c96968f8e6163d1785ede03835f4 +7b11ed557e1b1429d07201c7c03cbeb614a5cd7a diff --git a/MedAP_data/obj/Debug/MedAP_data.dll b/MedAP_data/obj/Debug/MedAP_data.dll index 9aa9fbd..b080048 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.dll and b/MedAP_data/obj/Debug/MedAP_data.dll differ diff --git a/MedAP_data/obj/Debug/MedAP_data.pdb b/MedAP_data/obj/Debug/MedAP_data.pdb index 3fe1ca5..947e630 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.pdb and b/MedAP_data/obj/Debug/MedAP_data.pdb differ diff --git a/MedAP_data/obj/Debug/TempPE/APModel.Designer.cs.dll b/MedAP_data/obj/Debug/TempPE/APModel.Designer.cs.dll index e522845..1777465 100644 Binary files a/MedAP_data/obj/Debug/TempPE/APModel.Designer.cs.dll and b/MedAP_data/obj/Debug/TempPE/APModel.Designer.cs.dll differ diff --git a/MedAP_data/obj/Debug/TempPE/APModel.cs.dll b/MedAP_data/obj/Debug/TempPE/APModel.cs.dll index 64f0a36..bd1f3dd 100644 Binary files a/MedAP_data/obj/Debug/TempPE/APModel.cs.dll and b/MedAP_data/obj/Debug/TempPE/APModel.cs.dll differ diff --git a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.csdl b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.csdl index f354f13..e5e8bd1 100644 --- a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.csdl +++ b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.csdl @@ -57,6 +57,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200,4 +237,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.msl b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.msl index 042c249..f46482a 100644 --- a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.msl +++ b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.msl @@ -108,5 +108,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.ssdl b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.ssdl index e7a429d..c2024e9 100644 --- a/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.ssdl +++ b/MedAP_data/obj/Debug/edmxResourcesToEmbed/APModel.ssdl @@ -185,6 +185,43 @@ avviso 6002: Nessuna chiave primaria definita per la tabella/visualizzazione 'Me + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MedAP_data/stp_docs_getByKey_Result.cs b/MedAP_data/stp_docs_getByKey_Result.cs new file mode 100644 index 0000000..deedc8d --- /dev/null +++ b/MedAP_data/stp_docs_getByKey_Result.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da un modello. +// +// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. +// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// +//------------------------------------------------------------------------------ + +namespace MedAP_data +{ + using System; + + public partial class stp_docs_getByKey_Result + { + public int idxDoc { get; set; } + public Nullable emesso { get; set; } + public string Gruppo { get; set; } + public string RagSoc { get; set; } + public int num { get; set; } + public int anno { get; set; } + public Nullable Trim { get; set; } + public Nullable Mese { get; set; } + public decimal netto { get; set; } + public decimal iva { get; set; } + public decimal importo { get; set; } + public string tipo { get; set; } + public int idxCli { get; set; } + public decimal totPagato { get; set; } + public decimal totScadenze { get; set; } + public string Descrizione { get; set; } + public double ritenuta { get; set; } + public decimal CostiAss { get; set; } + } +} diff --git a/MedAP_data/stp_docs_getFilt_Result.cs b/MedAP_data/stp_docs_getFilt_Result.cs new file mode 100644 index 0000000..a0eaa34 --- /dev/null +++ b/MedAP_data/stp_docs_getFilt_Result.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da un modello. +// +// Le modifiche manuali a questo file potrebbero causare un comportamento imprevisto dell'applicazione. +// Se il codice viene rigenerato, le modifiche manuali al file verranno sovrascritte. +// +//------------------------------------------------------------------------------ + +namespace MedAP_data +{ + using System; + + public partial class stp_docs_getFilt_Result + { + public int idxDoc { get; set; } + public Nullable emesso { get; set; } + public string Gruppo { get; set; } + public string RagSoc { get; set; } + public int num { get; set; } + public int anno { get; set; } + public Nullable Trim { get; set; } + public Nullable Mese { get; set; } + public decimal netto { get; set; } + public decimal iva { get; set; } + public decimal importo { get; set; } + public string tipo { get; set; } + public int idxCli { get; set; } + public decimal totPagato { get; set; } + public decimal totScadenze { get; set; } + public string Descrizione { get; set; } + public double ritenuta { get; set; } + public decimal CostiAss { get; set; } + } +}