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/StatoDossiers.aspx b/CMS_SC/StatoDossiers.aspx
index b349556..cfe9618 100644
--- a/CMS_SC/StatoDossiers.aspx
+++ b/CMS_SC/StatoDossiers.aspx
@@ -1,13 +1,48 @@
<%@ 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_elencoSchedeDossier.ascx" TagPrefix="uc1" TagName="mod_elencoSchedeDossier" %>
+<%@ Register Src="~/WebUserControls/mod_dossier.ascx" TagPrefix="uc1" TagName="mod_dossier" %>
+
+
- Copiare da Elenco schede e mettere...
-
- - filtri ricerca (periodo, aperte, chiuse...)
- - elenco dossiers come Elenco Schede
- - dettaglio x singola scheda dello stato di TUTTE le schede di misura con codice semaforico
-
+
+
+
+
+
<%: traduci("StatoDossiers") %>
+
+
+
+
+
+
+
+
diff --git a/CMS_SC/StatoDossiers.aspx.cs b/CMS_SC/StatoDossiers.aspx.cs
index 8a18602..5c44580 100644
--- a/CMS_SC/StatoDossiers.aspx.cs
+++ b/CMS_SC/StatoDossiers.aspx.cs
@@ -4,14 +4,73 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using CMS_SC_Data;
+using SteamWare;
namespace CMS_SC
{
- public partial class StatoDossiers : System.Web.UI.Page
+ public partial class StatoDossiers : SteamWare.UserPage
{
+ ///
+ /// caricamento pagina
+ ///
+ ///
+ ///
protected void Page_Load(object sender, EventArgs e)
{
+ if (!Page.IsPostBack)
+ {
+ ((Bootstrap)this.Master).showSearch = true;
+ mod_righePag.numRowPag = 20;
+ mod_elencoSchedeDossier.pageSize = mod_righePag.numRowPag;
+ }
+ mod_righePag.eh_newNum += mod_righePag_eh_newNum;
+ mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore;
+ }
+ private void Mod_dossier_eh_valUpdated(object sender, EventArgs e)
+ {
+ mod_elencoDossiers.DataBind();
+ }
+
+ void mod_elencoDossiers_eh_selezioneValore(object sender, EventArgs e)
+ {
+ mod_elencoSchedeDossier.idxDossier = mod_elencoDossiers.idxDossier.ToString();
+ }
+
+ ///
+ /// url base area services
+ ///
+ public string serviceUrl(string method)
+ {
+ return string.Format("/{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method);
+ }
+ ///
+ /// wrapper traduzione
+ ///
+ ///
+ ///
+ public string traduci(string lemma)
+ {
+ return user_std.UtSn.Traduci(lemma);
+ }
+
+ void mod_righePag_eh_newNum(object sender, EventArgs e)
+ {
+ mod_elencoSchedeDossier.pageSize = mod_righePag.numRowPag;
+ }
+
+ ///
+ /// aggiungo scheda selezionata
+ ///
+ ///
+ ///
+ protected void btnInsMisFasi_Click(object sender, EventArgs e)
+ {
+ // inserisco tutte le schede da template x tutte le fasi indicate nella struttura di setup...
+ DtProxy.man.taSCM.insMisFasiMissing(mod_elencoDossiers.idxDossier);
+ mod_elencoDossiers.doUpdate();
+ mod_elencoSchedeDossier.doUpdate();
}
}
}
\ No newline at end of file
diff --git a/CMS_SC/StatoDossiers.aspx.designer.cs b/CMS_SC/StatoDossiers.aspx.designer.cs
index a9bee4b..66822ba 100644
--- a/CMS_SC/StatoDossiers.aspx.designer.cs
+++ b/CMS_SC/StatoDossiers.aspx.designer.cs
@@ -3,15 +3,49 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace CMS_SC
-{
-
-
- public partial class StatoDossiers
- {
+namespace CMS_SC {
+
+
+ public partial class StatoDossiers {
+
+ ///
+ /// mod_elencoDossiers control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::CMS_SC.WebUserControls.mod_elencoDossiers mod_elencoDossiers;
+
+ ///
+ /// divDetail control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
+
+ ///
+ /// mod_elencoSchedeDossier control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::CMS_SC.WebUserControls.mod_elencoSchedeDossier mod_elencoSchedeDossier;
+
+ ///
+ /// mod_righePag control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::mod_righePag mod_righePag;
}
}
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_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx
index dc79110..a0d14eb 100644
--- a/CMS_SC/WebUserControls/mod_testata.ascx
+++ b/CMS_SC/WebUserControls/mod_testata.ascx
@@ -53,6 +53,7 @@
<%: traduci("SchemaCollMacc") %>
<%: traduci("ElencoSchede") %>
+ <%: traduci("StatoDossiers") %>
<%: traduci("Collaudi") %>
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 955a80b..1be0e05 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 fde0af0..279dd3e 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/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index 6d446ab..300143f 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/CMS_SC/sql/ManualUpdate_2.0_2.1.sql b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql
index af92181..d6bfea4 100644
--- a/CMS_SC/sql/ManualUpdate_2.0_2.1.sql
+++ b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql
@@ -28,6 +28,7 @@ FROM Misure
-- update vocabolario
exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente'
+exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers'
-- modifiche DB
@@ -35,4 +36,6 @@ exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente'
--update calcolo ordinamento
-- permessi & funzioni
--- StatoDossiers StatoDossiers 2 4 StatoDossiers StatoDossiersIcon
+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')