diff --git a/ETS_Data/utils.cs b/ETS_Data/utils.cs
index 169689b..b78bf79 100644
--- a/ETS_Data/utils.cs
+++ b/ETS_Data/utils.cs
@@ -453,7 +453,48 @@ namespace ETS_Data
}
return answ;
}
+ ///
+ /// trimma una stringa per il num max di caratteri richiesti togliendo dal centro (tiene inizio/fine...)
+ ///
+ ///
+ ///
+ /// num caratteri da ignorare a dx
+ ///
+ public static string shrinkString(string stringaIn, int maxNum, int ignoreRight)
+ {
+ // elimino caratteri a dx.. se posso
+ string answ = stringaIn;
+ if (ignoreRight < stringaIn.Length)
+ {
+ answ = answ.Substring(0, stringaIn.Length - ignoreRight);
+ }
+ // effetuo shrink!
+ answ = shrinkString(answ, maxNum);
+ return answ;
+ }
+ ///
+ /// trimma una stringa per il num max di caratteri richiesti
+ ///
+ ///
+ ///
+ public string trimChar(object stringaIn, object maxChar)
+ {
+ string answ = "";
+ int maxNum = 0;
+ try
+ {
+ answ = stringaIn.ToString();
+ maxNum = Convert.ToInt32(maxChar);
+ }
+ catch
+ { }
+ if (maxNum < answ.Length)
+ {
+ answ = answ.Substring(0, maxNum) + "...";
+ }
+ return answ;
+ }
public static int pageSizeConf
{
get
diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index 515496a..29f3ac2 100644
--- a/PROJ-ETS/PROJ-ETS/Web.config
+++ b/PROJ-ETS/PROJ-ETS/Web.config
@@ -4,64 +4,66 @@
http://go.microsoft.com/fwlink/?LinkId=169433
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
index b5f19ab..670ff61 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
@@ -313,7 +313,7 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
- cell.CssClass = "cBia";
+ cell.CssClass = "cRBia divSx";
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabBazSingle[pos_y].idxFase))[0];
if (showOre)
{
@@ -338,7 +338,7 @@ namespace PROJ_ETS.WebUserControls
}
else
{
- cell.Text = rigaComm.label.Substring(0, 9);
+ cell.Text = utils.shrinkString(rigaComm.label, utils.obj.confReadInt("char2showComm"), 8);
cell.ToolTip = rigaComm.label;
}
riga.Cells.Add(cell);
@@ -483,20 +483,7 @@ namespace PROJ_ETS.WebUserControls
///
public string trimChar(object stringaIn, object maxChar)
{
- string answ = "";
- int maxNum = 0;
- try
- {
- answ = stringaIn.ToString();
- maxNum = Convert.ToInt32(maxChar);
- }
- catch
- { }
- if (maxNum < answ.Length)
- {
- answ = answ.Substring(0, maxNum) + "...";
- }
- return answ;
+ return utils.obj.trimChar(stringaIn, maxChar);
}
///
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
index 87dfe25..24b6a6b 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekRA.ascx.cs
@@ -228,7 +228,7 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
- cell.CssClass = "cRBia";
+ cell.CssClass = "cRBia divSx";
try
{
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0];
@@ -239,7 +239,7 @@ namespace PROJ_ETS.WebUserControls
}
else
{
- cell.Text = rigaComm.label.Substring(0, 9);
+ cell.Text = utils.shrinkString(rigaComm.label, utils.obj.confReadInt("char2showComm"), 8);
cell.ToolTip = rigaComm.label;
}
}
@@ -286,28 +286,5 @@ namespace PROJ_ETS.WebUserControls
setupRigaDip(true);
}
- ///
- /// trimma una stringa per il num max di caratteri richiesti
- ///
- ///
- ///
- public string trimChar(object stringaIn, object maxChar)
- {
- string answ = "";
- int maxNum = 0;
- try
- {
- answ = stringaIn.ToString();
- maxNum = Convert.ToInt32(maxChar);
- }
- catch
- { }
- if (maxNum < answ.Length)
- {
- answ = answ.Substring(0, maxNum) + "...";
- }
- return answ;
- }
-
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
index 30d55c3..aebd87c 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekVerify.ascx.cs
@@ -228,7 +228,7 @@ namespace PROJ_ETS.WebUserControls
//cella!
TableCell cell;
cell = new TableCell();
- cell.CssClass = "cRBia";
+ cell.CssClass = "cRBia divSx";
try
{
rigaComm = (DS_utilsProjEts.v_selCommesseRow)tabComm.Select(string.Format("value = {0}", tabIRPareto[pos_y].idxFase))[0];
@@ -239,7 +239,7 @@ namespace PROJ_ETS.WebUserControls
}
else
{
- cell.Text = rigaComm.label.Substring(0, 9);
+ cell.Text = utils.shrinkString(rigaComm.label, utils.obj.confReadInt("char2showComm"), 8);
cell.ToolTip = rigaComm.label;
}
}
@@ -286,27 +286,5 @@ namespace PROJ_ETS.WebUserControls
setupRigaDip(true);
}
- ///
- /// trimma una stringa per il num max di caratteri richiesti
- ///
- ///
- ///
- public string trimChar(object stringaIn, object maxChar)
- {
- string answ = "";
- int maxNum = 0;
- try
- {
- answ = stringaIn.ToString();
- maxNum = Convert.ToInt32(maxChar);
- }
- catch
- { }
- if (maxNum < answ.Length)
- {
- answ = answ.Substring(0, maxNum) + "...";
- }
- return answ;
- }
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index e613b13..1465dd8 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 d46a520..8d76b2b 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ