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/Web.config b/ETS-WS/ETS-WS/Web.config index f44b06d..766ff9c 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -29,13 +29,16 @@ - - + + + + + diff --git a/ETS-WS/ETS-WS/WebShipUtils.cs b/ETS-WS/ETS-WS/WebShipUtils.cs index f4fb573..65ab71d 100644 --- a/ETS-WS/ETS-WS/WebShipUtils.cs +++ b/ETS-WS/ETS-WS/WebShipUtils.cs @@ -382,6 +382,10 @@ namespace ETS_WS DirectoryInfo dir = new DirectoryInfo(destFolder); FileInfo file = dir.GetFiles("*.eml", SearchOption.TopDirectoryOnly).OrderByDescending(m => m.CreationTimeUtc).First(); + // hack: inserisco il campo "non inviato" nel file di testo della email... "X-Unsent: 1" + StreamWriter sw = file.AppendText(); + sw.Write("X-Unsent: 1"); + sw.Flush(); return file.Name; } /// @@ -463,6 +467,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 +625,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 +637,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 1afde50..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,61 +76,81 @@ - + - + - + - - - - - -
- - - -
+ - + - - + -
- - +
+
+ +
+ + +
+
+ +
+ + +
- + + - + - - +
+ + +
- +
- + - + + - + + + + + + + + + @@ -137,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 2d31586..58a5aa1 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -169,7 +169,7 @@ namespace ETS_WS.WebUserControls int lastChar = Convert.ToInt32(_lastChar); if (answ.Length > maxChar) { - answ = answ.Substring(0, maxChar) + "[...]" + answ.Substring(answ.Length - lastChar); + answ = answ.Substring(0, maxChar - lastChar) + "..." + answ.Substring(answ.Length - lastChar); } return answ; } @@ -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/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs index 6bacd96..1658112 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs @@ -34,7 +34,19 @@ namespace ETS_WS.WebUserControls // verifico attivazione button submin (ovvero ci sono tutti i valori...) btnSubmit.Visible = WebShipUtils.mng.metaPresent; // mostro gen protocolli SE ho richiesta di generare protocollo - pnlGenDocs.Visible = (WebShipUtils.mng.metaPresent && WebShipUtils.mng.currMetaData.reqProto); + if (WebShipUtils.mng.metaPresent && WebShipUtils.mng.currMetaData.reqProto) + { + pnlGenDocs.Visible = true; + // controllo.... mostro TUTTE le opzioni SOLO se è protocollo e se è OUT... altrimenti "solo protocollo"... + bool showAllBtn = (WebShipUtils.mng.currMetaData.InOut.ToUpper() == "OUT"); + btnGenLettera.Visible = showAllBtn; + btnGenFax.Visible = showAllBtn; + btnGenMail.Visible = showAllBtn; + } + else + { + pnlGenDocs.Visible = false; + } } /// /// richiesta update diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index d0e2110..cec417e 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 cc01614..542dadc 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 057306c..0296ac1 100644 --- a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css @@ -173,12 +173,24 @@ .menuNav { background-color: #B5C7DE; + /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); + background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ color: #284E98; font-size: 1.2em; } .menuNavSel { background-color: #507CD1; + /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); + background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ } .menuItem { @@ -474,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/bin/css/ETS.css b/ETS-WS/ETS-WS/bin/css/ETS.css index 6828ef7..c2d10ec 100644 --- a/ETS-WS/ETS-WS/bin/css/ETS.css +++ b/ETS-WS/ETS-WS/bin/css/ETS.css @@ -29,6 +29,12 @@ .secColA-1 { background-color: #0A64A4; + background-image: -webkit-gradient(linear,left top,left bottom,from( #0A64A4 ),to( #4481DF )); + background-image: -webkit-linear-gradient( #0A64A4,#4481DF ); + background-image: -moz-linear-gradient( #0A64A4,#4481DF ); + background-image: -ms-linear-gradient( #0A64A4,#4481DF ); + background-image: -o-linear-gradient( #0A64A4,#4481DF ); + background-image: linear-gradient( #0A64A4,#4481DF ); } .secColA-2 { @@ -40,11 +46,23 @@ } .secColA-4 { - background-color: #3E94D1; + /*background-color: #3E94D1;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #4683ff ),to( #2461BF )); + background-image: -webkit-linear-gradient( #4683ff,#2461BF ); + background-image: -moz-linear-gradient( #4683ff,#2461BF ); + background-image: -ms-linear-gradient( #4683ff,#2461BF ); + background-image: -o-linear-gradient( #4683ff,#2461BF ); + background-image: linear-gradient( #4683ff,#2461BF ); } .secColA-5 { - background-color: #B8E1FD; + /*background-color: #B8E1FD;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #2461BF )); + background-image: -webkit-linear-gradient( #B8E1FD,#2461BF ); + background-image: -moz-linear-gradient( #B8E1FD,#2461BF ); + background-image: -ms-linear-gradient( #B8E1FD,#2461BF ); + background-image: -o-linear-gradient( #B8E1FD,#2461BF ); + background-image: linear-gradient( #B8E1FD,#2461BF ); } .secColB-1 { @@ -86,10 +104,26 @@ { background-color: #FFCEBC; } - +.lightBlue +{ + border: 1px solid #CDCDCD; + background-image: -webkit-gradient(linear,left top,left bottom,from( #ddf ),to( #e1f1ff )); + background-image: -webkit-linear-gradient( #ddf,#e1f1ff ); + background-image: -moz-linear-gradient( #ddf,#e1f1ff ); + background-image: -ms-linear-gradient( #ddf,#e1f1ff ); + background-image: -o-linear-gradient( #ddf,#e1f1ff ); + background-image: linear-gradient( #ddf,#e1f1ff ); +} .lightGray { - background-color: #EDEDED; + /*background-color: #EDEDED;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #fff ),to( #f1f1f1 )); + background-image: -webkit-linear-gradient( #fff,#f1f1f1 ); + background-image: -moz-linear-gradient( #fff,#f1f1f1 ); + background-image: -ms-linear-gradient( #fff,#f1f1f1 ); + background-image: -o-linear-gradient( #fff,#f1f1f1 ); + background-image: linear-gradient( #fff,#f1f1f1 ); + border: 1px solid #CDCDCD; } /* FINE Schema colori */ diff --git a/ETS-WS/ETS-WS/css/BuildBlocks.css b/ETS-WS/ETS-WS/css/BuildBlocks.css index 057306c..0296ac1 100644 --- a/ETS-WS/ETS-WS/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/css/BuildBlocks.css @@ -173,12 +173,24 @@ .menuNav { background-color: #B5C7DE; + /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); + background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); + background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ color: #284E98; font-size: 1.2em; } .menuNavSel { background-color: #507CD1; + /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); + background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); + background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ } .menuItem { @@ -474,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/ETS.css b/ETS-WS/ETS-WS/css/ETS.css index 6828ef7..c2d10ec 100644 --- a/ETS-WS/ETS-WS/css/ETS.css +++ b/ETS-WS/ETS-WS/css/ETS.css @@ -29,6 +29,12 @@ .secColA-1 { background-color: #0A64A4; + background-image: -webkit-gradient(linear,left top,left bottom,from( #0A64A4 ),to( #4481DF )); + background-image: -webkit-linear-gradient( #0A64A4,#4481DF ); + background-image: -moz-linear-gradient( #0A64A4,#4481DF ); + background-image: -ms-linear-gradient( #0A64A4,#4481DF ); + background-image: -o-linear-gradient( #0A64A4,#4481DF ); + background-image: linear-gradient( #0A64A4,#4481DF ); } .secColA-2 { @@ -40,11 +46,23 @@ } .secColA-4 { - background-color: #3E94D1; + /*background-color: #3E94D1;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #4683ff ),to( #2461BF )); + background-image: -webkit-linear-gradient( #4683ff,#2461BF ); + background-image: -moz-linear-gradient( #4683ff,#2461BF ); + background-image: -ms-linear-gradient( #4683ff,#2461BF ); + background-image: -o-linear-gradient( #4683ff,#2461BF ); + background-image: linear-gradient( #4683ff,#2461BF ); } .secColA-5 { - background-color: #B8E1FD; + /*background-color: #B8E1FD;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #2461BF )); + background-image: -webkit-linear-gradient( #B8E1FD,#2461BF ); + background-image: -moz-linear-gradient( #B8E1FD,#2461BF ); + background-image: -ms-linear-gradient( #B8E1FD,#2461BF ); + background-image: -o-linear-gradient( #B8E1FD,#2461BF ); + background-image: linear-gradient( #B8E1FD,#2461BF ); } .secColB-1 { @@ -86,10 +104,26 @@ { background-color: #FFCEBC; } - +.lightBlue +{ + border: 1px solid #CDCDCD; + background-image: -webkit-gradient(linear,left top,left bottom,from( #ddf ),to( #e1f1ff )); + background-image: -webkit-linear-gradient( #ddf,#e1f1ff ); + background-image: -moz-linear-gradient( #ddf,#e1f1ff ); + background-image: -ms-linear-gradient( #ddf,#e1f1ff ); + background-image: -o-linear-gradient( #ddf,#e1f1ff ); + background-image: linear-gradient( #ddf,#e1f1ff ); +} .lightGray { - background-color: #EDEDED; + /*background-color: #EDEDED;*/ + background-image: -webkit-gradient(linear,left top,left bottom,from( #fff ),to( #f1f1f1 )); + background-image: -webkit-linear-gradient( #fff,#f1f1f1 ); + background-image: -moz-linear-gradient( #fff,#f1f1f1 ); + background-image: -ms-linear-gradient( #fff,#f1f1f1 ); + background-image: -o-linear-gradient( #fff,#f1f1f1 ); + background-image: linear-gradient( #fff,#f1f1f1 ); + border: 1px solid #CDCDCD; } /* FINE Schema colori */ 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-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml index 65cacf9..cc6b488 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index 0b00e25..aa62a5d 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -29,13 +29,16 @@ - - + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index 661f847..9990514 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -29,13 +29,16 @@ - - + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index 2218279..87bf1ce 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt index 937edd7..30dea30 100644 --- a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt +++ b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt @@ -34,3 +34,39 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\AjaxMin.dll C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\DocumentFormat.OpenXml.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\NLog.config +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\css\BuildBlocks.css +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\css\ExtraComp.css +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\css\ETS.css +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\css\MasterPage.css +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\css\Style.css +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ETS-WS.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ETS-WS.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\AjaxControlToolkit.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\AjaxMin.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\DocumentFormat.OpenXml.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ETS_Data.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\HtmlAgilityPack.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\NLog.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\SanitizerProviders.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ETS_Data.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\NLog.xml +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ar\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\cs\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\de\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\es\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\fr\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\he\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\hi\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\it\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ja\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ko\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\nl\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\pt\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\ru\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\tr-TR\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\zh-CHS\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\zh-CHT\AjaxControlToolkit.resources.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.csprojResolveAssemblyReference.cache +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.pdb diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index 5be273a..fb6f6c2 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index d0e2110..cec417e 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 22ecb9d..6c6c9f6 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -29,13 +29,16 @@ - - + + + + + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index 0b00e25..aa62a5d 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -29,13 +29,16 @@ - - + + + + + diff --git a/ETS_Data/DS_WebScip.Designer.cs b/ETS_Data/DS_WebScip.Designer.cs index f29b1c6..80824e5 100644 --- a/ETS_Data/DS_WebScip.Designer.cs +++ b/ETS_Data/DS_WebScip.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18033 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1508,9 +1508,9 @@ namespace ETS_Data { this.columnRiferimenti.MaxLength = 100; this.columnAttivita.MaxLength = 100; this.columnAutore.MaxLength = 50; - this.columnSA.MaxLength = 2; + this.columnSA.MaxLength = 4; this.columnRedattore.MaxLength = 50; - this.columnSR.MaxLength = 2; + this.columnSR.MaxLength = 4; this.columnAnnotazioni.MaxLength = 1073741823; this.columnLegUtente.MaxLength = 25; this.columnNoteSystemManager.MaxLength = 1073741823; @@ -10493,21 +10493,12 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, allChangedRows.AddRange(updatedRows); } } - if ((this._tmpFileUtTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._tbMetaDataSetTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._tmpFileUtTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } - if ((this._anagFasiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._anagFasiTableAdapter.Update(updatedRows)); + result = (result + this._tbMetaDataSetTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -10520,12 +10511,21 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, allChangedRows.AddRange(updatedRows); } } - if ((this._tbMetaDataSetTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._anagFasiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._tbMetaDataSetTableAdapter.Update(updatedRows)); + result = (result + this._anagFasiTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._tmpFileUtTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._tmpFileUtTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -10555,19 +10555,11 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, allAddedRows.AddRange(addedRows); } } - if ((this._tmpFileUtTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._tbMetaDataSetTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._tmpFileUtTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } - if ((this._anagFasiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._anagFasiTableAdapter.Update(addedRows)); + result = (result + this._tbMetaDataSetTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -10579,11 +10571,19 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, allAddedRows.AddRange(addedRows); } } - if ((this._tbMetaDataSetTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._anagFasiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._tbMetaDataSetTableAdapter.Update(addedRows)); + result = (result + this._anagFasiTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._tmpFileUtTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._tmpFileUtTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -10597,19 +10597,11 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(DS_WebScip dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._tbMetaDataSetTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._tmpFileUtTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._tbMetaDataSetTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._tags2DocTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Tags2Doc.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._tags2DocTableAdapter.Update(deletedRows)); + result = (result + this._tmpFileUtTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -10621,11 +10613,19 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, allChangedRows.AddRange(deletedRows); } } - if ((this._tmpFileUtTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.tmpFileUt.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._tags2DocTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Tags2Doc.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._tmpFileUtTableAdapter.Update(deletedRows)); + result = (result + this._tags2DocTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } + if ((this._tbMetaDataSetTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.tbMetaDataSet.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._tbMetaDataSetTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } diff --git a/ETS_Data/DS_WebScip.xsd b/ETS_Data/DS_WebScip.xsd index 13baee2..104406b 100644 --- a/ETS_Data/DS_WebScip.xsd +++ b/ETS_Data/DS_WebScip.xsd @@ -921,7 +921,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -993,7 +993,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1103,7 +1103,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1117,7 +1117,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1161,7 +1161,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1189,7 +1189,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1203,7 +1203,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1211,7 +1211,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1284,7 +1284,7 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - + @@ -1328,8 +1328,8 @@ SELECT userId, setName, Commessa, Fase, Fonte, Oggetto, DataRic, DataDoc, path, - - + + \ No newline at end of file diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index e112447..e0d1441 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -107,6 +107,8 @@ + + Designer diff --git a/ETS_Data/SQL/ETS_WS/ETS_WS_00120.sql b/ETS_Data/SQL/ETS_WS/ETS_WS_00120.sql new file mode 100644 index 0000000..2d8e6f1 --- /dev/null +++ b/ETS_Data/SQL/ETS_WS/ETS_WS_00120.sql @@ -0,0 +1,277 @@ +set ANSI_NULLS on; +go + +/*************************************** +* FUNCTION f_siglaUtente +* +* calcola la sigla utente dalla vista sulla tab utenti +* +* Steamware, S.E.L. +* mod: 2013.02.20 +* +****************************************/ +create FUNCTION f_siglaUtente(@utente NVARCHAR(MAX)) +RETURNS NVARCHAR(4) AS +BEGIN + + ---------------------------------------- + -- dichiaro le componenti del nome + ---------------------------------------- + DECLARE @answ NVARCHAR(4) + + SELECT @answ = ISNULL(sigla,'-') FROM v_selUtenti WHERE ( Cognome + ' ' + Nome = @utente ) OR ( Nome + ' ' + Cognome = @utente ) + -- se fosse nullo provo a prendere le iniziali.. + IF(ISNULL(@answ,'-') = '-') + BEGIN + DECLARE @indice INT + SELECT @indice = CHARINDEX(' ', @utente) + SET @answ = LEFT(@utente,1)+SUBSTRING(@utente,@indice+1,1) + END + + RETURN UPPER(ISNULL(@answ,'-')) +END +go + + +set xact_abort on; +go + +begin transaction; +go + +alter table tbDocumenti alter column + SA nvarchar(4); +go + +alter table tbDocumenti alter column + SR nvarchar(4); +go + +alter table tbDocumenti add + constraint DF_tbDocumenti_Autore default ('-') for Autore, + constraint DF_tbDocumenti_SA default ('-') for SA, + constraint DF_tbDocumenti_Redattore default ('-') for Redattore, + constraint DF_tbDocumenti_SR default ('-') for SR; +go + +set ANSI_NULLS on; +go + +/************************************* +* STORED PROCEDURE stp_tbDocs_insert +* +* crea un nuovo doc con i valori minimi x inserimento +* +* mod : 2012.10.04 +* aut : S.E. Locatelli +**************************************/ +alter PROCEDURE stp_tbDocs_insert +( + @nome NVARCHAR(250), + @fullPath NVARCHAR(500), + @userId NVARCHAR(50), + @isProtocollo BIT, --significa va calcolato NrProtocollo, Numero, Anno (corrente) + @DataRic DATETIME, + @DataDoc DATETIME, + @NumeroCommessa NVARCHAR(4), + @AnnoCommessa NVARCHAR(4), + @Fase NVARCHAR(250), + @Fonte NVARCHAR(100), + @Oggetto NVARCHAR(250), + @InOut NVARCHAR(3), + @Autore NVARCHAR(50), + @Redattore NVARCHAR(50), + @isRed BIT, + @newIdxFile INT OUTPUT +) +AS + + +BEGIN tran + + -- dichiarazioni + DECLARE @Anno INT + DECLARE @Numero INT + DECLARE @NrProtocollo INT + DECLARE @SA NVARCHAR(4) + DECLARE @SR NVARCHAR(4) + --DECLARE @fullName NVARCHAR(250) + + -- calcolo valori base + SET @Anno = YEAR(GETDATE()) + SET @Numero = ( SELECT CASE WHEN @isProtocollo=1 THEN dbo.f_nextNumeroByAnno(@Anno) ELSE 0 END ) + SET @NrProtocollo = ( SELECT CASE WHEN @isProtocollo=1 THEN dbo.f_nextNrProtocollo() ELSE 0 END ) + + -- calcolo sigla autore e redattore... + SELECT @SR = dbo.f_siglaUtente(@Redattore) + SELECT @SA = dbo.f_siglaUtente(@Autore) + + + -- vero insert + INSERT INTO tbDocumenti(NomeFile,fullPath,userId,isRed,NrProtocollo,Numero,Anno,DataRic,DataDoc,NumeroCommessa,AnnoCommessa,Fase,Fonte,Oggetto,InOut,Autore,Redattore,SA,SR) + VALUES (@nome,@fullPath,@userId,@isRed,@NrProtocollo,@Numero,@Anno,@DataRic,@DataDoc,@NumeroCommessa ,@AnnoCommessa,@Fase,@Fonte,@Oggetto,@InOut,@Autore,@Redattore,@SA,@SR) + + SELECT @newIdxFile = SCOPE_IDENTITY() + +COMMIT tran + +RETURN @newIdxFile +go + +commit; +go + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +create VIEW v_selUtenti +AS +SELECT UtenteAD, Cognome, Nome, email, sigla, attivo +FROM ETS_Anagrafica.dbo.Utenti +go + +exec sp_addextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00] +Begin DesignProperties = + Begin PaneConfigurations = + Begin PaneConfiguration = 0 + NumPanes = 4 + Configuration = "(H (1[40] 4[20] 2[20] 3) )" + End + Begin PaneConfiguration = 1 + NumPanes = 3 + Configuration = "(H (1 [50] 4 [25] 3))" + End + Begin PaneConfiguration = 2 + NumPanes = 3 + Configuration = "(H (1 [50] 2 [25] 3))" + End + Begin PaneConfiguration = 3 + NumPanes = 3 + Configuration = "(H (4 [30] 2 [40] 3))" + End + Begin PaneConfiguration = 4 + NumPanes = 2 + Configuration = "(H (1 [56] 3))" + End + Begin PaneConfiguration = 5 + NumPanes = 2 + Configuration = "(H (2 [66] 3))" + End + Begin PaneConfiguration = 6 + NumPanes = 2 + Configuration = "(H (4 [50] 3))" + End + Begin PaneConfiguration = 7 + NumPanes = 1 + Configuration = "(V (3))" + End + Begin PaneConfiguration = 8 + NumPanes = 3 + Configuration = "(H (1[56] 4[18] 2) )" + End + Begin PaneConfiguration = 9 + NumPanes = 2 + Configuration = "(H (1 [75] 4))" + End + Begin PaneConfiguration = 10 + NumPanes = 2 + Configuration = "(H (1[66] 2) )" + End + Begin PaneConfiguration = 11 + NumPanes = 2 + Configuration = "(H (4 [60] 2))" + End + Begin PaneConfiguration = 12 + NumPanes = 1 + Configuration = "(H (1) )" + End + Begin PaneConfiguration = 13 + NumPanes = 1 + Configuration = "(V (4))" + End + Begin PaneConfiguration = 14 + NumPanes = 1 + Configuration = "(V (2))" + End + ActivePaneConfig = 0 + End + Begin DiagramPane = + Begin Origin = + Top = 0 + Left = 0 + End + Begin Tables = + Begin Table = "Utenti (ETS_Anagrafica.dbo)" + Begin Extent = + Top = 6 + Left = 38 + Bottom = 291 + Right = 208 + End + DisplayFlags = 280 + TopColumn = 0 + End + End + End + Begin SQLPane = + End + Begin DataPane = + Begin ParameterDefaults = "" + End + Begin ColumnWidths = 9 + Width = 284 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + Width = 1500 + End + End + Begin CriteriaPane = + Begin ColumnWidths = 11 + Column = 1440 + Alias = 900 + Table = 1170 + Output = 720 + Append = 1400 + NewValue = 1170 + SortType = 1350 + SortOrder = 1410 + GroupBy = 1350 + Filter = 1350 + Or = 1350 + Or = 1350 + Or = 1350 + End + End +End +', 'SCHEMA', 'dbo', 'VIEW', 'v_selUtenti'; +go + +exec sp_addextendedproperty 'MS_DiagramPaneCount', 1, 'SCHEMA', 'dbo', 'VIEW', 'v_selUtenti'; +go + +commit; +go + + + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(120, GETDATE()) +GO +SELECT TOP 10 * FROM LogUpdateDb ORDER BY Versione DESC +GO diff --git a/ETS_Data/SQL/ETS_WS/ETS_WS_00121.sql b/ETS_Data/SQL/ETS_WS/ETS_WS_00121.sql new file mode 100644 index 0000000..8e62a39 --- /dev/null +++ b/ETS_Data/SQL/ETS_WS/ETS_WS_00121.sql @@ -0,0 +1,33 @@ +-- update dove manca redattore +UPDATE tbDocumenti +SET Redattore = '-', SR='-' +WHERE ISNULL(LTRIM(RTRIM(Redattore)),'') = '' +GO + +-- idem x autore +UPDATE tbDocumenti +SET Autore = '-', SA='-' +WHERE ISNULL(LTRIM(RTRIM(Autore)),'') = '' +GO + +UPDATE tbDocumenti +SET SR=dbo.f_siglaUtente(Redattore) +WHERE ISNULL(LTRIM(RTRIM(SR)),'') = '' +GO +UPDATE tbDocumenti +SET SA=dbo.f_siglaUtente(Autore) +WHERE ISNULL(LTRIM(RTRIM(SA)),'') = '' +GO + +-- fix upper! +UPDATE tbDocumenti +SET SR = UPPER(SR),SA=UPPER(SA) +GO + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(121, GETDATE()) +GO +SELECT TOP 10 * FROM LogUpdateDb ORDER BY Versione DESC +GO diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index cc01614..542dadc 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index d3640ae..d413c76 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll 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 diff --git a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index 7ad5f55..46cf0d8 100644 Binary files a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt index 5f99dbc..7bc592d 100644 --- a/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt @@ -8,3 +8,13 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.dll C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\DocumentFormat.OpenXml.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.csprojResolveAssemblyReference.cache +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\NLog.config +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.dll.config +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\DocumentFormat.OpenXml.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\NLog.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\NLog.xml +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.pdb diff --git a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache index d072c87..07bd3e1 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index cc01614..542dadc 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll index c1a967b..b2325d8 100644 Binary files a/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll differ diff --git a/ETS_Data/utils.cs b/ETS_Data/utils.cs index fc8e647..aa587c5 100644 --- a/ETS_Data/utils.cs +++ b/ETS_Data/utils.cs @@ -257,7 +257,7 @@ namespace ETS_Data } #endregion - + #region area Session ///