Merge branch 'develop'
This commit is contained in:
Samuele E. Locatelli
Vendored
+1
-1
@@ -11,7 +11,7 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=256']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=257']) {
|
||||
// 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}')
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
using Newtonsoft.Json;
|
||||
using SteamWare;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Web;
|
||||
using System.Web.Http;
|
||||
|
||||
namespace NKC_WF.Controllers
|
||||
{
|
||||
|
||||
public class ResponseModel
|
||||
{
|
||||
public List<queueConf> queueList { set; get; } = new List<queueConf>();
|
||||
}
|
||||
public class PrintQueueConfController : ApiController
|
||||
{
|
||||
/// <summary>
|
||||
/// Restituisce un array JSon x le conf delle code di stampa
|
||||
/// GET: api/PrintQueue
|
||||
/// </summary>
|
||||
/// <returns>lista oggetto Json in formato SteamwareSDK.queueConf</returns>
|
||||
public List<queueConf> Get()
|
||||
{
|
||||
ResponseModel fullAnsw = new ResponseModel();
|
||||
List<queueConf> answ = new List<queueConf>();
|
||||
// !!!FIXME!!! per ora hard coded, da usare conf file...
|
||||
queueConf currConf;
|
||||
string outForm = "EMF";
|
||||
string pagWidth = "8.5in";
|
||||
string pagHeigth = "11in";
|
||||
string margin = "0.5in";
|
||||
devInfoParam currDevInfoParam = new devInfoParam(outForm, pagHeigth, pagWidth, margin, margin, margin, margin);
|
||||
currConf = new queueConf()
|
||||
{
|
||||
name = "queueBin",
|
||||
template = "BinLabel.rdlc",
|
||||
printerName = "Microsoft Print to PDF",
|
||||
deviceInfoParam = currDevInfoParam,
|
||||
rdsName = "stp_prt_BinLabel"
|
||||
};
|
||||
answ.Add(currConf);
|
||||
currConf = new queueConf()
|
||||
{
|
||||
name = "queueBunk",
|
||||
template = "StackLabel.rdlc",
|
||||
printerName = "Microsoft Print to PDF",
|
||||
deviceInfoParam = currDevInfoParam,
|
||||
rdsName = "stp_prt_StackLabel"
|
||||
};
|
||||
answ.Add(currConf);
|
||||
currConf = new queueConf()
|
||||
{
|
||||
name = "queueCart",
|
||||
template = "CartLabel.rdlc",
|
||||
printerName = "Microsoft Print to PDF",
|
||||
deviceInfoParam = currDevInfoParam,
|
||||
rdsName = "stp_prt_CartLabel"
|
||||
};
|
||||
answ.Add(currConf);
|
||||
fullAnsw.queueList = answ;
|
||||
//return fullAnsw;
|
||||
return answ;
|
||||
}
|
||||
|
||||
// GET: api/PrintQueue/5
|
||||
public string Get(int id)
|
||||
{
|
||||
return "value";
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -89,21 +89,5 @@ namespace NKC_WF.Controllers
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.2002.716, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.3.5.2002.716\lib\net462\SteamWare.dll</HintPath>
|
||||
<Reference Include="SteamWare, Version=3.5.2002.718, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.3.5.2002.718\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>
|
||||
@@ -513,6 +513,7 @@
|
||||
</Compile>
|
||||
<Compile Include="App_Start\BundleConfig.cs" />
|
||||
<Compile Include="Controllers\PrintController.cs" />
|
||||
<Compile Include="Controllers\PrintQueueConfController.cs" />
|
||||
<Compile Include="Controllers\ReportController.cs" />
|
||||
<Compile Include="Default.aspx.cs">
|
||||
<DependentUpon>Default.aspx</DependentUpon>
|
||||
|
||||
Binary file not shown.
@@ -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.2002.716" targetFramework="net462" />
|
||||
<package id="SteamWare" version="3.5.2002.718" 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" />
|
||||
|
||||
Reference in New Issue
Block a user