Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Samuele Locatelli
|
d71e9465e5 | ||
|
Samuele Locatelli
|
876197b0ac | ||
|
Samuele Locatelli
|
cd07a940d0 | ||
|
Samuele Locatelli
|
d2f7dd53f3 | ||
|
Samuele Locatelli
|
8c75556240 | ||
|
Samuele Locatelli
|
a025057865 |
@@ -118,7 +118,7 @@ else // disegno box non cliccabile e licenza mancante
|
|||||||
|
|
||||||
protected string fullUrl(string relUrl)
|
protected string fullUrl(string relUrl)
|
||||||
{
|
{
|
||||||
return $"{Configuration["BaseUrl"]}{relUrl}";
|
return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
|
||||||
}
|
}
|
||||||
|
|
||||||
protected MarkupString traduci(string lemma)
|
protected MarkupString traduci(string lemma)
|
||||||
|
|||||||
@@ -81,12 +81,12 @@ namespace MP.Land.Components
|
|||||||
|
|
||||||
protected string fullUrl(string relUrl)
|
protected string fullUrl(string relUrl)
|
||||||
{
|
{
|
||||||
return $"{Configuration["BaseUrl"]}{relUrl}";
|
return $"{Configuration["ServerConf:BaseUrl"]}{relUrl}";
|
||||||
}
|
}
|
||||||
|
|
||||||
protected string localPath(string localRepo)
|
protected string localPath(string localRepo)
|
||||||
{
|
{
|
||||||
return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
|
return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnInitialized()
|
protected override void OnInitialized()
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<RootNamespace>MP.Land</RootNamespace>
|
<RootNamespace>MP.Land</RootNamespace>
|
||||||
<Version>6.15.2207.0718</Version>
|
<Version>6.15.2207.1417</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ namespace MP.Land.Pages
|
|||||||
|
|
||||||
protected string localPath(string localRepo)
|
protected string localPath(string localRepo)
|
||||||
{
|
{
|
||||||
return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
|
return @$"{Configuration["ServerConf:downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnInitialized()
|
protected override void OnInitialized()
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ namespace MP.Land.Pages
|
|||||||
|
|
||||||
protected string BaseUrlTab
|
protected string BaseUrlTab
|
||||||
{
|
{
|
||||||
get => $"{Configuration["BaseUrl"]}{Configuration["QrJumpPath"]}";
|
get => $"{Configuration["ServerConf:BaseUrl"]}{Configuration["QrJumpPath"]}";
|
||||||
}
|
}
|
||||||
|
|
||||||
[Inject]
|
[Inject]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<body>
|
<body>
|
||||||
<i>Modulo gestione Programmi MAPO</i>
|
<i>Modulo gestione Programmi MAPO</i>
|
||||||
<h4>Versione: 6.15.2207.0718</h4>
|
<h4>Versione: 6.15.2207.1417</h4>
|
||||||
<br />
|
<br />
|
||||||
Note di rilascio:
|
Note di rilascio:
|
||||||
<ul>
|
<ul>
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
6.15.2207.0718
|
6.15.2207.1417
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<item>
|
<item>
|
||||||
<version>6.15.2207.0718</version>
|
<version>6.15.2207.1417</version>
|
||||||
<url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
|
<url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
|
||||||
<changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
|
<changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
|
||||||
<mandatory>false</mandatory>
|
<mandatory>false</mandatory>
|
||||||
|
|||||||
@@ -1,21 +1,23 @@
|
|||||||
{
|
{
|
||||||
"DetailedErrors": true,
|
"DetailedErrors": true,
|
||||||
"Logging": {
|
"Logging": {
|
||||||
"LogLevel": {
|
"LogLevel": {
|
||||||
"Default": "Information",
|
"Default": "Information",
|
||||||
"Microsoft": "Warning",
|
"Microsoft": "Warning",
|
||||||
"Microsoft.Hosting.Lifetime": "Information"
|
"Microsoft.Hosting.Lifetime": "Information"
|
||||||
}
|
|
||||||
},
|
|
||||||
"Environment": "Steam PROD",
|
|
||||||
"BaseUrl": "https://iis02.egalware.com/",
|
|
||||||
"AllowedHosts": "*",
|
|
||||||
"QrJumpPath": "MP/TAB/jumper?",
|
|
||||||
"downloadPath": "C:\\Steamware\\installers\\MP",
|
|
||||||
"appVers": "stable",
|
|
||||||
"ConnectionStrings": {
|
|
||||||
"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
|
|
||||||
"MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
|
|
||||||
"Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"Environment": "Steam PROD",
|
||||||
|
"AllowedHosts": "*",
|
||||||
|
"QrJumpPath": "MP/TAB/jumper?",
|
||||||
|
"appVers": "stable",
|
||||||
|
"ConnectionStrings": {
|
||||||
|
"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
|
||||||
|
"MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
|
||||||
|
"Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
|
||||||
|
},
|
||||||
|
"ServerConf": {
|
||||||
|
"BaseUrl": "https://iis02.egalware.com/",
|
||||||
|
"downloadPath": "C:\\Steamware\\installers\\MP"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -8,5 +8,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Environment": "Steam DEV",
|
"Environment": "Steam DEV",
|
||||||
"BaseUrl": "https://iis01.egalware.com/"
|
"ServerConf": {
|
||||||
|
"BaseUrl": "https://iis01.egalware.com/",
|
||||||
|
"downloadPath": "C:\\Steamware\\installers\\MP"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -7,15 +7,17 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*",
|
"AllowedHosts": "*",
|
||||||
"BaseUrl": "https://localhost:44309/",
|
|
||||||
"QrJumpPath": "MP/TAB/jumper?",
|
"QrJumpPath": "MP/TAB/jumper?",
|
||||||
"Environment": "Steam DEV",
|
"Environment": "Steam DEV",
|
||||||
"downloadPath": "C:\\Steamware\\installers\\MP",
|
|
||||||
"appVers": "stable",
|
"appVers": "stable",
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
|
"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true",
|
||||||
"MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
|
"MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;",
|
||||||
"Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
|
"Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000"
|
||||||
|
},
|
||||||
|
"ServerConf": {
|
||||||
|
"BaseUrl": "https://localhost:44309/",
|
||||||
|
"downloadPath": "C:\\Steamware\\installers\\MP"
|
||||||
}
|
}
|
||||||
//"ConnectionStrings": {
|
//"ConnectionStrings": {
|
||||||
// "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
|
// "DefaultConnection": "Server=SQL2016PROD;Database=Jetco_MoonPro_Prod;Trusted_Connection=True;MultipleActiveResultSets=true",
|
||||||
|
|||||||
@@ -259,7 +259,14 @@ namespace MP.Mon.Components
|
|||||||
{
|
{
|
||||||
double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
|
double cTimeMin = currTimeMin != null ? (double)currTimeMin : 0;
|
||||||
tSpan = TimeSpan.FromMinutes(cTimeMin);
|
tSpan = TimeSpan.FromMinutes(cTimeMin);
|
||||||
answ = $"{tSpan:mm}:{tSpan:ss}";
|
if (tSpan.TotalHours < 1)
|
||||||
|
{
|
||||||
|
answ = $"{tSpan:mm}:{tSpan:ss}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
answ = $"{tSpan.TotalHours:N0}h {tSpan:mm}:{tSpan:ss}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{ }
|
{ }
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Version>6.15.2207.1309</Version>
|
<Version>6.15.2207.1517</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<meta name="google" content="notranslate">
|
||||||
<base href="~/" />
|
<base href="~/" />
|
||||||
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
|
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
|
||||||
<link rel="stylesheet" href="css/site.css" />
|
<link rel="stylesheet" href="css/site.css" />
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<body>
|
<body>
|
||||||
<i>Modulo MON MAPO</i>
|
<i>Modulo MON MAPO</i>
|
||||||
<h4>Versione: 6.15.2207.1309</h4>
|
<h4>Versione: 6.15.2207.1517</h4>
|
||||||
<br /> Note di rilascio:
|
<br /> Note di rilascio:
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
6.15.2207.1309
|
6.15.2207.1517
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<item>
|
<item>
|
||||||
<version>6.15.2207.1309</version>
|
<version>6.15.2207.1517</version>
|
||||||
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
|
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
|
||||||
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
|
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
|
||||||
<mandatory>false</mandatory>
|
<mandatory>false</mandatory>
|
||||||
|
|||||||
Reference in New Issue
Block a user