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

altro test x dettaglio

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-08-08 23:18:29 +02:00
parent 4354b93916
commit 2e8964681a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=122']) {
withEnv(['NEXT_BUILD_NUMBER=123']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SOSCONDOMINI'
PUB/WebUserContols/mod_ER_detail.ascx
+6 -6
View File
@@ -9,7 +9,7 @@
<asp:ObjectDataSource ID="odsArea" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagAreeTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsForn" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagFornitoriTableAdapter"></asp:ObjectDataSource>
<asp:FormView ID="frmView" runat="server" DataKeyNames="idxRichiesta" DataSourceID="ods" Width="100%">
<EditItemTemplate>
<%--<EditItemTemplate>
idxRichiesta:
<asp:Label ID="idxRichiestaLabel1" runat="server" Text='<%# Eval("idxRichiesta") %>' />
<br />
@@ -111,8 +111,8 @@
<br />
<asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" Text="Aggiorna" />
&nbsp;<asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" />
</EditItemTemplate>
<InsertItemTemplate>
</EditItemTemplate>--%>
<%--<InsertItemTemplate>
idxStato:
<asp:TextBox ID="idxStatoTextBox" runat="server" Text='<%# Bind("idxStato") %>' />
<br />
@@ -211,7 +211,7 @@
<br />
<asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" Text="Inserisci" />
&nbsp;<asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Annulla" />
</InsertItemTemplate>
</InsertItemTemplate>--%>
<ItemTemplate>
<div class="card">
<div class="card-header alert alert-success text-uppercase align-middle">
@@ -232,7 +232,7 @@
<div class="col-12">
<uc1:mod_ER_doAct runat="server" ID="mod_ER_doAct" />
</div>
<div class="col-6">
<div class="col-12 col-sm-6">
<div class="row small">
<div class="col-4">
Richiesta:
@@ -283,7 +283,7 @@
</div>
</div>
</div>
<div class="col-6">
<div class="col-12 col-sm-6">
<div class="row">
<div class="col-12 small my-3 text-right">
<h5>Registro attività</h5>