Egalware/ScheMe-PIC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completato editing VVMD! OK DEMO!!!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-10-05 08:13:37 +02:00
parent d83b156206
commit e6dae7c34c
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
ScheMe-PIC/Services/WS_data.asmx.cs
+21 -8
View File
@@ -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);
ScheMe-PIC/VVMD.aspx
+16 -2
View File
@@ -274,7 +274,14 @@
</div>
</li>
<li class="list-group-item">
<span runat="server" id="sAutonomo" class="tStrong flRight text-success" visible='<%# !Convert.ToBoolean(Eval("NonAutonomo")) %>'><i class="fa fa-check"></i></span><span runat="server" id="sNonAutonomo" class="tStrong flRight text-danger" visible='<%# Convert.ToBoolean(Eval("NonAutonomo")) %>'><i class="fa fa-ban"></i></span><small>Autonomo</small>
<div class="row">
<div class="col-xs-6">
<small><b>NON</b> Autonomo</small>
</div>
<div class="col-xs-6 text-right">
<asp:CheckBox runat="server" ID="chkNonAutonomo" Checked='<%# Bind("NonAutonomo") %>' />
</div>
</div>
</li>
</ul>
<ul class="list-group">
@@ -494,7 +501,14 @@
</div>
</li>
<li class="list-group-item">
<span runat="server" id="sAutonomo" class="tStrong flRight text-success" visible='<%# !Convert.ToBoolean(Eval("NonAutonomo")) %>'><i class="fa fa-check"></i></span><span runat="server" id="sNonAutonomo" class="tStrong flRight text-danger" visible='<%# Convert.ToBoolean(Eval("NonAutonomo")) %>'><i class="fa fa-ban"></i></span><small>Autonomo</small>
<div class="row bg-danger text-danger">
<div class="col-xs-6">
<small><b>NON</b> Autonomo</small>
</div>
<div class="col-xs-6 text-right">
<asp:CheckBox runat="server" ID="chkNonAutonomo" Checked='<%# Bind("NonAutonomo") %>' />
</div>
</div>
</li>
</ul>
<ul class="list-group">