Update jQuery + update VBMA (da -PIC)

This commit is contained in:
Samuele E. Locatelli
2017-09-15 15:27:52 +02:00
parent 0da6e07cd9
commit e2da0b5289
16 changed files with 10753 additions and 4481 deletions
+2 -2
View File
@@ -35,8 +35,8 @@ namespace ScheMe
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
//bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
// "~/Scripts/jquery-ui-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include(
"~/Scripts/jSteamware.js"));
+1 -2
View File
@@ -16,9 +16,8 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%--<%: Scripts.Render("~/bundles/jqueryui") %>--%>
<%: Scripts.Render("~/bundles/bootSwitch") %>
<%--<%: Scripts.Render("~/bundles/bootstrap-file-input") %>--%>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap/css" />
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+910 -524
View File
File diff suppressed because it is too large Load Diff
+49 -4
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using ScheMe_Data;
using SteamWare;
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
@@ -9,6 +8,13 @@ namespace ScheMe
{
public partial class VBMA : SteamWare.UserPage
{
protected int idxPaziente
{
get
{
return memLayer.ML.IntSessionObj("IdxPaziente");
}
}
/// <summary>
/// pagina caricata
/// </summary>
@@ -67,5 +73,44 @@ namespace ScheMe
{
prevMode = frmView.CurrentMode;
}
protected void frmView_ItemUpdating(object sender, FormViewUpdateEventArgs e)
{
// fix decimale x float...
e.NewValues["Altezza"] = decimal.Parse(e.NewValues["Altezza"].ToString().Replace(".", ","));
e.NewValues["Peso"] = decimal.Parse(e.NewValues["Peso"].ToString().Replace(".", ","));
e.NewValues["CirconfAvamb"] = decimal.Parse(e.NewValues["CirconfAvamb"].ToString().Replace(".", ","));
e.NewValues["CirconfVita"] = decimal.Parse(e.NewValues["CirconfVita"].ToString().Replace(".", ","));
e.NewValues["CirconfGlutei"] = decimal.Parse(e.NewValues["CirconfGlutei"].ToString().Replace(".", ","));
e.NewValues["CirconfQuadricipite"] = decimal.Parse(e.NewValues["CirconfQuadricipite"].ToString().Replace(".", ","));
}
protected void frmView_ItemInserting(object sender, FormViewInsertEventArgs e)
{
// fix decimale x float...
e.Values["Altezza"] = decimal.Parse(e.Values["Altezza"].ToString().Replace(".", ","));
e.Values["Peso"] = decimal.Parse(e.Values["Peso"].ToString().Replace(".", ","));
e.Values["CirconfAvamb"] = decimal.Parse(e.Values["CirconfAvamb"].ToString().Replace(".", ","));
e.Values["CirconfVita"] = decimal.Parse(e.Values["CirconfVita"].ToString().Replace(".", ","));
e.Values["CirconfGlutei"] = decimal.Parse(e.Values["CirconfGlutei"].ToString().Replace(".", ","));
e.Values["CirconfQuadricipite"] = decimal.Parse(e.Values["CirconfQuadricipite"].ToString().Replace(".", ","));
}
protected void frmView_ItemCreated(object sender, EventArgs e)
{
// imposto altezza/peso...
try
{
// recupero dati paziente...
DS_Applicazione.AnagPazientiRow riga = DtProxy.man.taAP.getByKey(idxPaziente)[0];
// Popolo!
TextBox txtAltezza = ((TextBox)frmView.FindControl("txtAltezza"));
if (txtAltezza != null) txtAltezza.Text = riga.Altezza.ToString();
TextBox txtPeso = ((TextBox)frmView.FindControl("txtPeso"));
if (txtPeso != null) txtPeso.Text = riga.Peso.ToString();
}
catch
{ }
}
}
}
-6
View File
@@ -1,10 +1,4 @@
[
{
"outputFileName": "Content/ScheMe.min.css",
"inputFiles": [
"Content/ScheMe.css"
]
},
{
"outputFileName": "Content/Style.min.css",
"inputFiles": [
+2 -2
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net45" />
<package id="AspNet.ScriptManager.jQuery" version="2.2.4" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.1.1" targetFramework="net462" />
<package id="bootstrap" version="3.3.7" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net45" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net45" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
<package id="jQuery" version="2.2.4" targetFramework="net462" />
<package id="jQuery" version="3.1.1" targetFramework="net462" />
<package id="jQuery.Validation" version="1.16.0" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net45" />