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

altri aggiustamenti grafica piccola

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-08-09 08:51:48 +02:00
parent 18892cb655
commit 483268d806
2 changed files with 13 additions and 18 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=125']) {
withEnv(['NEXT_BUILD_NUMBER=126']) {
// 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
+12 -17
View File
@@ -219,13 +219,18 @@
<div class="card-header alert alert-success text-uppercase align-middle p-1">
<div class="row">
<div class="col">
<h6>Richiesta #<%# Eval("IdxRichiesta") %></h6>
<b>Richiesta #<%# Eval("IdxRichiesta") %></b>
<%# Eval("dataIns","{0:dddd dd.MM.yy HH:mm}") %>
</div>
<div class="col text-center">
<i class='<%# Eval("cssStato") %>'></i><%# Eval("stato") %>
<i class='<%# Eval("cssStato") %>'></i>
<div class="small"><%# Eval("stato") %></div>
</div>
<div class="col text-right">
condominio <b><%# Eval("nom_cond") %></b> (<%# Eval("cod_cond") %>)
<div class="small">
inserita da <b><%# Eval("collaboratore") %></b>
</div>
</div>
</div>
</div>
@@ -234,29 +239,19 @@
<div class="col-12">
<uc1:mod_ER_doAct runat="server" ID="mod_ER_doAct" />
</div>
<div class="col-12 col-sm-6">
<div class="col-12 col-md-6">
<div class="row small">
<div class="col-4">
Richiesta:
</div>
<div class="col-8 text-right">
inserita da <b><%# Eval("collaboratore") %></b> (<%# Eval("codCollabRich") %>)
<br />
<%# Eval("dataIns","{0:dddd dd.MM.yyyy HH:mm}") %>
</div>
</div>
<div class="row small bg-light">
<div class="col-3">
<div class="col-6 col-md-3">
Urgenza
<br />
<asp:DropDownList runat="server" ID="ddlUrgenza" DataSourceID="odsPrior" DataTextField="descrPriorita" DataValueField="idxPriorita" SelectedValue='<%# Eval("idxPriorita") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
</div>
<div class="col-3">
<div class="col-6 col-md-3">
Area
<br />
<asp:DropDownList runat="server" ID="ddlArea" DataSourceID="odsArea" DataTextField="Area" DataValueField="idxArea" SelectedValue='<%# Eval("idxArea") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
</div>
<div class="col-6 text-right">
<div class="col-12 col-md-6 text-right">
Fornitore
<br />
<asp:DropDownList runat="server" ID="ddlFornitore" DataSourceID="odsForn" DataTextField="nome" DataValueField="idxFornitore" SelectedValue='<%# Eval("idxFornitore") %>' Enabled="false" CssClass="form-control form-control-sm"></asp:DropDownList>
@@ -285,7 +280,7 @@
</div>
</div>
</div>
<div class="col-12 col-sm-6">
<div class="col-12 col-md-6">
<div class="row">
<div class="col-12 small my-3 text-right">
<h5>Registro attività</h5>