diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
index fbd032c..7c7f2b9 100644
--- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
+++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
@@ -17,4 +17,3 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb
-C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache
diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 9b27ce9..0000000
Binary files a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache and /dev/null differ
diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index cff886c..737c382 100644
Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ
diff --git a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll
index 44ae9cd..1594023 100644
Binary files a/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/Ds_ProjEts.Designer.cs.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css
index 3184321..85fd4c1 100644
--- a/PROJ-ETS/PROJ-ETS/Content/Style.css
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.css
@@ -91,6 +91,19 @@ A:hover {
font-family: Arial;
}
/* update controls */
+/* colore testi */
+.textArancio {
+ color: #FFAA33;
+}
+.textAzzurro {
+ color: #36F;
+}
+.textNero {
+ color: #000;
+}
+.textGrigio {
+ color: #888;
+}
/* gestione etichette calcolate*/
.badgeRosso {
border: solid 2px red;
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less
index 8babc64..99aac5e 100644
--- a/PROJ-ETS/PROJ-ETS/Content/Style.less
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.less
@@ -110,6 +110,25 @@ A:hover {
font-family: Arial;
}
/* update controls */
+
+/* colore testi */
+.textArancio
+{
+ color: #FFAA33;
+}
+.textAzzurro
+{
+ color: #36F;
+}
+.textNero
+{
+ color: #000;
+}
+.textGrigio
+{
+ color: #888;
+}
+
/* gestione etichette calcolate*/
.badgeRosso {
border: solid 2px red;
diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css
index 34fe60f..fa2d17b 100644
--- a/PROJ-ETS/PROJ-ETS/Content/Style.min.css
+++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css
@@ -1 +1 @@
-@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.menuItem{width:200px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle}
\ No newline at end of file
+@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.menuItem{width:200px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/Images/EmptyImg.png b/PROJ-ETS/PROJ-ETS/Images/EmptyImg.png
new file mode 100644
index 0000000..a157ed2
Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/EmptyImg.png differ
diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
index d8ed48a..8a2eacb 100644
--- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
@@ -199,6 +199,7 @@
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx
index 3d52320..b38daba 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx
@@ -58,9 +58,9 @@
@@ -68,9 +68,9 @@
@@ -130,6 +130,7 @@
+
@@ -195,7 +196,7 @@
-
+
@@ -205,7 +206,7 @@
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
index 8cc15e5..787ea40 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs
@@ -223,8 +223,6 @@ namespace PROJ_ETS.WebUserControls
}
//// aggiungo fase ancestor!
//e.InputParameters["idxFaseAncest"] = utils.obj.IntSessionObj("idxFaseAncest");
- // aggiungo progetto!
- e.InputParameters["idxProgetto"] = idxProgetto;
}
///
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index cff886c..737c382 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index 93cf2ff..f99a42a 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7dfd29a..7edaea5 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
index a7daf85..d064c4e 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
index 93cf2ff..f99a42a 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ