Egalware/SSC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completato logger esteso!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-30 10:03:29 +01:00
parent 95d68c29b5
commit 87d23f3466
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_SC/ReportCompleto.aspx.cs
+7 -3
View File
@@ -128,7 +128,8 @@ namespace CMS_SC
/// <param name="e"></param>
protected void lbtExportWithAttach_Click(object sender, EventArgs e)
{
logger.lg.scriviLog($"Inizio progessing report + allegati in merge");
logger.lg.scriviLog("-------------------------- FULL REPORT + ALLEGATI START -------------------------- ");
logger.lg.scriviLog($"Inizio FullReport richiesto dall'utente {OpAuth.currAuth.CognomeNome} ({OpAuth.currAuth.email})");
bool allDone = false;
int numFilesDone = 0;
int allFiles = 0;
@@ -154,10 +155,11 @@ namespace CMS_SC
//se richiesto da conf di aggiungere in testa il report...
if (memLayer.ML.CRB("mergeReport2Pdf"))
{
pdfInFullPath = Server.MapPath(fullReportFilename);
// aggiungo primo PDF all'elenco...
elencoPdf.Add(Server.MapPath(fullReportFilename));
elencoPdf.Add(pdfInFullPath);
allFiles++;
logger.lg.scriviLog($"Aggiunto in testa report principale");
logger.lg.scriviLog($"Allegato pdf report principale: {pdfInFullPath}");
}
// step 3: colleziona allegati schede e li copia in locale
var tabDati = DtProxy.man.taASC.getByDossier(idxDossier);
@@ -205,6 +207,8 @@ namespace CMS_SC
}
// refresh finale report mostrato (ho usaro reportviewer x export pdf...)
fixSelReport();
logger.lg.scriviLog($"Completato FullReport richiesto dall'utente {OpAuth.currAuth.CognomeNome} ({OpAuth.currAuth.email})");
logger.lg.scriviLog("-------------------------- FULL REPORT + ALLEGATI END -------------------------- ");
}
}
}
CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace CMS_SC.WebUserControls
byte[] bytes = localReport.Render("PDF", null, out mimeType, out encoding, out extension, out streamIds, out warnings);
// se è un percorso virtuale faccio mapPath...
string FilePath = "";
if (outFilePath.IndexOf("/") >= 0)
if (outFilePath.IndexOf("/") < 0)
{
FilePath = Server.MapPath(outFilePath);
}
CMS_SC/downloadReport.aspx.cs
+3 -6
View File
@@ -1,10 +1,6 @@
using SteamWare;
using CMS_SC_Data;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace CMS_SC
{
@@ -17,6 +13,7 @@ namespace CMS_SC
string fileName = memLayer.ML.QSS("fileName");
string cType = memLayer.ML.QSS("cType");
string file2download = Server.MapPath($"{baseDir}\\{fileName}");
logger.lg.scriviLog($"Richiesto download report dall'utente {OpAuth.currAuth.CognomeNome} ({OpAuth.currAuth.email}) | {file2download} --> {fileName} ({cType})");
// check sicurezza: proseguo SOLO SE ho valori E parto dalla cartella tmp...
if (!string.IsNullOrEmpty(baseDir))
{
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4266']) {
withEnv(['NEXT_BUILD_NUMBER=4267']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'