diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index 91f2e93..598cf93 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -70,7 +70,8 @@

-   +  
@@ -92,7 +93,7 @@ <%--
--%> - +
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs index 3347e2c..7b3a52a 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs @@ -74,6 +74,7 @@ namespace ETS_WS.WebUserControls lblFullPath.Text = pathSel.Replace("//", "/").Replace("//", "/").Replace("//", "/"); // verifico attivazione button submin (ovvero ci sono tutti i valori...) btnSubmit.Visible = (tacCommesse.valore != "" && tacFasi.valore != "" && tacFonti.label != "" && txtOggetto.Text != ""); + showProto(); } /// /// fornisce la stringa del path generato dalle selezioni @@ -86,8 +87,25 @@ namespace ETS_WS.WebUserControls string commessa = utils.cleanPathName(tacCommesse.valore); string fase = utils.cleanPathName(tacFasi.valore); string fonte = utils.cleanPathName(tacFonti.label); - string oggetto = utils.cleanPathName(txtOggetto.Text); - return string.Format("/{0}/{1}/{2}/{3}/", commessa, fase, fonte, oggetto); //!!!FARE!!! con nuovo formato file!!!! + DateTime dataDoc = DateTime.Now; + try + { + dataDoc=Convert.ToDateTime(txtDataDoc.Text); + } + catch + { } + string aammgg = dataDoc.ToString("yyMMdd"); + string InOut = rblInOut.SelectedValue; + string comPath = ""; + if (!chkIsRed.Checked) + { + comPath = "comunicazioni"; + } + else + { + comPath = "comunicazioni_red"; + } + return string.Format("/{0}/{1}/{2}/{3}/{4}/{5}/", commessa, comPath, fase, InOut, fonte, aammgg); } } /// @@ -96,6 +114,13 @@ namespace ETS_WS.WebUserControls /// /// protected void rblProto_SelectedIndexChanged(object sender, EventArgs e) + { + showProto(); + } + /// + /// controlla visualizzazione protocollo + /// + private void showProto() { // decido se mostrare il protocollo... bool showProto = false; @@ -105,8 +130,10 @@ namespace ETS_WS.WebUserControls } catch { } +#if false + //clbProto.Visible = showProto; +#endif lblNumProto.Visible = showProto; - //clbProto.Visible = showProto; if (showProto) { saveProto(); @@ -127,8 +154,10 @@ namespace ETS_WS.WebUserControls catch { } lblNumProto.Text = string.Format("{0}-{1}", nrProto, anno); - clbProto.text4copy = lblNumProto.Text; - clbProto.text4btn = "Copia"; +#if false + //clbProto.text4copy = lblNumProto.Text; + //clbProto.text4btn = "Copia"; +#endif } /// /// cambio selezione IN/OUT @@ -137,7 +166,9 @@ namespace ETS_WS.WebUserControls /// protected void rblInOut_SelectedIndexChanged(object sender, EventArgs e) { - // non faccio nulla... + saveMetaData(); + // aggiorno + updateVisual(); } /// /// aggiorna dati e sposta file @@ -214,5 +245,27 @@ namespace ETS_WS.WebUserControls // salvo IN/OUT utils.obj.setSessionVal("metaInOut", rblInOut.SelectedValue); } + /// + /// aggiornamento data doc + /// + /// + /// + protected void txtDataDoc_TextChanged(object sender, EventArgs e) + { + saveMetaData(); + // aggiorno + updateVisual(); + } + /// + /// update x check tipo classificazione "RED" + /// + /// + /// + protected void chkIsRed_CheckedChanged(object sender, EventArgs e) + { + saveMetaData(); + // aggiorno + updateVisual(); + } } } \ 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 0b61819..e57d5a2 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ