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

update footer...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-08 11:34:16 +02:00
parent 81f278c179
commit b1c4ea8c1c
4 changed files with 28 additions and 12 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=216']) {
withEnv(['NEXT_BUILD_NUMBER=217']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'B2BCONDOMINI'
PUB/MainMenu.aspx.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace PUB
{
protected void Page_Load(object sender, EventArgs e)
{
// verifico se ho in sessione il TIPO utente, altrimenti importo condomini.it
// verifico se ho in sessione il TIPO utente, altrimenti imposto condomini.it
if (memLayer.ML.StringSessionObj("UserRole") == "")
{
memLayer.ML.setSessionVal("UserRole", "condomini.it");
PUB/WebUserContols/tpl_footer.ascx
+4 -4
View File
@@ -1,10 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="tpl_footer.ascx.cs" Inherits="PUB.WebUserContols.tpl_footer" %>
<footer class="navbar navbar-dark bg-dark text-light p-0 m-0 fixed-bottom">
<footer class="navbar navbar-dark bg-dark text-light p-0 m-0 fixed-bottom small">
<div class="container-fluid row nav-footer">
<div class="col-5"><%: DateTime.Now.ToString("yyyy.MM.dd HH:mm") %> | <%: fullVers %>
<div class="col-4"><%: DateTime.Now.ToString("yyyy.MM.dd HH:mm") %> | <%: fullVers %>
</div>
<div class="col-2 text-center text-uppercase"><%: SteamWare.memLayer.ML.CRS("Ambient") %></div>
<div class="col-5 text-right px-0">
<div class="col-4 text-center text-uppercase"><%: userData %></div>
<div class="col-4 text-right px-0">
<div class="d-flex flex-row-reverse">
<div class="px-1 text-right">
steamware.net &copy; 2017-<%: DateTime.Now.Year %>
PUB/WebUserContols/tpl_footer.ascx.cs
+22 -6
View File
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
using System;
namespace PUB.WebUserContols
{
@@ -24,5 +20,25 @@ namespace PUB.WebUserContols
return string.Format("v.{0}.{1}.{2}.{3}", versione.Major, versione.Minor, versione.Build, versione.Revision);
}
}
/// <summary>
/// Dati utente (+ ambiente DEV/TEST se NON siamo in prod...)
/// </summary>
public string userData
{
get
{
string answ = memLayer.ML.CRS("Ambient");
if (answ == "PROD")
{
answ = devicesAuthProxy.stObj.utente;
}
else
{
answ += " | " + devicesAuthProxy.stObj.utente;
}
return answ;
}
}
}
}