diff --git a/Jenkinsfile b/Jenkinsfile index ee97f2a..f86cbed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=132']) { + withEnv(['NEXT_BUILD_NUMBER=140']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'ScheMe-PIC' diff --git a/ScheMe-PIC/Services/WS_data.asmx.cs b/ScheMe-PIC/Services/WS_data.asmx.cs index 35ab6ef..fcbcec1 100644 --- a/ScheMe-PIC/Services/WS_data.asmx.cs +++ b/ScheMe-PIC/Services/WS_data.asmx.cs @@ -65,16 +65,29 @@ namespace ScheMe.Services allData.Add(maxVal); // leggo info... DS_Applicazione.VisVMDDataTable tab = DtProxy.man.taVVMD.getByPaziente(idxUser, dataRif); - // recupero SOLO i PENALTY... e sono 8... - int valore = 0; - for (int i = 0; i < tab.Columns.Count; i++) + // se contiene valori... + if (tab.Rows.Count > 0) { - // recupero nome colonna, se è "_" inserisco... - if (tab.Columns[i].ToString().IndexOf("_p") >= 0) + // recupero SOLO i PENALTY... e sono 8... + int valore = 0; + for (int i = 0; i < tab.Columns.Count; i++) { - etichette.Add(tab.Columns[i].ToString().Replace("_p", "")); - Int32.TryParse(tab[0][i].ToString(), out valore); - valori.Add(valore); + // recupero nome colonna, se è "_" inserisco... + if (tab.Columns[i].ToString().IndexOf("_p") >= 0) + { + etichette.Add(tab.Columns[i].ToString().Replace("_p", "")); + Int32.TryParse(tab[0][i].ToString(), out valore); + valori.Add(valore); + } + } + } + // altrimenti valori vuoti... + else + { + for (int i = 0; i < 8; i++) + { + etichette.Add(i.ToString()); + valori.Add(0); } } allData.Add(etichette); diff --git a/ScheMe-PIC/VVMD.aspx b/ScheMe-PIC/VVMD.aspx index 43d0e59..8a86cd0 100644 --- a/ScheMe-PIC/VVMD.aspx +++ b/ScheMe-PIC/VVMD.aspx @@ -274,7 +274,14 @@
  • - Autonomo +
    +
    + NON Autonomo +
    +
    + +
    +