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

altri ritocchi small version page

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-08-08 23:28:59 +02:00
parent 2e8964681a
commit 5fa2379e80
4 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+4 -2
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=123']) {
withEnv(['NEXT_BUILD_NUMBER=124']) {
// 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'
@@ -90,12 +90,14 @@ pipeline {
// bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ADM/ADM.csproj"
// }
// },
PUB: {
PUB_IIS01: {
if(env.enableIIS01 == "Y")
{
sleep 0
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ PUB/PUB.csproj"
}
},
PUB_IIS02: {
if(env.enableIIS02 == "Y")
{
sleep 0
PUB/PAZ/DettaglioIntervento.aspx
+1 -1
View File
@@ -6,7 +6,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-1 bg-light">
<div class="row p-2">
<div class="col my-1">
<div class="col my-1 p-0">
<uc1:mod_ER_detail runat="server" ID="mod_ER_detail" />
</div>
</div>
PUB/WebUserContols/mod_ER_detail.ascx
+3 -3
View File
@@ -214,10 +214,10 @@
</InsertItemTemplate>--%>
<ItemTemplate>
<div class="card">
<div class="card-header alert alert-success text-uppercase align-middle">
<div class="card-header alert alert-success text-uppercase align-middle p-1">
<div class="row">
<div class="col">
<h5>Dettaglio richiesta #<%# Eval("IdxRichiesta") %></h5>
<h6>Richiesta #<%# Eval("IdxRichiesta") %></h6>
</div>
<div class="col text-center">
<i class='<%# Eval("cssStato") %>'></i><%# Eval("stato") %>
@@ -227,7 +227,7 @@
</div>
</div>
</div>
<div class="card-body mw-100">
<div class="card-body p-1">
<div class="row">
<div class="col-12">
<uc1:mod_ER_doAct runat="server" ID="mod_ER_doAct" />
PUB/WebUserContols/mod_ER_doAct.ascx
+33 -33
View File
@@ -2,67 +2,67 @@
<div class="row mb-2" runat="server" id="divModoAmmin">
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtPreventivo" CssClass="btn btn-info btn-block" OnClick="lbtPreventivo_Click"><i class="far fa-envelope"></i> Richiesta Preventivo</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtPreventivo" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtPreventivo_Click"><i class="far fa-envelope"></i> Richiesta Preventivo</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtScadenza" CssClass="btn btn-warning btn-block" OnClick="lbtScadenza_Click"><i class="fas fa-bell"></i> Imposta Scadenza</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtScadenza" CssClass="btn btn-sm btn-warning btn-block" OnClick="lbtScadenza_Click"><i class="fas fa-bell"></i> Imposta Scadenza</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtSollecitoFornitore" CssClass="btn btn-info btn-block" OnClick="lbtSollecitoFornitore_Click"><i class="far fa-envelope"></i> Sollecito Fornitore</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSollecitoFornitore" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtSollecitoFornitore_Click"><i class="far fa-envelope"></i> Sollecito Fornitore</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtUrgenza" CssClass="btn btn-danger btn-block" OnClick="lbtUrgenza_Click"><i class="fas fa-sync"></i> Cambia Urgenza</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtUrgenza" CssClass="btn btn-sm btn-danger btn-block" OnClick="lbtUrgenza_Click"><i class="fas fa-sync"></i> Cambia Urgenza</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtCambiaForn" CssClass="btn btn-danger btn-block" OnClick="lbtCambiaForn_Click"><i class="fas fa-sync"></i> Cambia Fornitore</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCambiaForn" CssClass="btn btn-sm btn-danger btn-block" OnClick="lbtCambiaForn_Click"><i class="fas fa-sync"></i> Cambia Fornitore</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtMessaggio" CssClass="btn btn-success btn-block" OnClick="lbtMessaggio_Click"><i class="fas fa-pencil-alt"></i> Modifica Messaggio</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtMessaggio" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtMessaggio_Click"><i class="fas fa-pencil-alt"></i> Modifica Messaggio</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtNota01" CssClass="btn btn-success btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNota01" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
</div>
</div>
<div class="row my-2" runat="server" id="divModoFornPre">
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtNota02" CssClass="btn btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
<div class="col-6 col-sm my-1">
<asp:LinkButton runat="server" ID="lbtNota02" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtAccetta" CssClass="btn btn-success btn-block"><i class="far fa-thumbs-up"></i> Accetta Richiesta</asp:LinkButton>
<div class="col-6 col-sm my-1">
<asp:LinkButton runat="server" ID="lbtAccetta" CssClass="btn btn-sm btn-success btn-block"><i class="far fa-thumbs-up"></i> Accetta Richiesta</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtSendPrev" CssClass="btn btn-info btn-block"><i class="fas fa-paperclip"></i> Allega Preventivo</asp:LinkButton>
<div class="col-6 col-sm my-1">
<asp:LinkButton runat="server" ID="lbtSendPrev" CssClass="btn btn-sm btn-info btn-block"><i class="fas fa-paperclip"></i> Allega Preventivo</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtRifiuta" CssClass="btn btn-danger btn-block"><i class="far fa-thumbs-down"></i> Rifiuta Richiesta</asp:LinkButton>
<div class="col-6 col-sm my-1">
<asp:LinkButton runat="server" ID="lbtRifiuta" CssClass="btn btn-sm btn-danger btn-block"><i class="far fa-thumbs-down"></i> Rifiuta Richiesta</asp:LinkButton>
</div>
</div>
<div class="row my-2" runat="server" id="divModoFornCurr">
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtNota03" CssClass="btn btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNota03" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtInizia" CssClass="btn btn-warning btn-block"><i class="fas fa-play"></i> Inizia Intervento</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtInizia" CssClass="btn btn-sm btn-warning btn-block"><i class="fas fa-play"></i> Inizia Intervento</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtAddFile" CssClass="btn btn-info btn-block"><i class="fas fa-paperclip"></i> Allega File</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAddFile" CssClass="btn btn-sm btn-info btn-block"><i class="fas fa-paperclip"></i> Allega File</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtChiudi" CssClass="btn btn-warning btn-block"><i class="fas fa-stop"></i> Chiudi Intervento</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtChiudi" CssClass="btn btn-sm btn-warning btn-block"><i class="fas fa-stop"></i> Chiudi Intervento</asp:LinkButton>
</div>
</div>
<div class="row my-2" runat="server" id="divModoFornClos">
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtNota04" CssClass="btn btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNota04" CssClass="btn btn-sm btn-info btn-block" OnClick="lbtNota_Click"><i class="fas fa-plus"></i> Aggiungi Nota</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtAddFatt" CssClass="btn btn-success btn-block"><i class="fas fa-paperclip"></i> Allega Fattura</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAddFatt" CssClass="btn btn-sm btn-success btn-block"><i class="fas fa-paperclip"></i> Allega Fattura</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtConfPag" CssClass="btn btn-success btn-block"><i class="far fa-thumbs-up"></i> Conferma Pagamento</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtConfPag" CssClass="btn btn-sm btn-success btn-block"><i class="far fa-thumbs-up"></i> Conferma Pagamento</asp:LinkButton>
</div>
<div class="col my-1">
<asp:LinkButton runat="server" ID="lbtContesta" CssClass="btn btn-danger btn-block"><i class="fas fa-exclamation-triangle"></i> Apri Contestazione</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtContesta" CssClass="btn btn-sm btn-danger btn-block"><i class="fas fa-exclamation-triangle"></i> Apri Contestazione</asp:LinkButton>
</div>
</div>
<div class="row mb-2">
@@ -86,10 +86,10 @@
</div>
</div>
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtSalvaScad" CssClass="btn btn-success btn-block" OnClick="lbtSalvaScad_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalvaScad" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtSalvaScad_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
</div>
<div class="col-2 pl-0">
<asp:LinkButton runat="server" ID="lbtCancScad" CssClass="btn btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancScad" CssClass="btn btn-sm btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
</div>
</div>
</div>
@@ -104,10 +104,10 @@
<asp:ObjectDataSource runat="server" ID="odsPrior" SelectMethod="GetData" TypeName="Data.DS_appTableAdapters.AnagPriorTableAdapter" OldValuesParameterFormatString="original_{0}"></asp:ObjectDataSource>
</div>
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtSalvaPrior" CssClass="btn btn-success btn-block" OnClick="lbtSalvaPrior_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalvaPrior" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtSalvaPrior_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
</div>
<div class="col-2 pl-0">
<asp:LinkButton runat="server" ID="lbtCancPrior" CssClass="btn btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancPrior" CssClass="btn btn-sm btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
</div>
</div>
</div>
@@ -142,10 +142,10 @@
</div>
</div>
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtSalvaForn" CssClass="btn btn-success btn-block" OnClick="lbtSalvaForn_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalvaForn" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtSalvaForn_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
</div>
<div class="col-2 pl-0">
<asp:LinkButton runat="server" ID="lbtCancForn" CssClass="btn btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancForn" CssClass="btn btn-sm btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
</div>
</div>
</div>
@@ -158,10 +158,10 @@
<asp:TextBox runat="server" ID="txtMessaggio" TextMode="MultiLine" Height="8em" CssClass="form-control" />
</div>
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtSalvaMess" CssClass="btn btn-success btn-block" OnClick="lbtSalvaMess_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalvaMess" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtSalvaMess_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
</div>
<div class="col-2 pl-0">
<asp:LinkButton runat="server" ID="lbtCancMess" CssClass="btn btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancMess" CssClass="btn btn-sm btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
</div>
</div>
</div>
@@ -174,10 +174,10 @@
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="8em" CssClass="form-control" Placeholder="...digitare le note aggiuntive" />
</div>
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtSalvaNote" CssClass="btn btn-success btn-block" OnClick="lbtSalvaNote_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSalvaNote" CssClass="btn btn-sm btn-success btn-block" OnClick="lbtSalvaNote_Click"><i class="fas fa-check"></i> Update</asp:LinkButton>
</div>
<div class="col-2 pl-0">
<asp:LinkButton runat="server" ID="lbtCancNote" CssClass="btn btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancNote" CssClass="btn btn-sm btn-outline-secondary btn-block" OnClick="lbtCanc_Click"><i class="fas fa-ban"></i> Cancel</asp:LinkButton>
</div>
</div>
</div>