Egalware/ScheMe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMPLETATO FIX GRAFICO!!! in produzione!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-09-06 17:04:34 +02:00
parent afeb118130
commit efa8eadd63
9 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/ScheMe-SP/v15/sqlite3/storage.ide
BIN
View File
Binary file not shown.
ScheMe-SP/Accettazione.aspx
+4 -4
View File
@@ -35,12 +35,12 @@
</div>
</div>
</div>
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxPaziente" CellPadding="4" ForeColor="#333333" GridLines="None" Width="100%" AllowPaging="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowCommand="grView_RowCommand" PageSize="20" AllowSorting="false" CssClass="table table-striped table-condensed">
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxPaziente" CellPadding="4" ForeColor="#333333" GridLines="None" Width="100%" AllowPaging="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowCommand="grView_RowCommand" PageSize="20" AllowSorting="false" CssClass="table table-condensed">
<EditRowStyle CssClass="editRowStyle" />
<FooterStyle CssClass="footerRowStyle" />
<%--<HeaderStyle CssClass="headerRowStyle" />--%>
<%--<RowStyle CssClass="rowStyle" />--%>
<%--<AlternatingRowStyle CssClass="alternatingRowStyle" />--%>
<HeaderStyle CssClass="headerRowStyle" />
<RowStyle CssClass="rowStyle" />
<AlternatingRowStyle CssClass="alternatingRowStyle" />
<PagerStyle CssClass="active GridPager" />
<SelectedRowStyle CssClass="selectedRowStyle" />
<SortedAscendingCellStyle CssClass="stortAscCellStyle" />
ScheMe-SP/Content/Style.css
+3
View File
@@ -62,6 +62,9 @@
.flRight {
float: right;
}
.flLeft {
float: left;
}
.errore {
color: red;
}
ScheMe-SP/Content/Style.less
+4
View File
@@ -92,6 +92,10 @@
float: right;
}
.flLeft {
float: left;
}
.errore {
color: red;
}
ScheMe-SP/Content/Style.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.smaller{font-size:.7em}.smallest{font-size:.6em}.fullWidth>.navbar-nav{display:table;width:100%;margin:0}.fullWidth>.navbar-nav>li{float:none;display:table-cell;text-align:center}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#eee;color:#000}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.errore{color:#f00}.headLine{background-color:#38c;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn.btn-square{border-radius:0}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef}.RowStyle{background-color:#eff3fb;text-align:left}.rowStyle{background-color:#eff3fb}.editRowStyle{background-color:#2461bf}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#eff3fb}.altRow{background-color:#fff}.editRow{background-color:#2461bf}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em}.footerRow{background-color:#38c;font-weight:600;color:#fff}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}.bottomnav{min-height:5em}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}.bottomnav{min-height:6em}}@media all and (max-width:480px){#textWrapper{font-size:.7em}#headData{margin-top:14px}.bottomnav{min-height:7em}}@media all and (max-width:320px){#textWrapper{font-size:.6em}#headData{margin-top:18px}.bottomnav{min-height:8em}}
.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.smaller{font-size:.7em}.smallest{font-size:.6em}.fullWidth>.navbar-nav{display:table;width:100%;margin:0}.fullWidth>.navbar-nav>li{float:none;display:table-cell;text-align:center}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#eee;color:#000}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.flLeft{float:left}.errore{color:#f00}.headLine{background-color:#38c;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn.btn-square{border-radius:0}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef}.RowStyle{background-color:#eff3fb;text-align:left}.rowStyle{background-color:#eff3fb}.editRowStyle{background-color:#2461bf}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#eff3fb}.altRow{background-color:#fff}.editRow{background-color:#2461bf}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em}.footerRow{background-color:#38c;font-weight:600;color:#fff}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}.bottomnav{min-height:5em}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}.bottomnav{min-height:6em}}@media all and (max-width:480px){#textWrapper{font-size:.7em}#headData{margin-top:14px}.bottomnav{min-height:7em}}@media all and (max-width:320px){#textWrapper{font-size:.6em}#headData{margin-top:18px}.bottomnav{min-height:8em}}
ScheMe-SP/WebUserControls/mod_top.ascx
+31 -17
View File
@@ -4,33 +4,47 @@
<div class="navbar navbar-top headerRow" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topNavbar" aria-expanded="false" aria-controls="navbar">
<%--<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topNavbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="fa fa-bars fa-3x"></span>
</button>
</button>--%>
<a class="navbar-brand uppercase btn btn-default" href="Default" style="margin: 0 0.5em 0 0; padding: 0.25em;">
<div style="float: left;">
<i class="fa fa-user-md fa-2x" aria-hidden="true"></i>
<i class="fa fa-user-md fa-lg" aria-hidden="true"></i>
<div class="visible-xs smallest">
<%: fullVers %>
</div>
</div>
<div style="float: left; padding-left:0.2em;">
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b><br />
<span class="smaller text-right">
<asp:Label ID="lblVers" CssClass="small" Height="0.8em" runat="server" Font-Bold="false" />
</span>
<div style="float: left; padding-left: 0.2em;" class="hidden-xs">
<div><%: SteamWare.memLayer.ML.CRS("CodModulo") %></div>
<div class="smallest text-center">
<%: fullVers %>
</div>
</div>
</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="topNavbar">
<ul class="nav navbar-nav">
<li>
<div class="tStrong headerHighlight uppercase" style="font-size: 1.3em; vertical-align: central; margin: auto;">
<i class="fa fa-user" aria-hidden="true"></i>&nbsp;<%: pazienteSel %>
<div class="row">
<div class="col-xs-7 col-sm-8">
<span class="flLeft tStrong headerHighlight uppercase"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;<%: pazienteSel %></span>
</div>
<div class="col-xs-1 text-right visible-xs-inline">
<asp:HyperLink runat="server" ID="hlUserAdmin_xs" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="">
<i class="fa fa-lock fa-lg" aria-hidden="true"></i>
</asp:HyperLink>
</div>
<div class="col-xs-1 text-right visible-xs-inline">
<span class="flRight visible-xs-inline">
<a href="https://www.steamware.net" target="_blank">
<asp:Image ID="logoSW_xs" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" /></a>
</span>
</div>
<div class="col-xs-8 col-sm-8 small"><%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %></div>
</div>
<div class="smaller"><%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %></div>
</li>
</ul>
</div>
<div class="collapse navbar-collapse" id="topNavbar">
<%--<form class="navbar-form navbar-left">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
@@ -40,8 +54,8 @@
<ul class="nav navbar-nav navbar-right">
<li class="text-right">
<div>
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" />
<%--<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="btn btn-default">--%>
<a href="https://www.steamware.net" target="_blank">
<asp:Image ID="logoSW" ImageUrl="~/images/SteamwareLogo.png" runat="server" Height="1.8em" AlternateText="Logo" />&nbsp;<asp:Image ID="testoSW" ImageUrl="~/images/SteamwareTesto.png" runat="server" Height="1em" AlternateText="SteamWare" /></a>
<asp:HyperLink runat="server" ID="hlUserAdmin" ToolTip="User Admin" NavigateUrl="~/UserAdmin" class="">
<i class="fa fa-lock fa-lg" aria-hidden="true"></i>
</asp:HyperLink>
ScheMe-SP/WebUserControls/mod_top.ascx.cs
+13 -5
View File
@@ -43,11 +43,8 @@ namespace ScheMe.WebUserControls
devicesAuthProxy.pagPrecedente = devicesAuthProxy.pagCorrente;
}
// salvo pagina corrente
devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url);
// update valori
Version versione = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
lblVers.Text = string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision);
lblVers.ToolTip = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.MinorRevision.ToString();
devicesAuthProxy.pagCorrente = titolo;
hlUserAdmin.Visible = userIsAdmin;
}
// SOLO se la pagina NON E' "safe"...
@@ -79,6 +76,17 @@ namespace ScheMe.WebUserControls
}
}
/// <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);
}
}
/// <summary>
/// verifica che la pagina sia tra quelle autorizzate x l'utente
/// </summary>
/// <returns></returns>
ScheMe-SP/WebUserControls/mod_top.ascx.designer.cs
Generated
+11 -2
View File
@@ -22,13 +22,22 @@ namespace ScheMe.WebUserControls {
protected global::System.Web.UI.Timer Timer1;
/// <summary>
/// Controllo lblVers.
/// Controllo hlUserAdmin_xs.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblVers;
protected global::System.Web.UI.WebControls.HyperLink hlUserAdmin_xs;
/// <summary>
/// Controllo logoSW_xs.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logoSW_xs;
/// <summary>
/// Controllo logoSW.
ScheMe-SP/obj/Debug/ScheMe.dll
BIN
View File
Binary file not shown.