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

UPdate grafico elenco utenti + conf DB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-29 13:01:17 +02:00
parent f221625deb
commit 789acdf6cd
4 changed files with 14 additions and 16 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=751']) {
withEnv(['NEXT_BUILD_NUMBER=752']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/Web.config
+2 -2
View File
@@ -114,8 +114,8 @@
<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=MoonPro_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="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesAuthConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesAuthConnectionString" 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/Views/Home/UserListQR.cshtml
+9 -11
View File
@@ -6,22 +6,22 @@
{
<div class="col-6 my-2">
<div class="card">
<div class="card-header">
<div class="card-header py-2">
<div class="row">
<div class="col-8">
<h3>@ViewBag.Message</h3>
</div>
<div class="col-4 text-right">
<div class="col-4 col-md-4">
<img src="~/images/logoSteamware.png" class="img-fluid" />
</div>
<div class="col-8 text-right">
<h3 class="py-0 mb-0">@ViewBag.Message</h3>
</div>
</div>
</div>
<div class="card-body px-3">
<div class="row">
<div class="col-4">
<img src="@Url.Action("QR", new { valore = @ViewBag.BaseUrl + "MatrOpr=" + @item.MatrOpr + "&UserAuthKey=" + item.authKey })" alt="Image 12345" style="width: 150px;" />
<div class="col-6 col-md-4">
<img src="@Url.Action("QR", new { valore = @ViewBag.BaseUrl + "MatrOpr=" + @item.MatrOpr + "&UserAuthKey=" + item.authKey })" alt="Image 12345" class="img-fluid" />
</div>
<div class="col-8">
<div class="col-6 col-md-8">
<h2><b>@item.Cognome</b> @item.Nome</h2>
matr: @item.MatrOpr
</div>
@@ -34,6 +34,4 @@
</div>
}
</div>
</div>
</div>
MP/Web.config
+2 -2
View File
@@ -17,7 +17,7 @@
<add key="appVers" value="develop" />
<add key="downloadPath" value="c:\Steamware\installers\MP\" />
<add key="Environment" value="Donati Lavorazioni" />
<add key="Cliente" value="SteamWare" />
<add key="Cliente" value="Cliente DEMO" />
<add key="appName" value="MoonPro.18" />
<add key="seq_gg" value="1" />
<add key="seq_height" value="40" />
@@ -89,7 +89,7 @@
</appSettings>
<connectionStrings>
<!-- usare red://*/ se non andasse x caricare assembly e metadati -->
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SQL2012DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MPModel.csdl|res://*/Models.MPModel.ssdl|res://*/Models.MPModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
</connectionStrings>
<system.web>
<compilation debug="true" targetFramework="4.6.2" />