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

update visualizzazione dettaglio x small

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-08-09 11:56:06 +02:00
parent 483268d806
commit cfec2ee467
3 changed files with 37 additions and 23 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=126']) {
withEnv(['NEXT_BUILD_NUMBER=127']) {
// 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_acts.ascx
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="row mw-100">
<div class="col-4 text-left strong">
<asp:LinkButton runat="server" ID="lbtShowDet" CssClass='<%# "btn btn-sm " + Eval("cssButton") %>' data-toggle="collapse" data-target='<%# Eval("idxAzione", "#MainContent_MainContent_mod_ER_detail_frmView_mod_ER_acts_grView_lblMessage_{0}") %>'>
<b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %></b>&nbsp;|&nbsp;<%# Eval("descrAzione") %>
<i class="fas fa-angle-double-down"></i> | <b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %></b>&nbsp;|&nbsp;<%# Eval("descrAzione") %>
</asp:LinkButton>
</div>
<div class="col-4 text-center">
PUB/WebUserContols/mod_ER_detail.ascx
+35 -21
View File
@@ -4,7 +4,7 @@
<%@ Register Src="~/WebUserContols/mod_authError.ascx" TagPrefix="uc1" TagName="mod_authError" %>
<div class="container-fluid my-1 bg-light" runat="server" id="divAuthError">
<uc1:mod_authError runat="server" id="mod_authError" />
<uc1:mod_authError runat="server" ID="mod_authError" />
</div>
<div class="container-fluid my-1 bg-light" runat="server" id="divDettaglio">
<asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagPriorTableAdapter"></asp:ObjectDataSource>
@@ -219,8 +219,8 @@
<div class="card-header alert alert-success text-uppercase align-middle p-1">
<div class="row">
<div class="col">
<b>Richiesta #<%# Eval("IdxRichiesta") %></b>
<%# Eval("dataIns","{0:dddd dd.MM.yy HH:mm}") %>
<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>
@@ -239,19 +239,19 @@
<div class="col-12">
<uc1:mod_ER_doAct runat="server" ID="mod_ER_doAct" />
</div>
<div class="col-12 col-md-6">
<div class="col-12 col-sm-6">
<div class="row small">
<div class="col-6 col-md-3">
<div class="col-6 col-sm-3 pr-0">
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-6 col-md-3">
<div class="col-6 col-sm-3 pl-1">
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-12 col-md-6 text-right">
<div class="col-12 col-sm-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>
@@ -260,27 +260,41 @@
<div class="row small my-2">
<div class="col-12 small">
<div class="card">
<b class="card-header text-success p-1"><i class="far fa-bell"></i>Messaggio</b>
<div class="card-body p-1">
<asp:Label ID="lblmessaggio" runat="server" Text='<%# Eval("messaggio") %>' />
<div class="card-header p-1">
<div class="row">
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtShowMess" CssClass="btn btn-sm btn-outline-success btn-block" data-toggle="collapse" data-target="#MainContent_MainContent_mod_ER_detail_frmView_divMess">
<i class="fas fa-angle-double-down"></i> | <i class="far fa-bell"></i>&nbsp;|&nbsp;Messaggio
</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtShowCont" CssClass="btn btn-sm btn-outline-primary btn-block" data-toggle="collapse" data-target="#MainContent_MainContent_mod_ER_detail_frmView_divCont">
<i class="fas fa-angle-double-down"></i> | <i class="fas fa-phone"></i>&nbsp;|&nbsp;Contatto
</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtShowNote" CssClass="btn btn-sm btn-outline-warning btn-block" data-toggle="collapse" data-target="#MainContent_MainContent_mod_ER_detail_frmView_divNote">
<i class="fas fa-angle-double-down"></i> | <i class="far fa-comment"></i>&nbsp;|&nbsp;Note
</asp:LinkButton>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 my-3 text-center">
<i class="fas fa-phone"></i>
Contattare sig. <b><%# Eval("genContatto") %></b> al <%# Eval("telContatto") %>
</div>
<div class="col-12 small">
<div class="card">
<b class="card-header text-warning p-1"><i class="far fa-comment"></i>Note</b>
<div class="card-body p-1">
<%# Data.utils.parseNote(Eval("note")) %>
<div runat="server" id="divMess" class="collapse alert alert-success p-1 my-1" clientidmode="Predictable">
<i class="far fa-bell"></i>&nbsp;<asp:Label ID="lblmessaggio" runat="server" Text='<%# Eval("messaggio") %>' />
</div>
<div runat="server" id="divCont" class="collapse alert alert-primary p-1 my-1" clientidmode="Predictable">
<i class="fas fa-phone"></i>&nbsp;<asp:Label runat="server" ID="lblContatto">Contattare sig. <b><%# Eval("genContatto") %></b> al <i class="fas fa-phone"></i> <%# Eval("telContatto") %></asp:Label>
</div>
<div runat="server" id="divNote" class="collapse alert alert-warning p-1 my-1" clientidmode="Predictable">
<i class="far fa-comment"></i>&nbsp;<%# Data.utils.parseNote(Eval("note")) %>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="col-12 col-sm-6">
<div class="row">
<div class="col-12 small my-3 text-right">
<h5>Registro attività</h5>