diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx b/C-TRACK/WebUserControls/mod_taskRec.ascx
index d966bb6..59c3712 100644
--- a/C-TRACK/WebUserControls/mod_taskRec.ascx
+++ b/C-TRACK/WebUserControls/mod_taskRec.ascx
@@ -116,7 +116,7 @@
-
+
@@ -125,9 +125,21 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx.cs b/C-TRACK/WebUserControls/mod_taskRec.ascx.cs
index ca54e82..ee4993a 100644
--- a/C-TRACK/WebUserControls/mod_taskRec.ascx.cs
+++ b/C-TRACK/WebUserControls/mod_taskRec.ascx.cs
@@ -27,6 +27,9 @@ namespace C_TRACK.WebUserControls
case selType.byUser:
grView.DataSourceID = "odsOpr";
break;
+ case selType.byPostMulti:
+ grView.DataSourceID = "odsPostMulti";
+ break;
case selType.byTask:
default:
grView.DataSourceID = "odsTask";
@@ -91,6 +94,7 @@ namespace C_TRACK.WebUserControls
public enum selType
{
byUser,
- byTask
+ byTask,
+ byPostMulti
}
}
\ No newline at end of file
diff --git a/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs b/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs
index 8d406f1..e92eb1b 100644
--- a/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs
+++ b/C-TRACK/WebUserControls/mod_taskRec.ascx.designer.cs
@@ -56,5 +56,14 @@ namespace C_TRACK.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsOpr;
+
+ ///
+ /// Controllo odsPostMulti.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsPostMulti;
}
}
diff --git a/C-TRACK/barcode.aspx b/C-TRACK/barcode.aspx
index 651ed67..56dd6a1 100644
--- a/C-TRACK/barcode.aspx
+++ b/C-TRACK/barcode.aspx
@@ -9,8 +9,6 @@
<%@ Register Src="~/WebUserControls/mod_selTask.ascx" TagPrefix="uc1" TagName="mod_selTask" %>
<%@ Register Src="~/WebUserControls/mod_postMulti.ascx" TagPrefix="uc1" TagName="mod_postMulti" %>
-
-
diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs
index 6bbfd96..ec401e8 100644
--- a/C-TRACK/barcode.aspx.cs
+++ b/C-TRACK/barcode.aspx.cs
@@ -72,6 +72,7 @@ namespace C_TRACK
numDD = memLayer.ML.CRI("numDD");
cacheValSec = memLayer.ML.CRI("cacheValSec");
divReload.Visible = devicesAuthProxy.stObj.userHasRight("CT_userStart");
+ setTipoTaskSel();
}
checkRequisiti();
// effettuo load valori...
@@ -86,6 +87,19 @@ namespace C_TRACK
lastUpdDuration = stopwatch.Elapsed;
}
+ private void setTipoTaskSel()
+ {
+ // in base al tipo di postazione รจ per user o per post multi
+ if (mUtils.postIsMulti)
+ {
+ mod_taskRec.tipoSelezione = WebUserControls.selType.byPostMulti;
+ }
+ else
+ {
+ mod_taskRec.tipoSelezione = WebUserControls.selType.byUser;
+ }
+ }
+
private void Mod_selTask_eh_dataSel(object sender, EventArgs e)
{
// selezione commessa --> chiamo metodo caricamento comandi in modulo barcode...