diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 667f8ee..02d37ab 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 6ac4dae..708156e 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 48272de..26ebaf0 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/Default.aspx b/MedAP/Default.aspx index a1ab4c8..f3cb88f 100644 --- a/MedAP/Default.aspx +++ b/MedAP/Default.aspx @@ -7,7 +7,4 @@

ASP.NET is a free web framework for building great Web sites and Web applications using HTML, CSS, and JavaScript.

Learn more »

- - - diff --git a/MedAP/Print.aspx b/MedAP/Print.aspx index 7647c03..bb19e3f 100644 --- a/MedAP/Print.aspx +++ b/MedAP/Print.aspx @@ -1,9 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/SitePrint.Master" AutoEventWireup="true" CodeBehind="Print.aspx.cs" Inherits="MedAP.Print" %> - <%@ Register Src="~/WebUserControl/mod_fattura.ascx" TagPrefix="uc1" TagName="mod_fattura" %> <%@ Register Src="~/WebUserControl/mod_giornaliero.ascx" TagPrefix="uc1" TagName="mod_giornaliero" %> - - diff --git a/MedAP/Site.Master b/MedAP/Site.Master index 2a8da96..24f5a7c 100644 --- a/MedAP/Site.Master +++ b/MedAP/Site.Master @@ -7,73 +7,73 @@ - - - <%: Page.Title %> Steamware's MedAP + + + <%: Page.Title %> Steamware's MedAP - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/bootSwitch") %> - <%: Scripts.Render("~/bundles/bootstrapToggle") %> - + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/bootSwitch") %> + <%: Scripts.Render("~/bundles/bootstrapToggle") %> + - - + + -
- - - <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=301884 --%> - <%--Framework Scripts--%> - - - - - - - - - - - - - - <%--Site Scripts--%> - - - -
- - - - - - + + + + <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=301884 --%> + <%--Framework Scripts--%> + + + + + + + + + + + + + + <%--Site Scripts--%> + + + +
+ + + + + + -
-
-
-
-
- <%: DateTime.Now.ToString("yyyy.MM.dd HH:mm.ss") %> -
-
- © <%: DateTime.Now.Year %> - Steamware srl -
-
-
-
-
+
+
+
+
+
+ <%: DateTime.Now.ToString("yyyy.MM.dd HH:mm.ss") %> +
+
+ <%: fullVers %>© <%: DateTime.Now.Year %> - Steamware srl +
+
+
+
+
- + - - <%: Scripts.Render("~/bundles/jSteamware") %> - + + <%: Scripts.Render("~/bundles/jSteamware") %> + diff --git a/MedAP/Site.Master.cs b/MedAP/Site.Master.cs index 3d4d49d..3de48f9 100644 --- a/MedAP/Site.Master.cs +++ b/MedAP/Site.Master.cs @@ -7,11 +7,22 @@ using System.Web.UI.WebControls; namespace MedAP { - public partial class SiteMaster : MasterPage + public partial class SiteMaster : MasterPage + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - } } + /// + /// Versione completamente formattata + /// + public string fullVers + { + get + { + Version versione = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + return string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision); + } + } + } } \ No newline at end of file diff --git a/MedAP/SitePrint.Master b/MedAP/SitePrint.Master index 673d5a5..da6b818 100644 --- a/MedAP/SitePrint.Master +++ b/MedAP/SitePrint.Master @@ -1,5 +1,8 @@ <%@ Master Language="C#" AutoEventWireup="true" CodeBehind="SitePrint.master.cs" Inherits="MedAP.SitePrint" %> +<%@ Register Src="~/WebUserControl/mod_authControl.ascx" TagPrefix="uc1" TagName="mod_authControl" %> + + @@ -15,10 +18,8 @@ <%: Scripts.Render("~/bundles/bootSwitch") %> <%: Scripts.Render("~/bundles/bootstrapToggle") %> - -
@@ -43,6 +44,7 @@
+ diff --git a/MedAP/SitePrint.Master.designer.cs b/MedAP/SitePrint.Master.designer.cs index 91d3272..3f0c0a7 100644 --- a/MedAP/SitePrint.Master.designer.cs +++ b/MedAP/SitePrint.Master.designer.cs @@ -12,6 +12,15 @@ namespace MedAP { public partial class SitePrint { + /// + /// Controllo mod_authControl. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MedAP.WebUserControl.mod_authControl mod_authControl; + /// /// Controllo upnContent. /// diff --git a/MedAP/menu.aspx b/MedAP/menu.aspx index b33e1f1..17ec761 100644 --- a/MedAP/menu.aspx +++ b/MedAP/menu.aspx @@ -19,10 +19,10 @@ Clienti / Fatture - <%-- - Pagamenti + + Rendiconti - + <%-- Costi Assorbiti diff --git a/MedAP_data/MedAPModel.cs b/MedAP_data/MedAPModel.cs index 275de41..825844f 100644 --- a/MedAP_data/MedAPModel.cs +++ b/MedAP_data/MedAPModel.cs @@ -111,6 +111,14 @@ namespace MedAP_data // imposto parametri opzionali... rigaCli.Pagamento = ""; rigaCli.idxGruppo = ""; + // metto maiuscolo campi STRINGA + rigaCli.RagSoc = rigaCli.RagSoc.ToUpper(); + rigaCli.C_Fisc = rigaCli.C_Fisc.ToUpper(); + rigaCli.Via = rigaCli.Via.ToUpper(); + rigaCli.Località = rigaCli.Località.ToUpper(); + rigaCli.Provincia = rigaCli.Provincia.ToUpper(); + rigaCli.POBirth = rigaCli.POBirth.ToUpper(); + // add e salvo! ctx.Clienti.Add(rigaCli); ctx.SaveChanges(); } @@ -122,6 +130,14 @@ namespace MedAP_data { rigaCli.Pagamento = ""; rigaCli.idxGruppo = ""; + // metto maiuscolo campi STRINGA + rigaCli.RagSoc = rigaCli.RagSoc.ToUpper(); + rigaCli.C_Fisc = rigaCli.C_Fisc.ToUpper(); + rigaCli.Via = rigaCli.Via.ToUpper(); + rigaCli.Località = rigaCli.Località.ToUpper(); + rigaCli.Provincia = rigaCli.Provincia.ToUpper(); + rigaCli.POBirth = rigaCli.POBirth.ToUpper(); + // STORED! ctx.stp_clienti_update(rigaCli.idxCli, rigaCli.RagSoc, rigaCli.Sesso, rigaCli.POBirth, rigaCli.DOBirth, rigaCli.P_iva, rigaCli.C_Fisc, rigaCli.Via, rigaCli.Località, rigaCli.Cap, rigaCli.Provincia, rigaCli.Pagamento, rigaCli.email, rigaCli.tel, rigaCli.Note, rigaCli.idxGruppo); // refresh EF context ((IObjectContextAdapter)ctx).ObjectContext.Refresh(RefreshMode.StoreWins, ctx.Clienti); diff --git a/MedAP_data/bin/Debug/MedAP_data.dll b/MedAP_data/bin/Debug/MedAP_data.dll index 5396c85..172bf48 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/obj/Debug/MedAP_data.dll b/MedAP_data/obj/Debug/MedAP_data.dll index 5396c85..172bf48 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.dll and b/MedAP_data/obj/Debug/MedAP_data.dll differ