diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs
index 94669ba..73bc0a8 100644
--- a/CMS_SC/ElencoSchede.aspx.cs
+++ b/CMS_SC/ElencoSchede.aspx.cs
@@ -1,11 +1,11 @@
-using CMS_SC_Data;
-using SteamWare;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using CMS_SC_Data;
+using SteamWare;
namespace CMS_SC
{
diff --git a/CMS_SC/Properties/PublishProfiles/IIS01.pubxml b/CMS_SC/Properties/PublishProfiles/IIS01.pubxml
new file mode 100644
index 0000000..7c2e454
--- /dev/null
+++ b/CMS_SC/Properties/PublishProfiles/IIS01.pubxml
@@ -0,0 +1,60 @@
+
+
+
+
+ MSDeploy
+ False
+ Release
+ Any CPU
+
+ True
+ True
+ True
+ False
+ DonotMerge
+ True
+ https://IIS01:8172/MsDeploy.axd
+ Default Web Site/CMS_SC
+
+ False
+ WMSVC
+ True
+ steamw\administrator
+ <_SavePWD>True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+
\ No newline at end of file
diff --git a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml
index 842cfc7..9466501 100644
--- a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml
+++ b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml
@@ -10,40 +10,44 @@ by editing this MSBuild file. In order to learn more about this please visit htt
Any CPU
True
-
False
+
True
https://IIS02:8172/MsDeploy.axd
Default Web Site/CMS_SC
-
True
+
False
WMSVC
True
-
steamwarewin\administrator
+
steamw\administrator
<_SavePWD>True
-
+
-
+
False
+
True
+
True
+
False
+
DonotMerge
diff --git a/CMS_SC/Properties/PublishProfiles/WinLab.pubxml b/CMS_SC/Properties/PublishProfiles/WinLab.pubxml
index 378dba6..2269740 100644
--- a/CMS_SC/Properties/PublishProfiles/WinLab.pubxml
+++ b/CMS_SC/Properties/PublishProfiles/WinLab.pubxml
@@ -24,21 +24,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
-
+
-
+
diff --git a/CMS_SC/Properties/PublishProfiles/ZIP-CMS.pubxml b/CMS_SC/Properties/PublishProfiles/ZIP-CMS.pubxml
index 12d4da8..91ab042 100644
--- a/CMS_SC/Properties/PublishProfiles/ZIP-CMS.pubxml
+++ b/CMS_SC/Properties/PublishProfiles/ZIP-CMS.pubxml
@@ -19,21 +19,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt
-
+
-
+
diff --git a/CMS_SC/StatoDossiers.aspx b/CMS_SC/StatoDossiers.aspx
new file mode 100644
index 0000000..de19a69
--- /dev/null
+++ b/CMS_SC/StatoDossiers.aspx
@@ -0,0 +1,57 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="StatoDossiers.aspx.cs" Inherits="CMS_SC.StatoDossiers" %>
+
+
+<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_elencoDossiers.ascx" TagPrefix="uc1" TagName="mod_elencoDossiers" %>
+<%@ Register Src="~/WebUserControls/mod_StatoCollaudi.ascx" TagPrefix="uc1" TagName="mod_StatoCollaudi" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
<%: traduci("StatoDossiers") %>
+
+
+
+
+
+
+
+
+
+
+
<%: traduci("StatoCollaudi") %>
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
index 50e146f..b8514c4 100644
--- a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs
@@ -16,7 +16,7 @@ namespace CMS_SC.WebUserControls
///
public event EventHandler eh_selezioneValore;
///
- /// richeista SAVE (da enter)
+ /// richiesta SAVE (da enter)
///
public event EventHandler eh_reqSave;
///
diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx
index 1eed348..10c8a78 100644
--- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx
+++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SchemaCollFamMacc.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_SchemaCollFamMacc" %>
-
+
@@ -36,6 +36,21 @@
+
+
+ <%# traduci("moveMis") %>
+
+
+
+
+
+
+
+
diff --git a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs
index 9f957c4..e779f2a 100644
--- a/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_SchemaCollFamMacc.ascx.cs
@@ -10,7 +10,34 @@ using SteamWare;
namespace CMS_SC.WebUserControls
{
public partial class mod_SchemaCollFamMacc : SteamWare.UserControl
- {
+ {///
+ /// selezione valore in DettScheda
+ ///
+ public event EventHandler eh_selezioneValore;
+ ///
+ /// richiesta SAVE (da enter)
+ ///
+ public event EventHandler eh_reqSave;
+ ///
+ /// sollevo evento selezione
+ ///
+ protected void raiseEvent()
+ {
+ // sollevo evento nuovo valore...
+ if (eh_selezioneValore != null)
+ {
+ eh_selezioneValore(this, new EventArgs());
+ }
+ }
+ ///
+ /// resetto selezione
+ ///
+ private void resetSelezione()
+ {
+ grView.SelectedIndex = -1;
+ grView.DataBind();
+ raiseEvent();
+ }
protected void Page_Load(object sender, EventArgs e)
{
}
@@ -61,5 +88,112 @@ namespace CMS_SC.WebUserControls
protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
{
}
+
+ ///
+ /// CodFam selezionata
+ ///
+ public string CodFamSel
+ {
+ get
+ {
+ string answ = "";
+ try
+ {
+ answ = grView.SelectedDataKey["CodFam"].ToString();
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ ///
+ /// CodSchedaVers selezionata
+ ///
+ public string CodSchedaVersSel
+ {
+ get
+ {
+ string answ = "";
+ try
+ {
+ answ = grView.SelectedDataKey["CodSchedaVers"].ToString();
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ ///
+ /// selezionato valore
+ ///
+ ///
+ ///
+ protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ // verifico se ho un argomento di tipo moveUp / moveDown... quale comando?
+ string _comando = "";
+ if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand"))
+ {
+ _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand");
+ SteamWare.memLayer.ML.emptySessionVal("nextObjCommand");
+ }
+ if (_comando != "")
+ {
+ // SE c'era comando eseguo move...
+ switch (_comando)
+ {
+ case "moveUp":
+ case "moveDown":
+ DtProxy.man.taSCFM.moveUpDown(_comando, CodFamSel, CodSchedaVersSel);
+ break;
+ //case "clone":
+ // DtProxy.man.taDS.clone(memLayer.ML.QSS("CodSchedaVers"), grView.SelectedDataKey["CodMisura"].ToString());
+ // break;
+ default:
+ break;
+ }
+ resetSelezione();
+ }
+ else
+ {
+ raiseEvent();
+ }
+ }
+ ///
+ /// salvo in session il prox comando
+ ///
+ ///
+ ///
+ protected void lb_Click(object sender, EventArgs e)
+ {
+ SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument);
+ }
+ ///
+ /// determina visibilità frecce spostamento
+ ///
+ ///
direzione: UP / DOWN
+ ///
Ordinale
+ ///
+ public bool arrowVisible(object _direction, object _Ordinale)
+ {
+ bool answ = false;
+ string direction = _direction.ToString();
+ int Ordinale = Convert.ToInt32(_Ordinale.ToString());
+ if (memLayer.ML.BoolSessionObj("filtByFamMac"))
+ {
+ switch (direction)
+ {
+ case "UP":
+ answ = Ordinale > 1;
+ break;
+ case "DOWN":
+ answ = Ordinale < DtProxy.man.taSCFM.getByFamMacc(memLayer.ML.QSS("CodFam")).Rows.Count;
+ break;
+ default:
+ break;
+ }
+ }
+ return answ;
+ }
}
}
\ No newline at end of file
diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
new file mode 100644
index 0000000..7de0f74
--- /dev/null
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx
@@ -0,0 +1,53 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_StatoCollaudi.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_StatoCollaudi" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
+
+
+
+
+
+
+
+ --%>
+ <%--
+
+
+
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
new file mode 100644
index 0000000..bbcd87c
--- /dev/null
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CMS_SC_Data;
+using SteamWare;
+
+namespace CMS_SC.WebUserControls
+{
+ public partial class mod_StatoCollaudi : SteamWare.UserControl
+ {
+ ///
+ /// selezione valore in DettScheda
+ ///
+ public event EventHandler eh_selezioneValore;
+ ///
+ /// sollevo evento selezione
+ ///
+ protected void raiseEvent()
+ {
+ // sollevo evento nuovo valore...
+ if (eh_selezioneValore != null)
+ {
+ eh_selezioneValore(this, new EventArgs());
+ }
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ ///
+ /// dimensione pagina grid view
+ ///
+ public int pageSize
+ {
+ get
+ {
+ return grView.PageSize;
+ }
+ set
+ {
+ grView.PageSize = value;
+ }
+ }
+ ///
+ /// dossier selezionato
+ ///
+ public string idxDossier
+ {
+ get
+ {
+ return hfIdxDossier.Value;
+ }
+ set
+ {
+ hfIdxDossier.Value = value;
+ grView.DataBind();
+ }
+ }
+ ///
+ /// dossier selezionato
+ ///
+ public string Fase
+ {
+ get
+ {
+ return hfFase.Value;
+ }
+ set
+ {
+ hfFase.Value = value;
+ grView.DataBind();
+ }
+ }
+ public void doUpdate()
+ {
+ grView.DataBind();
+ }
+ ///
+ /// selezione scheda...
+ ///
+ ///
+ ///
+ protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ // verifico se ho un argomento di tipo moveUp / moveDown... quale comando?
+ string CodSchedaVersNum = "";
+ CodSchedaVersNum = string.Format("{0}.{1}.{2}", grView.SelectedDataKey["CodScheda"], grView.SelectedDataKey["Vers"], grView.SelectedDataKey["NumScheda"]);
+ if (CodSchedaVersNum != "")
+ {
+ // salvo parametro
+ savePar("ddlSelScheda", CodSchedaVersNum);
+ // sollevo evento...
+ raiseEvent();
+ }
+ }
+ ///
+ /// salva su DB il parametro scelto dall'utente
+ ///
+ ///
+ ///
+ protected void savePar(string paramName, string paramValue)
+ {
+ DtProxy.man.taUsrPar.upsert(OpAuth.currAuth.email, paramName, paramValue);
+ }
+ protected void btnReset_Click(object sender, EventArgs e)
+ {
+ resetSelezione();
+ }
+ ///
+ /// resetto selezione
+ ///
+ private void resetSelezione()
+ {
+ grView.SelectedIndex = -1;
+ grView.DataBind();
+ raiseEvent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs
new file mode 100644
index 0000000..cddcf0f
--- /dev/null
+++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace CMS_SC.WebUserControls {
+
+
+ public partial class mod_StatoCollaudi {
+
+ ///
+ /// grView control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.GridView grView;
+
+ ///
+ /// ods control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+
+ ///
+ /// hfIdxDossier control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfIdxDossier;
+
+ ///
+ /// hfFase control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfFase;
+ }
+}
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx
index 580b254..c485ecf 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx
@@ -52,7 +52,8 @@
-
+
+ <%--Visible='<%# Eval("NomePar").ToString() != "" %>' --%>
<%# contaAllegati(Eval("ValoreMis")) %>
diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx
index f23927c..293b718 100644
--- a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx
+++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx
@@ -26,7 +26,7 @@
-
+
diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs
index 7abc09d..2c4817d 100644
--- a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs
@@ -96,6 +96,21 @@ namespace CMS_SC.WebUserControls
{
return user_std.UtSn.Traduci(lemma);
}
+ ///
+ /// imposta se sia abilitato delete "in genere" per il controllo
+ ///
+ public bool showDelete
+ {
+ get
+ {
+ return memLayer.ML.BoolSessionObj(string.Format("canDel_{0}", devicesAuthProxy.pagCorrente));
+ }
+ set
+ {
+ memLayer.ML.setSessionVal(string.Format("canDel_{0}", devicesAuthProxy.pagCorrente), value);
+ grView.DataBind();
+ }
+ }
public bool userCanDel(object _idxDossier)
{
diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx
index b78758f..dd271cb 100644
--- a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx
+++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx
@@ -16,6 +16,21 @@
+
+
+ <%# traduci("moveMis") %>
+
+
+
+
+
+
+
+
diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs
index 130d176..357aebf 100644
--- a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs
@@ -70,7 +70,36 @@ namespace CMS_SC.WebUserControls
///
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
- raiseEvent();
+ // verifico se ho un argomento di tipo moveUp / moveDown... quale comando?
+ string _comando = "";
+ string CodSchedaVersNum = "";
+ if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand"))
+ {
+ _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand");
+ SteamWare.memLayer.ML.emptySessionVal("nextObjCommand");
+ }
+ if (_comando != "")
+ {
+ CodSchedaVersNum = string.Format("{0}.{1}.{2}", grView.SelectedDataKey["CodScheda"], grView.SelectedDataKey["Vers"], grView.SelectedDataKey["NumScheda"]);
+ // SE c'era comando eseguo move...
+ switch (_comando)
+ {
+ case "moveUp":
+ case "moveDown":
+ DtProxy.man.taSCM.moveUpDown(_comando, Convert.ToInt32(idxDossier), CodSchedaVersNum);
+ break;
+ //case "clone":
+ // DtProxy.man.taDS.clone(memLayer.ML.QSS("CodSchedaVers"), grView.SelectedDataKey["CodMisura"].ToString());
+ // break;
+ default:
+ break;
+ }
+ resetSelezione();
+ }
+ else
+ {
+ raiseEvent();
+ }
}
protected void btnReset_Click(object sender, EventArgs e)
{
@@ -85,5 +114,38 @@ namespace CMS_SC.WebUserControls
grView.DataBind();
raiseEvent();
}
+ ///
+ /// determina visibilità frecce spostamento
+ ///
+ /// direzione: UP / DOWN
+ /// Ordinale
+ ///
+ public bool arrowVisible(object _direction, object _Ordinale)
+ {
+ bool answ = false;
+ string direction = _direction.ToString();
+ int Ordinale = Convert.ToInt32(_Ordinale.ToString());
+ switch (direction)
+ {
+ case "UP":
+ answ = Ordinale > 1;
+ break;
+ case "DOWN":
+ answ = Ordinale < DtProxy.man.taSCM.getByDossier(Convert.ToInt32(idxDossier)).Rows.Count;
+ break;
+ default:
+ break;
+ }
+ return answ;
+ }
+ ///
+ /// salvo in session il prox comando
+ ///
+ ///
+ ///
+ protected void lb_Click(object sender, EventArgs e)
+ {
+ SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument);
+ }
}
}
\ No newline at end of file
diff --git a/CMS_SC/WebUserControls/mod_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx
index f3fb0ef..a0d14eb 100644
--- a/CMS_SC/WebUserControls/mod_testata.ascx
+++ b/CMS_SC/WebUserControls/mod_testata.ascx
@@ -50,9 +50,10 @@
Collaudi
@@ -84,7 +85,7 @@
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index d4ee595..1c59f48 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll
index 7982535..74562c8 100644
Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll.config b/CMS_SC/bin/CMS_SC.dll.config
index f65b637..4eb69ba 100644
--- a/CMS_SC/bin/CMS_SC.dll.config
+++ b/CMS_SC/bin/CMS_SC.dll.config
@@ -88,17 +88,17 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index 2060e0d..c7181a1 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/CMS_SC/bin/SteamWare.xml b/CMS_SC/bin/SteamWare.xml
index c95c549..b586d38 100644
--- a/CMS_SC/bin/SteamWare.xml
+++ b/CMS_SC/bin/SteamWare.xml
@@ -3355,6 +3355,13 @@
forza lo svuotamento delel tabelle indicate come in cache...
+
+
+ Formattazione stringa URL immagini con gestione "base url"
+
+
+
+
Salted password hashing with PBKDF2-SHA1.
@@ -3727,12 +3734,12 @@
- determina se l'utente sia abilitato a scrivere nelal apgina corrente (quindi modificare e cancellare...)
+ determina se l'utente sia abilitato a scrivere nella pagina corrente (quindi modificare e cancellare...)
- determina se l'utente sia abilitato alla pagina corrente (di base visualizzaizone...)
+ determina se l'utente sia abilitato alla pagina corrente (di base visualizzazione...)
diff --git a/CMS_SC/sql/ManualUpdate_2.0_2.1.sql b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql
new file mode 100644
index 0000000..d758eb7
--- /dev/null
+++ b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql
@@ -0,0 +1,33 @@
+
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',1,'NON INIZIATA',1)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',2,'IN CORSO',2)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',3,'COMPLETATA KO',3)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',4,'COMPLETATA DEROGA',4)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',5,'COMPLETATA OK',5)
+
+
+-- update vocabolario
+exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente'
+exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers'
+exec voc.stp_insNewLemma 'StatoCollaudi', 'Stato Collaudi'
+
+
+
+-- permessi & funzioni
+INSERT INTO dbo.Permessi(COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Collaudi_StatoDossiers','StatoDossiers',2,4,'StatoDossiers','StatoDossiersIcon')
+INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoOfficina', 'S')
+INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoGruppo', 'S')
+
+-- genero calcolo x valori ordinali ATTUALI
+exec util.stp_setupOrdinal_SCFM
+SELECT ROW_NUMBER() OVER(PARTITION BY CodFam ORDER BY CodScheda, Vers) AS Riga, *
+FROM SchemaCollFamMacc
+
+exec util.stp_setupOrdinal_SCM
+SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier ORDER BY CodScheda, Vers, NumScheda) AS Riga, *
+FROM SchemaCollMacc
+
+
+exec util.stp_setupOrdinal_Mis
+SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier, Fase ORDER BY CodScheda, Vers, NumScheda, CodMisura) AS Riga, *
+FROM Misure
diff --git a/Release Clienti/CMS_SC.zip b/Release Clienti/CMS_SC.zip
index edceca5..ff71eb3 100644
Binary files a/Release Clienti/CMS_SC.zip and b/Release Clienti/CMS_SC.zip differ
diff --git a/Release Clienti/ManualUpdate_2.0_2.1.sql b/Release Clienti/ManualUpdate_2.0_2.1.sql
new file mode 100644
index 0000000..d758eb7
--- /dev/null
+++ b/Release Clienti/ManualUpdate_2.0_2.1.sql
@@ -0,0 +1,33 @@
+
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',1,'NON INIZIATA',1)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',2,'IN CORSO',2)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',3,'COMPLETATA KO',3)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',4,'COMPLETATA DEROGA',4)
+INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',5,'COMPLETATA OK',5)
+
+
+-- update vocabolario
+exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente'
+exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers'
+exec voc.stp_insNewLemma 'StatoCollaudi', 'Stato Collaudi'
+
+
+
+-- permessi & funzioni
+INSERT INTO dbo.Permessi(COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Collaudi_StatoDossiers','StatoDossiers',2,4,'StatoDossiers','StatoDossiersIcon')
+INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoOfficina', 'S')
+INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoGruppo', 'S')
+
+-- genero calcolo x valori ordinali ATTUALI
+exec util.stp_setupOrdinal_SCFM
+SELECT ROW_NUMBER() OVER(PARTITION BY CodFam ORDER BY CodScheda, Vers) AS Riga, *
+FROM SchemaCollFamMacc
+
+exec util.stp_setupOrdinal_SCM
+SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier ORDER BY CodScheda, Vers, NumScheda) AS Riga, *
+FROM SchemaCollMacc
+
+
+exec util.stp_setupOrdinal_Mis
+SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier, Fase ORDER BY CodScheda, Vers, NumScheda, CodMisura) AS Riga, *
+FROM Misure
diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs
index 7c5b68b..4a28c06 100644
--- a/VersGen/CMS_SC.cs
+++ b/VersGen/CMS_SC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.0.123.356")]
-[assembly: AssemblyFileVersion("2.0.123.356")]
+[assembly: AssemblyVersion("2.1.132.360")]
+[assembly: AssemblyFileVersion("2.1.132.360")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt
index c1b538b..66fc67d 100644
--- a/VersGen/CMS_SC.tt
+++ b/VersGen/CMS_SC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("2.0.123.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.0.123.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.1.132.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.1.132.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll
index 2bb85be..3f59b5a 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ
diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll
index e2c8cbe..9efb739 100644
Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ