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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-12 10:45:16 +01:00
parent dd1a3ad20d bcda765189
commit 3090e3feca
7 changed files with 164 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -7
View File
@@ -9,15 +9,9 @@ pipeline {
stage('Checkout') {
agent any
steps {
/* build delle SteamWare libs! */
/* build 'SteamWare/SteamWareLib' */
/* copio le libs...*/
// mirroring directory x SteamWare Libs
// bat "robocopy /MIR ..\\..\\SteamWare\\SteamWareLib ..\\SteamWare\\SteamWareLib || EXIT /B 0"
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=255']) {
withEnv(['NEXT_BUILD_NUMBER=256']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/PrintController.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using Newtonsoft.Json;
using SteamWare;
using System.IO;
using System.Web;
namespace NKC_WF.Controllers
{
public class PrintController : ApiController
{
// GET: api/Print
public IEnumerable<string> Get()
{
return new string[] { "value1", "value2" };
}
// GET: api/Print/5
public string Get(string id)
{
return $"requested id is {id}";
}
#if false
// POST: api/Print
public void Post([FromBody]string value)
{
}
// PUT: api/Print/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE: api/Print/5
public void Delete(int id)
{
}
#endif
}
}
NKC_WF/Controllers/ReportController.cs
+109
View File
@@ -0,0 +1,109 @@
using Newtonsoft.Json;
using SteamWare;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web;
using System.Web.Http;
namespace NKC_WF.Controllers
{
public class ReportController : ApiController
{
/// <summary>
/// Restituisce un array JSon dei files report template del progetto
/// GET: api/Report
/// </summary>
/// <param name="id">ID della printer associata</param>
/// <returns>Oggetto Json in formato SteamwareSDK.filePack</returns>
public filePack Get()
{
filePack answ = new filePack();
// procedo a deserializzare in blocco l'oggetto...
try
{
// recupero TUTTI i files della folder della printer richiesta
string dirPath = HttpContext.Current.Server.MapPath("~/Reports/");
var fileList = fileMover.obj.elencoFilesDir(dirPath);
smallFile currFile = null;
string fileContent = "";
foreach (var item in fileList)
{
fileContent = File.ReadAllText($"{dirPath}\\{item.Nome}");
currFile = new smallFile()
{
fileName = item.Nome,
content = fileContent.Replace("\r\n", Environment.NewLine)
};
answ.fileList.Add(currFile);
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Errore in get elenco reports{Environment.NewLine}{exc}");
}
return answ;
}
/// <summary>
/// Restituisce oggetto JSon del files report template richeisto
/// GET: api/Report/print_01
/// </summary>
/// <param name="id">nome report (SENZA estensione .rdlc)</param>
/// <returns>Oggetto Json in formato SteamwareSDK.filePack</returns>
public filePack Get(string id)
{
filePack answ = new filePack();
// procedo a deserializzare in blocco l'oggetto...
try
{
// recupero TUTTI i files della folder della printer richiesta
string dirPath = HttpContext.Current.Server.MapPath("~/Reports/");
var fileList = fileMover.obj.elencoFilesDir(dirPath);
smallFile currFile = null;
string fileContent = "";
foreach (var item in fileList)
{
// se è uguale all'id richeisto...
if (item.Nome.Replace(".rdlc", "") == id.Replace(".rdlc", ""))
{
fileContent = File.ReadAllText($"{dirPath}\\{item.Nome}");
currFile = new smallFile()
{
fileName = item.Nome,
content = fileContent.Replace("\r\n", Environment.NewLine)
};
answ.fileList.Add(currFile);
}
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Errore in get singolo report{Environment.NewLine}{exc}");
}
return answ;
}
#if false
// POST: api/Report
public void Post([FromBody]string value)
{
}
// PUT: api/Report/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE: api/Report/5
public void Delete(int id)
{
}
#endif
}
}
NKC_WF/NKC_WF.csproj
+4 -2
View File
@@ -125,8 +125,8 @@
<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>
</Reference>
<Reference Include="SteamWare, Version=3.5.2001.709, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.2001.709\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=3.5.2002.716, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.2002.716\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
@@ -512,6 +512,8 @@
<Link>VersGen.cs</Link>
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="Controllers\PrintController.cs" />
<Compile Include="Controllers\ReportController.cs" />
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Web.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
Per altre informazioni su come configurare l'applicazione ASP.NET, vedere
https://go.microsoft.com/fwlink/?LinkId=169433
NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
+2
View File
@@ -23,6 +23,8 @@ namespace NKC_WF.WebUserControls
{
hfBatchId.Value = value.ToString();
frmView.DataBind();
lblMatDet.Text = "";
lblProdDet.Text = "";
if (memLayer.ML.CRB("enableMongo"))
{
// cerco da lista salvataggi Estim/Nest...
NKC_WF/packages.config
+1 -1
View File
@@ -56,7 +56,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
<package id="SteamWare" version="3.5.2001.709" targetFramework="net462" />
<package id="SteamWare" version="3.5.2002.716" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.7.0" targetFramework="net462" />