refresh pre update bootstrap e fontawesome...

This commit is contained in:
Samuele E. Locatelli
2018-05-29 11:39:56 +02:00
parent 43d4db2f68
commit b0dd75eb7f
3 changed files with 15 additions and 10 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=750']) {
withEnv(['NEXT_BUILD_NUMBER=751']) {
// 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'
+2 -2
View File
@@ -214,7 +214,7 @@ namespace MP.Controllers
CharacterSet = "UTF-8",
Width = 600,
Height = 600,
Margin = 0
Margin = 0
};
var writer = new BarcodeWriter();
writer.Format = BarcodeFormat.QR_CODE;
@@ -222,7 +222,7 @@ namespace MP.Controllers
// scrivo bitmap
var pixelData = writer.Write(valore);
//Return Image
// Return Image
MemoryStream ms = new MemoryStream();
pixelData.Save(ms, ImageFormat.Png);
ms.Position = 0;
+12 -7
View File
@@ -7,15 +7,20 @@
<h3>@ViewBag.Message</h3>
<p>Elenco utenti e codici accesso barcode per TAB</p>
<div class="row">
<div style="max-width: 800px;">
@foreach (var item in Model)
{
<div class="col-xs-4">
<h2><b>@item.Cognome</b> @item.Nome</h2>
matr: @item.MatrOpr
</div>
<div class="col-xs-8">
<img src="@Url.Action("QR", new { valore = @ViewBag.BaseUrl + "?MatrOpr=" + @item.MatrOpr + "&authKey=" + item.authKey })" alt="Image 12345" style="width: 100px;" />
<div class="row" style="margin-bottom:3em;">
<div class="col-xs-2">
<i class="fa fa-user fa-5x"></i>
</div>
<div class="col-xs-4">
<h2><b>@item.Cognome</b> @item.Nome</h2>
matr: @item.MatrOpr
</div>
<div class="col-xs-6">
<img src="@Url.Action("QR", new { valore = @ViewBag.BaseUrl + "?MatrOpr=" + @item.MatrOpr + "&authKey=" + item.authKey })" alt="Image 12345" style="width: 100px;" />
</div>
</div>
}
</div>