From b0dd75eb7f4f43b2c456653a2acec629eeffee9e Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 29 May 2018 11:39:56 +0200 Subject: [PATCH] refresh pre update bootstrap e fontawesome... --- Jenkinsfile | 2 +- MP/Controllers/HomeController.cs | 4 ++-- MP/Views/Home/UserListQR.cshtml | 19 ++++++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a116d56..2b3937ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/MP/Controllers/HomeController.cs b/MP/Controllers/HomeController.cs index 5b47d438..fdcddd1d 100644 --- a/MP/Controllers/HomeController.cs +++ b/MP/Controllers/HomeController.cs @@ -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; diff --git a/MP/Views/Home/UserListQR.cshtml b/MP/Views/Home/UserListQR.cshtml index 22faf6b8..b28711e9 100644 --- a/MP/Views/Home/UserListQR.cshtml +++ b/MP/Views/Home/UserListQR.cshtml @@ -7,15 +7,20 @@

@ViewBag.Message

Elenco utenti e codici accesso barcode per TAB

-
+
@foreach (var item in Model) { -
-

@item.Cognome @item.Nome

- matr: @item.MatrOpr -
-
- Image 12345 +
+
+ +
+
+

@item.Cognome @item.Nome

+ matr: @item.MatrOpr +
+
+ Image 12345 +
}
\ No newline at end of file