Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ADM: nascosto "solo programmate"

Browse Source
This commit is contained in:
Samuele Locatelli
2021-03-17 16:37:42 +01:00
parent 2409b14258
commit 4af6a150ba
8 changed files with 71 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-ADM/MP-ADM.csproj
+1 -1
View File
@@ -1317,7 +1317,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>5332</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:5332/</IISUrl>
<IISUrl>http://localhost:5333/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
+5 -4
View File
@@ -6,10 +6,10 @@
<div class="card-header">
<div class="row">
<div class="col-2">
<div class="col-4">
<h4>PODL attivi</h4>
</div>
<div class="col-2 text-right">
<%--<div class="col-2 text-right">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
@@ -18,7 +18,7 @@
</div>
<asp:Label runat="server" ID="lblUnass" CssClass="input-group-text small" Text="Mostra SOLO programmate" />
</div>
</div>
</div>--%>
<div class="col-4 text-right" runat="server" id="divMachine">
<div class="input-group">
<div class="input-group-prepend">
@@ -169,7 +169,8 @@
<asp:ControlParameter ControlID="hfCodArt" DefaultValue="*" Name="CodArticolo" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfIdxMacc" DefaultValue="*" Name="IdxMacchina" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfCodCli" DefaultValue="*" Name="CodCliente" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />
<asp:Parameter Name="onlyFree" Type="Boolean" DefaultValue="true" />
<%--<asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />--%>
</SelectParameters>
</asp:ObjectDataSource>
</div>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
+5 -1
View File
@@ -414,9 +414,12 @@ namespace MP_ADM.WebUserControls
// è ok SE sono ENTRO i 2 limiti
enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS);
bool onlyProgrammed = chkUnassigned.Checked;
bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
#if false
bool onlyProgrammed = chkUnassigned.Checked;
return enableChgPrio && onlyProgrammed && singleMachine;
#endif
return enableChgPrio && singleMachine;
}
public string cssByAtt(object currAtt)
@@ -446,6 +449,7 @@ namespace MP_ADM.WebUserControls
public void doUpdate()
{
grView.DataBind();
checkActions();
}
/// <summary>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs
Generated
+59 -77
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM.WebUserControls
@@ -15,182 +15,164 @@ namespace MP_ADM.WebUserControls
{
/// <summary>
/// Controllo chkUnassigned.
/// divMachine control.
/// </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.CheckBox chkUnassigned;
/// <summary>
/// Controllo lblUnass.
/// </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 lblUnass;
/// <summary>
/// Controllo divMachine.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMachine;
/// <summary>
/// Controllo chkReassign.
/// chkReassign control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkReassign;
/// <summary>
/// Controllo ddlSelMacchina.
/// ddlSelMacchina control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlSelMacchina;
/// <summary>
/// Controllo odsMac.
/// odsMac control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsMac;
/// <summary>
/// Controllo lbtReassignMachine.
/// lbtReassignMachine control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtReassignMachine;
/// <summary>
/// Controllo divActions.
/// divActions control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divActions;
/// <summary>
/// Controllo lbtAttiva.
/// lbtAttiva control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAttiva;
/// <summary>
/// Controllo lbtDisattiva.
/// lbtDisattiva control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtDisattiva;
/// <summary>
/// Controllo lbtElimina.
/// lbtElimina control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtElimina;
/// <summary>
/// Controllo grView.
/// grView control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo hfIdxMacc.
/// hfIdxMacc control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc;
/// <summary>
/// Controllo hfCodGrp.
/// hfCodGrp control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodGrp;
/// <summary>
/// Controllo hfCodArt.
/// hfCodArt control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodArt;
/// <summary>
/// Controllo hfCodCli.
/// hfCodCli control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodCli;
/// <summary>
/// Controllo ods.
/// ods control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo lblNumRec.
/// lblNumRec control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumRec;
/// <summary>
/// Controllo lblWarning.
/// lblWarning control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarning;
/// <summary>
/// Controllo txtPageSize.
/// txtPageSize control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
}
MP-ADM/images/Thumbs.db
BIN
View File
Binary file not shown.
MP-MAG/MP-MAG.csproj
+1 -1
View File
@@ -26,7 +26,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>4.0</TypeScriptToolsVersion>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
MP-SITE/Resources/Donati/macchine/Thumbs.db
BIN
View File
Binary file not shown.
MP-SITE/images/Thumbs.db
BIN
View File
Binary file not shown.