diff --git a/CMS-SC-Data/DtProxy.cs b/CMS-SC-Data/DtProxy.cs index ef07f58..58e6ddf 100644 --- a/CMS-SC-Data/DtProxy.cs +++ b/CMS-SC-Data/DtProxy.cs @@ -109,7 +109,7 @@ namespace CMS_SC_Data /// /// verifica se CI SIA il documento... /// - /// + /// The document path. /// public static bool notNullDocPath(object docPath) { @@ -120,7 +120,7 @@ namespace CMS_SC_Data try { docFilePath = string.Format(memLayer.ML.confReadString("urlSchede"), docPath); - answ = fileMover.obj.fileExist(docFilePath); + answ = fileMover.obj.fileExist(docFilePath.Replace(docPath.ToString(), ""), docPath.ToString()); } catch { } diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index 1ad94e5..c413705 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index eb4f7ba..2d73f0b 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.xml b/CMS-SC-Data/bin/Debug/SteamWare.xml index 75fb3c9..b1b21c5 100644 --- a/CMS-SC-Data/bin/Debug/SteamWare.xml +++ b/CMS-SC-Data/bin/Debug/SteamWare.xml @@ -2427,6 +2427,14 @@ + + + verifica se il file indicato esista in _path + + + + + elimina il file indicato dalla directory di lavoro diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index 1ad94e5..c413705 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS_SC/Collaudi.aspx b/CMS_SC/Collaudi.aspx index ca00f81..2672219 100644 --- a/CMS_SC/Collaudi.aspx +++ b/CMS_SC/Collaudi.aspx @@ -40,12 +40,13 @@
- + +
<%-- diff --git a/CMS_SC/Collaudi.aspx.cs b/CMS_SC/Collaudi.aspx.cs index 0141aa0..77d1e93 100644 --- a/CMS_SC/Collaudi.aspx.cs +++ b/CMS_SC/Collaudi.aspx.cs @@ -42,6 +42,27 @@ namespace CMS_SC mod_collaudi.CodSchedaVers = CodSchedaVers; mod_collaudi.Fase = Fase; mod_collaudi.doUpdate(); + // se ho schema mostro link (eventuale) al doc... + hlDoc.Visible = false; + if (CodSchedaVers != "") + { + string path = ""; + try + { + string CodScheda = CodSchedaVers.Substring(0, CodSchedaVers.LastIndexOf(".")); + path = DtProxy.man.taASC.getByCodScheda(CodScheda)[0].Path; + } + catch + { + path = ""; + } + if (path != "") + { + hlDoc.ToolTip = path; + hlDoc.NavigateUrl = DtProxy.getDocPath(path); + hlDoc.Visible = DtProxy.notNullDocPath(path); + } + } } protected int IdxDossier { diff --git a/CMS_SC/Collaudi.aspx.designer.cs b/CMS_SC/Collaudi.aspx.designer.cs index 796e2a5..f09be9c 100644 --- a/CMS_SC/Collaudi.aspx.designer.cs +++ b/CMS_SC/Collaudi.aspx.designer.cs @@ -75,6 +75,15 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsScheda; + /// + /// hlDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlDoc; + /// /// ddlFase control. /// diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt index b4aeb29..84aca2a 100644 --- a/CMS_SC/ToDo.txt +++ b/CMS_SC/ToDo.txt @@ -1,7 +1,6 @@ TODO's - fare schema funzioni/utenti -- check:non mostra link documento (DEVE mostrarlo ovunque ci sia un riferimento alla SC) - aggiunta SC a dossier: se c'è già deve creare #2, #3, ... - SC in dossier: cancellabile (con btn come aggiungi, x SuperUser) SE non ci sono istanze misurazioni - Misurazioni in collaudi: eliminabile in blocco x intera SC SE NON CI SONO MISURAZIONI diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 1ad94e5..c413705 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 7d75f6c..cd8098d 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 eb4f7ba..2d73f0b 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 75fb3c9..b1b21c5 100644 --- a/CMS_SC/bin/SteamWare.xml +++ b/CMS_SC/bin/SteamWare.xml @@ -2427,6 +2427,14 @@ + + + verifica se il file indicato esista in _path + + + + + elimina il file indicato dalla directory di lavoro