completata gestioen hole protocolli by day

ETS-WS/ETS-WS/WebShipUtils.cs

@@ -31,7 +31,7 @@ namespace ETS_WS
         /// </summary>
         /// <param name="metaDati"></param>
         /// <returns></returns>
-        public string path(docMetaDataSet metaDati)
+        public static string path(docMetaDataSet metaDati)
         {
             string answ = "";
             try
@@ -39,7 +39,7 @@ namespace ETS_WS
                 // calcolo valori data e red
                 string aammgg = metaDati.dataDoc.ToString("yyMMdd");
                 // calcolo
-                answ = string.Format("/{0}/{1}/{2}/{3}/{4}_{5}/", metaDati.commessa, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg, utils.shrinkString(metaDati.oggetto, 200));
+                answ = string.Format("/{0}/{1}/{2}/{3}/{4}_{5}/", utils.cleanPathName(metaDati.commessa), utils.cleanPathName(metaDati.fase), metaDati.InOut, utils.cleanPathName(metaDati.fonte), aammgg, utils.shrinkString(utils.cleanPathName(metaDati.oggetto), 200));
             }
             catch
             { }
@@ -534,16 +534,16 @@ namespace ETS_WS
         public static void dateIsOk(DateTime data)
         {
             bool answ = false;
-            string commessa = string.Format("0000-{1}", data.Year);
-            string fase = "- ALTRE ...";
+            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;
             try
             {
-
-                answ = utils.obj.taDoc.getBySearch(data.Date, data.Date.AddDays(1), commessa, fase, fonte, InOut, oggetto, isRed).Rows.Count > 0;
+                answ = utils.obj.taDoc.getBySearch(data.Date, data.Date.AddDays(1), commessa, fase, fonte, InOut, searchAll, isRed).Rows.Count > 0;
             }
             catch
             { }
@@ -553,11 +553,16 @@ namespace ETS_WS
                 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<string>();
                 WebShipUtils.mng.generaDocDaTemplate(nomeFile, docsData);
             }
         }

ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs

@@ -190,10 +190,24 @@ namespace ETS_WS.WebUserControls
                 answ.fase = utils.cleanPathName(tacFasi.label);
                 answ.fonte = utils.cleanPathName(tacFonti.label);
                 answ.oggetto = utils.cleanPathName(txtOggetto.Text);
-                answ.dataDoc = Convert.ToDateTime(txtDataDoc.Text);
-                answ.dataRic = Convert.ToDateTime(txtDataRic.Text);
+                try
+                {
+                    answ.dataDoc = Convert.ToDateTime(txtDataDoc.Text);
+                }
+                catch
+                {
+                    answ.dataDoc = DateTime.Now;
+                }
+                try
+                {
+                    answ.dataRic = Convert.ToDateTime(txtDataRic.Text);
+                }
+                catch
+                {
+                    answ.dataRic = DateTime.Now;
+                }
                 answ.isRed = chkIsRed.Checked;
-                answ.path = WebShipUtils.mng.path(answ);
+                answ.path = WebShipUtils.path(answ);
                 // calcolo i tags...
                 List<string> tags = new List<string>();
                 foreach (ListItem tag in cblTags.Items)

ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs

@@ -30,7 +30,7 @@ namespace ETS_WS.WebUserControls
         public void updateVisual()
         {
             // sistemo valori...
-            lblFullPath.Text = WebShipUtils.mng.path(WebShipUtils.mng.currMetaData);
+            lblFullPath.Text = WebShipUtils.path(WebShipUtils.mng.currMetaData);
             // verifico attivazione button submin (ovvero ci sono tutti i valori...)
             btnSubmit.Visible = WebShipUtils.mng.metaPresent;
             // mostro gen protocolli SE ho richiesta di generare protocollo