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

Fix top base

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-08 18:00:18 +01:00
parent d470c18110
commit 2ab1394332
8 changed files with 151 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+3 -3
View File
@@ -17,9 +17,9 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=686']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=687']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
}
MP-Tablet/Content/baseStyle.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Tablet/MP-Tablet.csproj
+8
View File
@@ -428,6 +428,7 @@
<Content Include="StoricoTC.aspx" />
<Content Include="Test.aspx" />
<Content Include="Turni.aspx" />
<Content Include="User.aspx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
@@ -601,6 +602,13 @@
<Compile Include="Turni.aspx.designer.cs">
<DependentUpon>Turni.aspx</DependentUpon>
</Compile>
<Compile Include="User.aspx.cs">
<DependentUpon>User.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="User.aspx.designer.cs">
<DependentUpon>User.aspx</DependentUpon>
</Compile>
<Compile Include="utility.cs" />
<Compile Include="WebMasterPages\Bootstrap.Master.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
MP-Tablet/User.aspx
+31
View File
@@ -0,0 +1,31 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="User.aspx.cs" Inherits="MoonProTablet.User" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container my-3">
<div class="card text-dark ">
<div class="card-header">
<div class="text-center lead">
<div><i class="fa fa-user fa-3x"></i></div>
USER DATA
</div>
</div>
<div class="card-body">
<ul class="list-group mb-5">
<li class="list-group-item d-flex justify-content-between align-items-center">User: <b><%: CognomeNome %></b></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Server Time: <b><%: DateTime.Now.ToString("dddd dd.MM.yyyy HH:mm.ss") %></b></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Curr IP: <b><%: Request.UserHostName %></b></li>
<li class="list-group-item d-flex justify-content-between align-items-center">Browser size: <b><%: videoSize %></b></li>
</ul>
</div>
<div class="card-footer">
<asp:HyperLink runat="server" ID="hlAbout" CssClass="btn btn-lg btn-block btn-success" NavigateUrl="~/About.aspx"><i class="fa fa-gear"></i> ABOUT PAGE</asp:HyperLink>
<hr />
<asp:HyperLink runat="server" ID="hlLogout" CssClass="btn btn-lg btn-block btn-danger" NavigateUrl="~/Logout.aspx"><i class="fa fa-sign-out"></i> LOGOUT</asp:HyperLink>
</div>
</div>
</div>
</asp:Content>
MP-Tablet/User.aspx.cs
+65
View File
@@ -0,0 +1,65 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet
{
public partial class User : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Dimensione schermata video attuale
/// </summary>
public string videoSize
{
get
{
string answ = "?x?";
if (Session["BrowserWidth"] != null)
{
answ = string.Format("{0} x {1}", Session["BrowserWidth"], Session["BrowserHeight"]);
}
return answ;
}
}
/// <summary>
/// Cognome Nome utente
/// </summary>
public string CognomeNome
{
get
{
string swData = "";
string cognomeNome = "";
try
{
cognomeNome = user_std.UtSn.CognomeNome;
}
catch (Exception exc)
{
logger.lg.scriviLog(string.Format("Eccezione in User.aspx - page_load: {0}", exc), tipoLog.EXCEPTION);
}
if (cognomeNome != "")
{
swData = cognomeNome;
}
else if (MapoDb.DataLayer.MatrOpr > 0)
{
swData = MapoDb.DataLayer.CognomeNomeOpr;
}
else
{
swData = "MoonProTablet";
}
return swData;
}
}
}
}
MP-Tablet/User.aspx.designer.cs
Generated
+33
View File
@@ -0,0 +1,33 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet {
public partial class User {
/// <summary>
/// Controllo hlAbout.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlAbout;
/// <summary>
/// Controllo hlLogout.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlLogout;
}
}
MP-Tablet/WebUserControls/mod_title.ascx
+2 -2
View File
@@ -11,7 +11,7 @@
<ul class="navbar-nav mr-auto">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<li class='nav-item btn px-2 py-0 <%# checkPage(Eval("NavigateUrl")) %>'>
<li class='nav-item btn px-2 py-0 <%# checkPage(Eval("NavigateUrl")) %>' style="min-width: 4em;">
<asp:HyperLink runat="server" ID="btnTimbra" CssClass="nav-link px-0 py-1" NavigateUrl='<%# Eval("NavigateUrl") %>'><i class='fa fa-lg <%# Eval("icona") %>'></i><br /><%# Eval("Testo") %> </asp:HyperLink>
</li>
</ItemTemplate>
@@ -30,7 +30,7 @@
<asp:Label runat="server" ID="lblIpData" />
</div>
<div class="text-right">
<%: string.Format("{0:ddd dd HH:mm:ss}",DateTime.Now) %>
<%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %>
</div>
</div>
</div>
SQL Utils/SqlUpdate_5.0.sql
+8
View File
@@ -0,0 +1,8 @@
-- -- Eventi per update a vers 5.0 (Jetco)
UPDATE LinkMenuJQM
SET Testo = 'User'
,NavigateUrl = '~/User.aspx'
,icona = 'fa-user'
WHERE idxLink=14 OR Testo='Logout'
GO