update vers e fix selezione periodo
This commit is contained in:
@@ -1,12 +1,7 @@
|
||||
using AppData;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace C_TRACK
|
||||
{
|
||||
@@ -24,8 +19,23 @@ namespace C_TRACK
|
||||
string value = "";
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
||||
// recupero oggetti parametrici...
|
||||
var dt = dataLayer.man.taTR.getByFilt("", DateTime.Today.AddMonths(-3), DateTime.Today.AddDays(1));
|
||||
// recupero oggetti parametrici...
|
||||
string from = Request.QueryString["from"];
|
||||
string to = Request.QueryString["to"];
|
||||
DateTime dateFrom = DateTime.Today.AddYears(-1);
|
||||
DateTime dateTo = DateTime.Today.AddDays(1);
|
||||
// se è diverso da vuoto faccio parse...
|
||||
if (from != "" && from !=null)
|
||||
{
|
||||
DateTime.TryParse(from, out dateFrom);
|
||||
}
|
||||
if (to != "" && to != null)
|
||||
{
|
||||
DateTime.TryParse(to, out dateTo);
|
||||
}
|
||||
|
||||
// leggo tabella
|
||||
var dt = dataLayer.man.taTR.getByFilt("", dateFrom, dateTo);
|
||||
|
||||
//write the csv column headers
|
||||
for (int i = 0; i < dt.Columns.Count; i++)
|
||||
|
||||
Vendored
+1
-1
@@ -20,7 +20,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=85']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=88']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'C.TRACK'
|
||||
|
||||
Reference in New Issue
Block a user