diff --git a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx b/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx
deleted file mode 100644
index 457ea5c..0000000
Binary files a/ETS-WS/ETS-WS/DocTemplates/ETS-Proto.docx and /dev/null differ
diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj
index b316953..3a26cbe 100644
--- a/ETS-WS/ETS-WS/ETS-WS.csproj
+++ b/ETS-WS/ETS-WS/ETS-WS.csproj
@@ -206,6 +206,9 @@
+
+
+
@@ -712,7 +715,7 @@
False
True
- 61133
+ 52344
/
diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs
index f4fb573..ed6920d 100644
--- a/ETS-WS/ETS-WS/WebShipUtils.cs
+++ b/ETS-WS/ETS-WS/WebShipUtils.cs
@@ -463,6 +463,45 @@ namespace ETS_WS
}
}
///
+ /// elimina il file archiviato e resetta metadati a empty
+ ///
+ ///
+ public void deleteRecordAndFile(int idxFile)
+ {
+ string nomeFile = "ETS-Proto.docx";
+ lg.Info("Eliminato file {0} per svuotamento record", idxFile);
+ // effettuo operazioni sostituzione file!
+ docMetaDataSet docData = WebShipUtils.mng.docMetaFromIdxFile(idxFile);
+ docMetaDataSet docDataEmpty = emptyDocData(DateTime.Now);
+ string numComm = "";
+ string annoComm = "";
+ // ricavo num ed anno commessa...
+ try
+ {
+ numComm = docDataEmpty.commessa.Substring(0, docDataEmpty.commessa.IndexOf("-"));
+ annoComm = docDataEmpty.commessa.Substring(docDataEmpty.commessa.IndexOf("-") + 1);
+ }
+ catch
+ { }
+ string path = docData.path;
+ if (path != "")
+ {
+ // calcolo path
+ path = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docData.path);
+ // elimino file vecchio
+ fileMover.obj.eliminaFile(path, WebShipUtils.nomeFileFullFromIdxFile(idxFile));
+ // aggiorno su DB
+ utils.obj.taDoc.updateQuery(idxFile, utils.obj.currUserAD, docDataEmpty.dataRic, docDataEmpty.dataDoc, numComm, annoComm, docDataEmpty.fase, docDataEmpty.fonte, docDataEmpty.oggetto, docDataEmpty.InOut, docDataEmpty.isRed);
+ utils.obj.taDoc.updateFile(idxFile, utils.obj.currUserAD, nomeFile, path);
+ lg.Info("Aggiornato in db nome file {0} per sostituzione causa svuotamento", nomeFile);
+ // ricalcolo nome file
+ string newFileName = WebShipUtils.nomeFileFullFromIdxFile(idxFile);
+ // sposto file
+ fileMover.obj.muoviFile("~/DocTemplates/", path, nomeFile, newFileName, true);
+ lg.Info("Spostato file {0} per sostituzione causa svuotamento", nomeFile);
+ }
+ }
+ ///
/// salva su db il tempalte dei metadati correnti
///
/// user id (AD) univoco
@@ -582,16 +621,11 @@ namespace ETS_WS
public static void dateIsOk(DateTime data)
{
bool answ = false;
- string commessa = string.Format("0000-{0}", data.Year);
- string fase = "ALTRE";
- string fonte = "ETS Engineering & Technical Services S.p.A.";
- string InOut = "Out";
- string oggetto = "n.d.";
string searchAll = "*";
- bool isRed = true;
+ docMetaDataSet docsData = emptyDocData(data);
try
{
- answ = utils.obj.taDoc.getBySearch(data.Date, data.Date.AddDays(1), commessa, fase, fonte, InOut, searchAll, isRed).Rows.Count > 0;
+ answ = utils.obj.taDoc.getBySearch(data.Date, data.Date.AddDays(1), docsData.commessa, docsData.fase, docsData.fonte, docsData.InOut, searchAll, docsData.isRed).Rows.Count > 0;
}
catch
{ }
@@ -599,22 +633,30 @@ namespace ETS_WS
if (!answ)
{
string nomeFile = "ETS-Proto.docx";
- docMetaDataSet docsData = new docMetaDataSet();
- docsData.commessa = commessa;
- docsData.dataDoc = data;
- docsData.dataRic = data;
- docsData.fase = fase;
- docsData.fonte = fonte;
- docsData.InOut = InOut;
- docsData.oggetto = oggetto;
- docsData.isRed = isRed;
- docsData.path = path(docsData);
- docsData.reqProto = true;
- docsData.tags = new List();
WebShipUtils.mng.generaDocDaTemplate(nomeFile, docsData);
}
}
-
+ ///
+ /// restituisce un set di dati "empty" utile x reset
+ ///
+ ///
+ ///
+ public static docMetaDataSet emptyDocData(DateTime data)
+ {
+ docMetaDataSet docsData = new docMetaDataSet();
+ docsData.commessa = string.Format("0000-{0}", data.Year);
+ docsData.dataDoc = data;
+ docsData.dataRic = data;
+ docsData.fase = "ALTRE";
+ docsData.fonte = "ETS Engineering & Technical Services S.p.A.";
+ docsData.InOut = "Out";
+ docsData.oggetto = "n.d.";
+ docsData.isRed = true;
+ docsData.path = path(docsData);
+ docsData.reqProto = true;
+ docsData.tags = new List();
+ return docsData;
+ }
///
/// genera un doc da template, tramite
/// - salvataggio
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
index ba8fa64..ff7e705 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
@@ -15,18 +15,22 @@
-
+
-
+
@@ -35,17 +39,30 @@
-
+
-
-
+
+
+
+
+
+
+
+
-
+
@@ -59,18 +76,21 @@
-
+
-
+
-
+
@@ -78,44 +98,56 @@
-
+
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -142,7 +174,9 @@
-
+
<%--EnableCaching="true" CacheDuration="5" SortParameterName="SortExpression" --%>
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
index 82e29aa..58a5aa1 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
@@ -368,5 +368,29 @@ namespace ETS_WS.WebUserControls
{
return string.Format("{0}-{1}", numero, anno);
}
+ ///
+ /// "svuota la riga" resettando metadati ed eliminando file...
+ ///
+ ///
+ ///
+ protected void imgSvuota_Click(object sender, EventArgs e)
+ {
+ // salvo
+ ImageButton lbtn = (ImageButton)sender;
+ int idxFile = 0;
+ try
+ {
+ idxFile = Convert.ToInt32(lbtn.CommandArgument);
+ }
+ catch
+ { }
+ // svuoto metadati ed elimino file...
+ WebShipUtils.mng.deleteRecordAndFile(idxFile);
+ // chiudo edit...
+ pnlRTUpdate.CssClass = "";
+ showHideEditRecord(false);
+ grView.EditIndex = -1;
+ grView.DataBind();
+ }
}
}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index f2a2aa4..21c72a4 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ
diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll
index d413c76..176a4d7 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ
diff --git a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css
index c583f7c..0296ac1 100644
--- a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css
+++ b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css
@@ -486,4 +486,9 @@
vertical-align: top;
background-color: #EFF3FB;
}
-/* end gridview */
\ No newline at end of file
+/* end gridview */
+
+.valignMiddle
+{
+ vertical-align: middle;
+}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/css/BuildBlocks.css b/ETS-WS/ETS-WS/css/BuildBlocks.css
index c583f7c..0296ac1 100644
--- a/ETS-WS/ETS-WS/css/BuildBlocks.css
+++ b/ETS-WS/ETS-WS/css/BuildBlocks.css
@@ -486,4 +486,9 @@
vertical-align: top;
background-color: #EFF3FB;
}
-/* end gridview */
\ No newline at end of file
+/* end gridview */
+
+.valignMiddle
+{
+ vertical-align: middle;
+}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/images/reset_l.png b/ETS-WS/ETS-WS/images/reset_l.png
new file mode 100644
index 0000000..5080d0e
Binary files /dev/null and b/ETS-WS/ETS-WS/images/reset_l.png differ
diff --git a/ETS-WS/ETS-WS/images/reset_m.png b/ETS-WS/ETS-WS/images/reset_m.png
new file mode 100644
index 0000000..38bb197
Binary files /dev/null and b/ETS-WS/ETS-WS/images/reset_m.png differ
diff --git a/ETS-WS/ETS-WS/images/reset_s.png b/ETS-WS/ETS-WS/images/reset_s.png
new file mode 100644
index 0000000..57bafcf
Binary files /dev/null and b/ETS-WS/ETS-WS/images/reset_s.png differ
diff --git a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7ffcb0d..fdedbc5 100644
Binary files a/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
index 7d3ba11..c1126b5 100644
--- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
+++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt
@@ -8,3 +8,13 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ET
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\DocumentFormat.OpenXml.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.config
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\ETS_Data.dll.config
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\ETS_Data.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\ETS_Data.pdb
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\DocumentFormat.OpenXml.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.dll
+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.csprojResolveAssemblyReference.cache
+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
diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll
index 26e3a58..176a4d7 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_WebScip.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll
index ea75240..8c16b5f 100644
Binary files a/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll differ