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

fix con gestione TEXTAREA

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-21 18:47:32 +01:00
parent ed52b02fad
commit 6442964ecb
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_SC/WebUserControls/mod_DettScheda.ascx
+11 -12
View File
@@ -10,16 +10,13 @@
{
document.getElementById("<%=btnUp.ClientID %>").click();
}--%>
if (event.keyCode == 13) // Enter
{
document.getElementById("<%=btnSave.ClientID %>").click();
if (event.keyCode == 13) // Enter
{
document.getElementById("<%=btnSave.ClientID %>").click();
}
};
</script>
<%--<asp:Button runat="server" ID="btnUp" Text="UP" OnClick="btnUp_Click" CssClass="hiddenBtn" />
<asp:Button runat="server" ID="btnDown" Text="DOWN" OnClick="btnDown_Click" CssClass="hiddenBtn" />--%>
<asp:Button runat="server" ID="btnSave" Text="S" OnClick="btnSave_Click" CssClass="hiddenBtn" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="CodScheda,Vers,CodMisura" DataSourceID="ods" CssClass="table table-condensed table-sm table-striped m-0" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing" onkeydown="enter(this)" onkeyup="enter(this)">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -43,18 +40,20 @@
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="CodMisura" HeaderText="CodMisura" ReadOnly="false" SortExpression="CodMisura" ControlStyle-Width="6em" />
<asp:TemplateField ShowHeader="False" ItemStyle-Width="90px">
<asp:TemplateField ShowHeader="False" ItemStyle-Wrap="false">
<HeaderTemplate>
<%# traduci("moveMis") %>
</HeaderTemplate>
<EditItemTemplate>
</EditItemTemplate>
<ItemTemplate>
<div class="col-6">
<asp:LinkButton ID="lbMoveUp" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveUp" OnClick="lb_Click" ToolTip="Move Up" CssClass="fa fa-arrow-up fa-2x" Visible='<%# arrowVisible("UP", Eval("CodMisura")) %>' />
</div>
<div class="col-6">
<asp:LinkButton ID="lbMoveDown" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveDown" OnClick="lb_Click" ToolTip="Move Down" CssClass="fa fa-arrow-down fa-2x" Visible='<%# arrowVisible("DOWN", Eval("CodMisura")) %>' />
<div class="row text-center">
<div class="col-6 pr-0">
<asp:LinkButton ID="lbMoveUp" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveUp" OnClick="lb_Click" ToolTip="Move Up" CssClass="fa fa-arrow-up fa-2x" Visible='<%# arrowVisible("UP", Eval("CodMisura")) %>' />
</div>
<div class="col-6 pl-0">
<asp:LinkButton ID="lbMoveDown" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="moveDown" OnClick="lb_Click" ToolTip="Move Down" CssClass="fa fa-arrow-down fa-2x" Visible='<%# arrowVisible("DOWN", Eval("CodMisura")) %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
CMS_SC/WebUserControls/mod_collaudi.ascx
+4 -4
View File
@@ -17,10 +17,7 @@
}
}
</script>
<%--<asp:Button runat="server" ID="btnUp" Text="UP" OnClick="btnUp_Click" CssClass="hiddenBtn" />
<asp:Button runat="server" ID="btnDown" Text="DOWN" OnClick="btnDown_Click" CssClass="hiddenBtn" />--%>
<asp:Button runat="server" ID="btnSave" Text="S" OnClick="btnSave_Click" CssClass="hiddenBtn" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="IdxDossier,CodScheda,Vers,NumScheda,CodMisura,Fase,Rev" DataSourceID="ods" CssClass="table table-condensed table-sm table-striped m-0" AllowPaging="True" AllowSorting="True" OnRowCommand="grView_RowCommand" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDataBound="grView_RowDataBound" OnRowEditing="grView_RowEditing" onkeydown="enter(this)" onkeyup="enter(this)">
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -47,12 +44,15 @@
<asp:BoundField DataField="NomeMisura" HeaderText="Misura" SortExpression="NomeMisura" ReadOnly="true" />
<asp:TemplateField HeaderText="Val. Misura" SortExpression="ValoreMis">
<EditItemTemplate>
<div runat="server" id="divMisura" visible='<%# Eval("TipovalMisura").ToString()!="FILE" %>'>
<div runat="server" id="divMisura" visible='<%# Eval("TipovalMisura").ToString()!="FILE" && Eval("TipovalMisura").ToString()!="TEXTAREA" %>'>
<asp:TextBox ID="txtValoreMis" runat="server" Text='<%# Bind("ValoreMis") %>' CssClass="form-control form-control-sm" />
</div>
<div runat="server" id="divFile" visible='<%# Eval("TipovalMisura").ToString()=="FILE" %>'>
<asp:HyperLink runat="server" ID="hlFileMan" Target="_blank" NavigateUrl='<%# fileTarget(Eval("ValoreMis"), "true") %>'><i class="fa fa-save text-info"></i> <%# contaAllegati(Eval("ValoreMis")) %></asp:HyperLink>
</div>
<div runat="server" id="divTextArea" visible='<%# Eval("TipovalMisura").ToString()=="TEXTAREA" %>'>
<asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("ValoreMis") %>' CssClass="form-control form-control-sm" TextMode="MultiLine" Height="6em" />
</div>
</EditItemTemplate>
<ItemTemplate>
<div runat="server" id="divMisura" visible='<%# Eval("TipovalMisura").ToString()!="FILE" %>'>
CMS_SC/WebUserControls/mod_listValues.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
Inherits="CMS_SC.WebUserControls.mod_listValues" %>
<div class="row" style="font-size: 8pt; margin-top: 5px;">
<div class="row mt-2 fontSmall align-bottom">
<div class="col-sm-2">
<div class="input-group input-group-sm">
<div class="input-group-btn">
CMS_SC/sql/Update_3.1.sql
+9
View File
@@ -19,3 +19,12 @@ DELETE FROM tblFiles
-- creazione scheda x note + files denominata FN-0001
INSERT INTO [dbo].[ListValues] ([TableName],[FieldName],[value],[label],[ordinal])
VALUES ('DettScheda', 'TipoValMisura', 'TEXTAREA', 'TEXTAREA', 9)
INSERT INTO [dbo].[AnagSchede] ([CodScheda],[Vers],[Descrizione],[Path],[FasiEnab],[CodVisib])
VALUES ('FN0001', 0, 'Scheda allegati + note libere', '', '001#002', 'FCS')
INSERT INTO [dbo].[DettScheda]
VALUES ('FN0001',0,'M0001','Note libere collaudo','TEXTAREA','','FCS','')
INSERT INTO [dbo].[DettScheda]
VALUES ('FN0001',0,'M0002','File Allegati','FILE','','FCS','')
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4177']) {
withEnv(['NEXT_BUILD_NUMBER=4180']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'