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

Aggiunto selettore a tendina x tipo raw mat

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-02-21 17:27:29 +01:00
parent 387d59e5cd
commit e8a3596b7a
9 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Content/bootstrap.css
Vendored
+21 -23
View File
@@ -324,7 +324,7 @@ textarea {
}
a {
color: #428bca;
color: #ff9900;
text-decoration: none;
}
@@ -420,7 +420,7 @@ cite {
}
.text-primary {
color: #428bca;
color: #ff9900;
}
.text-primary:hover {
@@ -2294,8 +2294,6 @@ fieldset[disabled] .btn-default.active {
.btn-primary {
color: #ffffff;
/*background-color: #428bca;
border-color: #357ebd;*/
background-color: #ff9900;
border-color: #cc7a00 ;
}
@@ -2501,7 +2499,7 @@ fieldset[disabled] .btn-info.active {
.btn-link {
font-weight: normal;
color: #428bca;
color: #ff9900;
cursor: pointer;
border-radius: 0;
}
@@ -3496,7 +3494,7 @@ input[type="button"].btn-block {
.dropdown-menu > .active > a:focus {
color: #ffffff;
text-decoration: none;
background-color: #428bca;
background-color: #ff9900;
outline: 0;
}
@@ -4066,7 +4064,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eeeeee;
border-color: #428bca;
border-color: #ff9900;
}
.nav .open > a .caret,
@@ -4185,7 +4183,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
color: #ffffff;
background-color: #428bca;
background-color: #ff9900;
}
.nav-pills > li.active > a .caret,
@@ -4268,8 +4266,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav .caret {
border-top-color: #428bca;
border-bottom-color: #428bca;
border-top-color: #ff9900;
border-bottom-color: #ff9900;
}
.nav a:hover .caret {
@@ -4955,8 +4953,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
z-index: 2;
color: #ffffff;
cursor: default;
background-color: #428bca;
border-color: #428bca;
background-color: #ff9900;
border-color: #ff9900;
}
.pagination > .disabled > span,
@@ -5106,7 +5104,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.label-primary {
background-color: #428bca;
background-color: #ff9900;
}
.label-primary[href]:hover,
@@ -5183,7 +5181,7 @@ a.badge:focus {
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #428bca;
color: #ff9900;
background-color: #ffffff;
}
@@ -5254,7 +5252,7 @@ a.list-group-item.active > .badge,
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
border-color: #428bca;
border-color: #ff9900;
}
.thumbnail .caption {
@@ -5408,7 +5406,7 @@ a.thumbnail.active {
line-height: 20px;
color: #ffffff;
text-align: center;
background-color: #428bca;
background-color: #ff9900;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
@@ -5560,8 +5558,8 @@ a.list-group-item.active:hover,
a.list-group-item.active:focus {
z-index: 2;
color: #ffffff;
background-color: #428bca;
border-color: #428bca;
background-color: #ff9900;
border-color: #ff9900;
}
a.list-group-item.active .list-group-item-heading,
@@ -5778,17 +5776,17 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-primary {
border-color: #428bca;
border-color: #ff9900;
}
.panel-primary > .panel-heading {
color: #ffffff;
background-color: #428bca;
border-color: #428bca;
background-color: #ff9900;
border-color: #ff9900;
}
.panel-primary > .panel-heading + .panel-collapse .panel-body {
border-top-color: #428bca;
border-top-color: #ff9900;
}
.panel-primary > .panel-heading > .dropdown .caret {
@@ -5796,7 +5794,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca;
border-bottom-color: #ff9900;
}
.panel-success {
C2P/Content/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
C2P/WebUserControls/mod_newQuote.ascx
+10 -1
View File
@@ -24,7 +24,16 @@
<uc1:mod_autocomplete runat="server" ID="acArticolo" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="Services/WS_data.asmx/Items" placeholder="Ricerca Articolo" />
</div>
<div class="col-sm-4 col-md-4">
<uc1:mod_autocomplete runat="server" ID="acLega" contextKey="l" minCharAutocomplete="2" showKey="false" ServicePath="Services/WS_data.asmx/RawMat" placeholder="Ricerca Lega" />
<div class="input-group">
<span class="input-group-addon">
<asp:Label runat="server" Font-Size="0.8em" ID="lblLega" Text="<u>L</u>ega" />
</span>
<asp:DropDownList ID="ddlLega" runat="server" AccessKey="l" DataSourceID="odsLega" DataTextField="label" DataValueField="value" CssClass="form-control" AutoPostBack="True" OnSelectedIndexChanged="ddlLega_SelectedIndexChanged" AppendDataBoundItems="true">
<asp:ListItem Selected="True" Text="----------" Value="" />
</asp:DropDownList>
</div>
<asp:ObjectDataSource ID="odsLega" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
<%--<uc1:mod_autocomplete runat="server" ID="acLega" contextKey="l" minCharAutocomplete="2" showKey="false" ServicePath="Services/WS_data.asmx/RawMat" placeholder="Ricerca Lega" />--%>
</div>
</div>
</div>
C2P/WebUserControls/mod_newQuote.ascx.cs
+8 -15
View File
@@ -27,7 +27,7 @@ namespace C2P.WebUserControls
string cKey = acCliente.contextKey;
acCliente.labelRicerca = traduci("ac[C]liente");
acArticolo.labelRicerca = traduci("ac[A]rticolo");
acLega.labelRicerca = traduci("ac[L]ega");
lblLega.Text = traduci("ac[L]ega");
}
/// <summary>
/// wrapper traduzione
@@ -49,18 +49,6 @@ namespace C2P.WebUserControls
acCliente.eh_reset += acCliente_eh_reset;
acArticolo.eh_valSelezionato += acArticolo_eh_valSelezionato;
acArticolo.eh_reset += acArticolo_eh_reset;
acLega.eh_valSelezionato += acLega_eh_valSelezionato;
acLega.eh_reset += acLega_eh_reset;
}
void acLega_eh_reset(object sender, EventArgs e)
{
salvaRicerca();
}
void acLega_eh_valSelezionato(object sender, EventArgs e)
{
salvaRicerca();
}
void acArticolo_eh_reset(object sender, EventArgs e)
@@ -99,7 +87,7 @@ namespace C2P.WebUserControls
// salvo valore selezionato cliente
memLayer.ML.setSessionVal("codClient", acCliente.valore);
memLayer.ML.setSessionVal("CodItem", acArticolo.valore);
memLayer.ML.setSessionVal("RawMat", acLega.valore);
memLayer.ML.setSessionVal("RawMat", ddlLega.SelectedValue);
checkBtnNew();
// sollevo evento
if (eh_newSearchData != null)
@@ -156,7 +144,7 @@ namespace C2P.WebUserControls
{
bool genEnab = true;
// è abilitato se abbiamo tutto: cliente, articolo, lega, costo base, qta, consegna
if (acCliente.valore == "" || acArticolo.valore == "" || acLega.valore == "")
if (acCliente.valore == "" || acArticolo.valore == "" || ddlLega.SelectedValue == "")
{
genEnab = false;
}
@@ -191,5 +179,10 @@ namespace C2P.WebUserControls
checkBtnNew();
}
protected void ddlLega_SelectedIndexChanged(object sender, EventArgs e)
{
salvaRicerca();
}
}
}
C2P/WebUserControls/mod_newQuote.ascx.designer.cs
Generated
+20 -2
View File
@@ -40,13 +40,31 @@ namespace C2P.WebUserControls {
protected global::C2P.WebUserControls.mod_autocomplete acArticolo;
/// <summary>
/// acLega control.
/// lblLega control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::C2P.WebUserControls.mod_autocomplete acLega;
protected global::System.Web.UI.WebControls.Label lblLega;
/// <summary>
/// ddlLega 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.DropDownList ddlLega;
/// <summary>
/// odsLega 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.ObjectDataSource odsLega;
/// <summary>
/// lblBaseAl control.
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.pdb
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.