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

Fix completo!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-09-25 14:32:36 +02:00
parent 51a3e9d31e
commit 29afbf7d53
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-LAND/MP-LAND.csproj
+1
View File
@@ -98,6 +98,7 @@
<Reference Include="System.Security" />
<Reference Include="System.Threading.Channels, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
MP-Site/Content/Style.css
+8 -8
View File
@@ -129,9 +129,9 @@ body {
font-weight: bold;
}
.menuMainY {
padding: 6px 10px;
height: 4em;
padding: 1em;
text-align: left;
height: 3.3em;
background: #121212;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#565656), to(#343434));
background-image: -webkit-linear-gradient(top, #565656, 0%, #343434, 100%);
@@ -1138,7 +1138,7 @@ a:hover {
.UserLabel {
background-color: #ff9900;
text-align: center;
margin: 6 6 6 6;
margin: 6px;
}
.UserLabel.principale {
font-size: large;
@@ -1148,7 +1148,7 @@ a:hover {
font-size: medium;
}
.Calend {
padding: 4;
padding: 4px;
background: White;
color: Black;
font-size: 8pt;
@@ -1222,7 +1222,7 @@ a:hover {
font-style: italic;
}
.Calend {
padding: 4;
padding: 4px;
background: White;
color: Black;
font-size: 8pt;
@@ -2069,7 +2069,7 @@ a:hover {
font-weight: normal;
font-size: 7pt;
text-align: justify;
padding: 2px 2px p2x 2px;
padding: 2px 2px 2px 2px;
border-right: red 2px solid;
border-top: red 2px solid;
border-left: red 2px solid;
@@ -2088,7 +2088,7 @@ a:hover {
}
.testoAllegatoIN {
/*font-family: Verdana;*/
padding: 5px 5px p5x 5px;
padding: 5px;
border-right: green 2px solid;
border-top: green 2px solid;
border-left: green 2px solid;
@@ -2101,7 +2101,7 @@ a:hover {
}
.testoAllegatoOUT {
/*font-family: Verdana;*/
padding: 5px 5px p5x 5px;
padding: 5px;
border-right: blue 2px solid;
border-top: blue 2px solid;
border-left: blue 2px solid;
MP-Site/Content/Style.less
+8 -8
View File
@@ -129,9 +129,9 @@ body {
}
.menuMainY {
padding: 6px 10px;
height: 4.0em;
padding: 1em;
text-align: left;
height: 3.3em;
background: #121212;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#565656), to(#343434));
background-image: -webkit-linear-gradient(top, #565656, 0%, #343434, 100%);
@@ -1317,7 +1317,7 @@ a:hover {
.UserLabel {
background-color: #ff9900;
text-align: center;
margin: 6 6 6 6;
margin: 6px;
}
.UserLabel.principale {
@@ -1330,7 +1330,7 @@ a:hover {
}
.Calend {
padding: 4;
padding: 4px;
background: White;
color: Black;
font-size: 8pt;
@@ -1421,7 +1421,7 @@ a:hover {
}
.Calend {
padding: 4;
padding: 4px;
background: White;
color: Black;
font-size: 8pt;
@@ -2399,7 +2399,7 @@ a:hover {
font-weight: normal;
font-size: 7pt;
text-align: justify;
padding: 2px 2px p2x 2px;
padding: 2px 2px 2px 2px;
border-right: red 2px solid;
border-top: red 2px solid;
border-left: red 2px solid;
@@ -2420,7 +2420,7 @@ a:hover {
.testoAllegatoIN {
/*font-family: Verdana;*/
padding: 5px 5px p5x 5px;
padding: 5px;
border-right: green 2px solid;
border-top: green 2px solid;
border-left: green 2px solid;
@@ -2434,7 +2434,7 @@ a:hover {
.testoAllegatoOUT {
/*font-family: Verdana;*/
padding: 5px 5px p5x 5px;
padding: 5px;
border-right: blue 2px solid;
border-top: blue 2px solid;
border-left: blue 2px solid;
MP-Site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Site/MP-Site.csproj
+5 -5
View File
@@ -68,7 +68,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.0.22\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
@@ -81,8 +81,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -98,8 +98,8 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels">
<HintPath>..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
<Reference Include="System.Threading.Channels, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
MP-Site/Web.config
+1 -1
View File
@@ -34,7 +34,7 @@
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
</appSettings>
<connectionStrings>
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace MP_SITE.WebUserControls
public void updateMe()
{
//SE E SOLO SE ho una macchina e/o locazione...
if (!string.IsNullOrEmpty(IdxMacchina))
if (!string.IsNullOrEmpty(IdxMacchina) && !IdxMacchina.Contains("#") && (locazione != "00"))
{
// effettua update visualizzazione
try