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

avanzamento x gestioen cod soggetto creatore UDC

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-09-28 19:36:48 +02:00
parent 0aa5e56c78
commit ca0fea47d6
19 changed files with 112 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/Content/Style.css
+5
View File
@@ -772,6 +772,11 @@
/* Medium devices (desktops, 992px and up) */
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
line-height: 1.2em;
}
.navbar .container,
.subnavbar .container {
padding-right: 0;
GMW/Content/Style.less
+11 -2
View File
@@ -39,13 +39,14 @@
.divMain {
float: none;
}
.divMainKeyb {
float: right;
width: 80%;
}
.img-thumbnail{
max-width:70%;
.img-thumbnail {
max-width: 70%;
}
/*------------------------------------------------------------------
@@ -103,6 +104,7 @@
.navbar > .container-fluid .navbar-brand {
margin-left: 0px;
}
.navbar-inverse .navbar-nav > .active > a {
background: #333;
color: #F90;
@@ -926,6 +928,13 @@
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
line-height: 1.2em;
}
.navbar .container,
.subnavbar .container {
padding-right: 0;
GMW/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GMW/Web.config
+2
View File
@@ -249,6 +249,8 @@
<add key="ReportDatasourceALTT" value="GMWDataSet_stp_prtCartAL" />
<!--setup comandi barcode-->
<add key="prefComandi" value="CMD" />
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="prefDateTime" value="DT" />
<add key="prefBCode" value="BCD" />
<add key="cmdSvuotaGitterBox" value="CMDRSTGB" />
GMW/WebUserControls/mod_anime.ascx.cs
+67
View File
@@ -207,6 +207,16 @@ namespace GMW.WebUserControls
int trovati = 0;
// controllo non si tratti di un comando...
string preCmd = memLayer.ML.confReadString("prefComandi");
string preCodSogg = memLayer.ML.confReadString("prefCodSogg");
int matricola = -1;
// provo a convertire in intero barcode x verifica eventuale matricola...
try
{
matricola = Convert.ToInt32(barcodeIn);
}
catch
{ }
// decodifico!
if (barcodeIn.StartsWith(preCmd))
{
answ = tipoCodiceBarcode.Comando;
@@ -215,6 +225,21 @@ namespace GMW.WebUserControls
{
answ = tipoCodiceBarcode.Particolare;
}
else if (barcodeIn.StartsWith(preCodSogg))
{
// cerco cod soggetto...
if (DataProxy.obj.taTrascSogg.getByKey(barcodeIn, 0).Rows.Count == 1)
{
answ = tipoCodiceBarcode.Operatore;
}
}
else if (matricola >= 0)
{
if (DataProxy.obj.taTrascSogg.getByKey("", matricola).Rows.Count == 1)
{
answ = tipoCodiceBarcode.Operatore;
}
}
else
{
try
@@ -325,8 +350,45 @@ namespace GMW.WebUserControls
}
}
break;
case tipoCodiceBarcode.Operatore:
// calcolo matricola utente
int MatrUtente = -1;
string preCodSogg = memLayer.ML.confReadString("prefCodSogg");
if (barcodeIn.StartsWith(preCodSogg))
{
MatrUtente = DataProxy.obj.taTrascSogg.getByKey(barcodeIn, 0)[0].CodMatricola;
}
else
{
MatrUtente = Convert.ToInt32(barcodeIn);
}
if (MatrUtente >= 0)
{
// salvo in sessione operatore con AUTH
memLayer.ML.setSessionVal("MatrUtente", MatrUtente);
// mostro che ho autorizzato...
Postazione.messaggiText += traduci("userAuthRec");
Postazione.CssClass = "stileComandoOk";
Response.Redirect(user_std.pagCorrente);
}
else
{
Postazione.messaggiText += " - codice <b>non riconosciuto</b>!";
Postazione.CssClass = "stileComandoND";
}
break;
default:
// cerco se sia "0" = reset utente...
if (barcodeIn == memLayer.ML.CRS("resetCodSogg"))
{
// salvo in sessione operatore con AUTH
memLayer.ML.emptySessionVal("MatrUtente");
// mostro che ho autorizzato...
Postazione.messaggiText += traduci("userAuthRem");
Postazione.CssClass = "stileComandoOk";
Response.Redirect(user_std.pagCorrente);
}
Postazione.messaggiText += " - codice <b>non riconosciuto</b>!";
Postazione.CssClass = "stileComandoND";
break;
@@ -407,6 +469,11 @@ namespace GMW.WebUserControls
/// <param name="e"></param>
protected void lbtStampaUDC_Click(object sender, EventArgs e)
{
// !!!FARE!!!
// controllo che abbia CodSogg auth...
// OC Soggetto creatore UDC --> mettere "OC" in web.config
// verifico postazione x procedere...
if (Postazione.printer != "n.d.")
{
GMW/WebUserControls/mod_testata.ascx
+10 -31
View File
@@ -12,40 +12,24 @@
<asp:HyperLink runat="server" ID="hlHome" NavigateUrl="~/" CssClass="navbar-brand" ToolTip='<%# SteamWare.memLayer.ML.confReadString("titleApp") %>'> <i class="fa fa-home fa-lg"></i></asp:HyperLink>
</li>
<li class="navbarSep">
<asp:HyperLink runat="server" ID="hlUser" NavigateUrl="~/" CssClass="navbar-brand" ToolTip='<%# usrAuthToolTip %>'>
<asp:HyperLink runat="server" ID="hlUser" CssClass="navbar-brand" ToolTip='<%# usrAuthToolTip %>'>
<i class="fa fa-user fa-lg <%: usrAuthCss %>"></i>
<asp:Label runat="server" ID="lblMatr" Text='<%# usrAuthText %>' />
</asp:HyperLink>
<%--<asp:LinkButton runat="server" ID="lbUser" Text="---" />--%>
</li>
<li>
</asp:HyperLink><%--<asp:LinkButton runat="server" ID="lbUser" Text="---" />--%></li><li>
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update">
<%: nomePag %>
<i class="fa-lg <%: cssIconPag %>"></i>
</asp:LinkButton>
</li>
<li>
</asp:LinkButton></li><li>
<asp:LinkButton runat="server" ID="lbnUpdate2">
</asp:LinkButton>
</li>
<%--<li class="active">
</asp:LinkButton></li><%--<li class="active">
<asp:LinkButton runat="server" ID="lbnUpdate" class="navbar-brand" OnClick="lbnUpdate_Click">
<asp:Label runat="server" ID="lblTitolo" />
<i>
<asp:Label runat="server" ID="lblIconTitolo" /></i>
</asp:LinkButton>
</li>--%>
</ul>
<div class="nav navbar-nav navbar-right">
</li>--%></ul><div class="nav navbar-nav navbar-right">
<button type="button" class="navbar-toggle navbar-right" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
</div>
<div class="navbar-collapse collapse">
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button></div></div><div class="navbar-collapse collapse">
<ul id="itemPlaceholderContainer" runat="server" class="nav navbar-nav navbar-right">
<asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
<ItemTemplate>
@@ -72,19 +56,14 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<li>
<%--<li>
<asp:LinkButton runat="server" ID="lbShowNumKey" class="navbar-brand" OnClick="lbShowNumKey_Click"> <i class="fa fa-calculator fa-lg"></i></asp:LinkButton>
</li>
</li>--%>
</ul>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
</div>
<!--/.nav-collapse -->
<div class="subnavbar" style="color: #999;">
<div class="navbar-left">
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
</div>
<div class="navbar-right">
stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %>
</div>
</div>
</div>
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %></div><div class="navbar-right">
stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %></div></div></div>
GMW/WebUserControls/mod_testata.ascx.cs
+14 -24
View File
@@ -35,7 +35,7 @@ namespace GMW.WebUserControls
hlUser.DataBind();
}
}
public string cssIconPag
{
get
@@ -125,13 +125,7 @@ namespace GMW.WebUserControls
string answ = "";
try
{
//if (user_std.pagCorrente.IndexOf(nomeElem) >= 0) answ = "active";
// !!!FARE!!! controllo se in session/cookie c'è auth utente...
// FAKE: in base al secondo pari/dispari cambio colore...
int resto = 0;
Math.DivRem(DateTime.Now.Second, 2, out resto);
if (resto != 0)
if (userAuthOk)
{
answ = traduci("UserAuthOk");
}
@@ -155,15 +149,9 @@ namespace GMW.WebUserControls
string answ = "...";
try
{
//if (user_std.pagCorrente.IndexOf(nomeElem) >= 0) answ = "active";
// !!!FARE!!! controllo se in session/cookie c'è auth utente...
// FAKE: in base al secondo pari/dispari cambio colore...
int resto = 0;
Math.DivRem(DateTime.Now.Second, 2, out resto);
if (resto != 0)
if (userAuthOk)
{
answ = "12345";
answ = memLayer.ML.StringSessionObj("MatrUtente");
}
else
{
@@ -175,6 +163,9 @@ namespace GMW.WebUserControls
return answ;
}
}
/// <summary>
/// css x colore icona user auth
/// </summary>
public string usrAuthCss
{
get
@@ -182,13 +173,7 @@ namespace GMW.WebUserControls
string answ = "";
try
{
//if (user_std.pagCorrente.IndexOf(nomeElem) >= 0) answ = "active";
// !!!FARE!!! controllo se in session/cookie c'è auth utente...
// FAKE: in base al secondo pari/dispari cambio colore...
int resto = 0;
Math.DivRem(DateTime.Now.Second, 2, out resto);
if (resto != 0)
if (userAuthOk)
{
answ = "checkOk";
}
@@ -207,7 +192,12 @@ namespace GMW.WebUserControls
get
{
bool answ = false;
try
{
answ = memLayer.ML.isInSessionObject("MatrUtente");
}
catch
{ }
return answ;
}
}
GMW/WebUserControls/mod_testata.ascx.designer.cs
Generated
-9
View File
@@ -93,15 +93,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater menu;
/// <summary>
/// lbShowNumKey control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbShowNumKey;
/// <summary>
/// XmlMenu control.
/// </summary>
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW.dll.config
+2
View File
@@ -249,6 +249,8 @@
<add key="ReportDatasourceALTT" value="GMWDataSet_stp_prtCartAL" />
<!--setup comandi barcode-->
<add key="prefComandi" value="CMD" />
<add key="prefCodSogg" value="O" />
<add key="resetCodSogg" value="000" />
<add key="prefDateTime" value="DT" />
<add key="prefBCode" value="BCD" />
<add key="cmdSvuotaGitterBox" value="CMDRSTGB" />
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.