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

fix deploy rdlc

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-13 18:39:47 +01:00
parent 54dabfada0
commit 191d2b3887
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MAG/MP-MAG.csproj
+9 -7
View File
@@ -785,7 +785,9 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="Boundle.config" />
<Content Include="Reports\queueConf.json" />
<Content Include="Reports\queueConf.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SMART\Default.aspx" />
<Content Include="SMART\EnrollDevice.aspx" />
<Content Include="SMART\jumper.aspx" />
@@ -852,15 +854,15 @@
<Content Include="NLog.config" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Reports\CartellinoFinitiOdette.rdlc">
<Content Include="Reports\CartellinoFinitiOdette.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Reports\CartellinoPedane.rdlc">
</Content>
<Content Include="Reports\CartellinoPedane.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Reports\CartellinoSemilavorati.rdlc">
</Content>
<Content Include="Reports\CartellinoSemilavorati.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</Content>
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
MP-MAG/WebUserControls/cmp_elencoPedane.ascx
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="col-6">
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click">Report <i class="fas fa-print"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click" Visible="false">Report <i class="fas fa-print"></i></asp:LinkButton>
</div>
</div>
<div runat="server" id="divAddNew" class="row table-secondary py-1">
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+3 -1
View File
@@ -450,7 +450,9 @@ namespace MoonProTablet.WebUserControls
// di default rendo abilitato / disabilitato tutto in base al valore "isEnabled"
lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio;
lbtSplitODL.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled && chkCloseOdlVal;
chkCloseOdl.Visible = showChkCloseOdlVal;
fixWCtrStatus(lbtShowSplitODL);
fixWCtrStatus(lbtSplitODL);
fixWCtrStatus(chkCloseOdl);