completate modifiche x pubblicazione...

This commit is contained in:
Samuele E. Locatelli
2018-01-24 16:31:17 +01:00
parent 7ce43835e4
commit 7219fa5ddb
13 changed files with 106 additions and 74 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
-3
View File
@@ -7,7 +7,4 @@
<p class="lead">ASP.NET is a free web framework for building great Web sites and Web applications using HTML, CSS, and JavaScript.</p>
<p><a href="http://www.asp.net" class="btn btn-primary btn-lg">Learn more &raquo;</a></p>
</div>
</asp:Content>
-3
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:mod_fattura runat="server" ID="mod_fattura" />
<uc1:mod_giornaliero runat="server" id="mod_giornaliero" />
+59 -59
View File
@@ -7,73 +7,73 @@
<html lang="en">
<head runat="server">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%: Page.Title %> Steamware's MedAP</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%: Page.Title %> Steamware's MedAP</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/bootSwitch") %>
<%: Scripts.Render("~/bundles/bootstrapToggle") %>
</asp:PlaceHolder>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/bootSwitch") %>
<%: Scripts.Render("~/bundles/bootstrapToggle") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
</head>
<body>
<form runat="server">
<asp:ScriptManager runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=301884 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="jquery" />
<asp:ScriptReference Name="bootstrap" />
<asp:ScriptReference Name="respond" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<uc1:mod_testata runat="server" ID="mod_testata" />
<div class="container-fluid body-content">
<asp:UpdatePanel runat="server" ID="upnContent">
<ContentTemplate>
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
<form runat="server">
<asp:ScriptManager runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=301884 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="jquery" />
<asp:ScriptReference Name="bootstrap" />
<asp:ScriptReference Name="respond" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<uc1:mod_testata runat="server" ID="mod_testata" />
<div class="container-fluid body-content">
<asp:UpdatePanel runat="server" ID="upnContent">
<ContentTemplate>
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</ContentTemplate>
</asp:UpdatePanel>
<footer>
<div class="navbar navbar-inverse navbar-fixed-bottom" style="min-height:1.3em; height: auto;">
<div class="container-fluid text-info">
<div class="row">
<div class="col-xs-6">
<%: DateTime.Now.ToString("yyyy.MM.dd HH:mm.ss") %>
</div>
<div class="col-xs-6 text-right ">
&copy; <%: DateTime.Now.Year %> - Steamware srl
</div>
</div>
</div>
</div>
</footer>
<footer>
<div class="navbar navbar-inverse navbar-fixed-bottom" style="min-height: 1.3em; height: auto;">
<div class="container-fluid text-info">
<div class="row">
<div class="col-xs-6">
<%: DateTime.Now.ToString("yyyy.MM.dd HH:mm.ss") %>
</div>
<div class="col-xs-6 text-right ">
<%: fullVers %>&copy; <%: DateTime.Now.Year %> - Steamware srl
</div>
</div>
</div>
</div>
</footer>
</div>
</form>
</form>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
</body>
</html>
+15 -4
View File
@@ -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)
{
}
}
/// <summary>
/// Versione completamente formattata
/// </summary>
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);
}
}
}
}
+4 -2
View File
@@ -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" %>
<!DOCTYPE html>
@@ -15,10 +18,8 @@
<%: Scripts.Render("~/bundles/bootSwitch") %>
<%: Scripts.Render("~/bundles/bootstrapToggle") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
</head>
<body>
<form runat="server">
@@ -43,6 +44,7 @@
</Scripts>
</asp:ScriptManager>
<div class="container body-content">
<uc1:mod_authControl runat="server" ID="mod_authControl" />
<asp:UpdatePanel runat="server" ID="upnContent">
<ContentTemplate>
<asp:ContentPlaceHolder ID="MainContent" runat="server">
+9
View File
@@ -12,6 +12,15 @@ namespace MedAP {
public partial class SitePrint {
/// <summary>
/// Controllo mod_authControl.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MedAP.WebUserControl.mod_authControl mod_authControl;
/// <summary>
/// Controllo upnContent.
/// </summary>
+3 -3
View File
@@ -19,10 +19,10 @@
<a href="DocArchive" class="shortcut">
<i class="fa fa-book shortcut-icon"></i><span class="shortcut-label">Clienti / Fatture</span>
</a>
<%--<a href="Pagamenti" class="shortcut">
<i class="fa fa-money shortcut-icon"></i><span class="shortcut-label">Pagamenti</span>
<a href="Rendiconti" class="shortcut">
<i class="fa fa-money shortcut-icon"></i><span class="shortcut-label">Rendiconti</span>
</a>
<a href="CostAss" class="shortcut">
<%--<a href="CostAss" class="shortcut">
<i class="fa fa-industry shortcut-icon"></i><span class="shortcut-label">Costi Assorbiti</span>
</a>
<a href="Projects" class="shortcut">
+16
View File
@@ -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);
Binary file not shown.
Binary file not shown.