diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 1d771d4..ad4f95b 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide b/.vs/MedAP/v15/Server/sqlite3/storage.ide index c229c4d..dc39919 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide and b/.vs/MedAP/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal index 995c1d5..04770fb 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal and b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal differ diff --git a/MedAP/DocArchive.aspx b/MedAP/DocArchive.aspx index adc4435..a0d6783 100644 --- a/MedAP/DocArchive.aspx +++ b/MedAP/DocArchive.aspx @@ -17,15 +17,14 @@ ANAGRAFICA
-
-
+
- TEMPLATE + TEMPLATE FATTURE
@@ -33,19 +32,14 @@ -
-

RIGHE OPZIONI (1+)

- - - -
-
-
-
- -
-
- +
+
+
+ +
+
+ +
@@ -53,6 +47,31 @@
+
+
+ TEMPLATE VOCI +
+
+
+

RIGHE OPZIONI (1+)

+ + + + +
+ +
+ + + + + + +
+
+ +
diff --git a/MedAP/DocArchive.aspx.cs b/MedAP/DocArchive.aspx.cs index 4ade48b..b3ca984 100644 --- a/MedAP/DocArchive.aspx.cs +++ b/MedAP/DocArchive.aspx.cs @@ -36,19 +36,20 @@ namespace MedAP case ucEvType.New: break; case ucEvType.Reset: - divTemplate.Visible = false; + divDocTpl.Visible = false; mod_DocsArchive.idxCli = 0; - mod_DocsArchive.doUpdate(); + mod_DocsArchive.resetSelezione(); break; case ucEvType.ReqUpdateParent: break; case ucEvType.Selected: - divTemplate.Visible = true; + divDocTpl.Visible = true; mod_DocsArchive.searchVal = mod_searchParam.searchVal; mod_DocsArchive.tipoDoc = mod_searchParam.tipoDoc; mod_DocsArchive.idxCli = mod_ElencoClienti.idxCliSel; mod_DocsArchive.aperta = mod_searchParam.aperta; - mod_DocsArchive.doUpdate(); + mod_DocsArchive.resetSelezione(); + //mod_DocsArchive.doUpdate(); mod_DocsDetail.idxDoc = 0; divDetail.Visible = false; break; @@ -143,9 +144,8 @@ namespace MedAP break; case ucEvType.Reset: mod_DocsDetail.idxDoc = 0; + divRowTpl.Visible = false; divDetail.Visible = false; - //divElenco.Attributes.Remove("class"); - //divElenco.Attributes.Add("class", "col-md-12"); break; case ucEvType.ReqUpdateParent: mod_searchParam.searchVal = mod_DocsArchive.searchVal; @@ -154,9 +154,8 @@ namespace MedAP break; case ucEvType.Selected: mod_DocsDetail.idxDoc = mod_DocsArchive.idxDoc; + divRowTpl.Visible = true; divDetail.Visible = true; - //divElenco.Attributes.Remove("class"); - //divElenco.Attributes.Add("class", "col-md-7 fontSmall"); break; default: break; @@ -169,8 +168,12 @@ namespace MedAP } protected void cblRigheFatt_SelectedIndexChanged(object sender, EventArgs e) { - // modificare :: deve salvare riga in clipboard... - //checkDivAddTemplate(); + //// salva la riga in clipboard... + //Proxy.RowIds = string.Format("{0}{1}#", Proxy.RowIds, grView.SelectedValue); + //Proxy.NumIds++; + //// salvo selezione in clipboard... + //Proxy.ClipMess = string.Format("{0} righe memorizzate", Proxy.NumIds); + //raiseEvent(ucEvType.ReqUpdateParent); } /// /// Verifica se mostrare div x aggiunta da template @@ -178,7 +181,7 @@ namespace MedAP private void checkDivAddTemplate() { bool showDiv = false; - showDiv = rblTipoFatt.SelectedIndex >= 0;// || cblRigheFatt.SelectedIndex >= 0; + showDiv = rblTipoFatt.SelectedIndex >= 0; divAddTemplate.Visible = showDiv; } /// @@ -189,7 +192,6 @@ namespace MedAP protected void lbtCancel_Click(object sender, EventArgs e) { rblTipoFatt.SelectedIndex = -1; - cblRigheFatt.SelectedIndex = -1; divAddTemplate.Visible = false; } /// @@ -201,17 +203,29 @@ namespace MedAP { // controllo cmq di avere un cliente + una selezione x template... bool okCli = (mod_ElencoClienti.idxCliSel > 0); - bool okTpl = (rblTipoFatt.SelectedIndex >= 0);// || cblRigheFatt.SelectedIndex >= 0); + bool okTpl = (rblTipoFatt.SelectedIndex >= 0); if (okCli && okTpl) { // se ho tutto clono! int idxDoc = 0; int.TryParse(rblTipoFatt.SelectedValue, out idxDoc); MedAPModel.DocumentiClona(idxDoc, mod_ElencoClienti.idxCliSel); - mod_DocsArchive.doUpdate(); + mod_DocsArchive.resetSelezione(); mod_DocsDetail.idxDoc = 0; divDetail.Visible = false; } } + + protected void grViewRowTpl_SelectedIndexChanged(object sender, EventArgs e) + { + // salva la riga in clipboard... + Proxy.RowIds = string.Format("{0}{1}#", Proxy.RowIds, grViewRowTpl.SelectedValue); + Proxy.NumIds++; + // salvo selezione in clipboard... + Proxy.ClipMess = string.Format("{0} righe memorizzate", Proxy.NumIds); + // aggiorno di conseguenza! + mod_searchParam.doUpdate(); + mod_DocsArchive.doUpdate(); + } } } \ No newline at end of file diff --git a/MedAP/DocArchive.aspx.designer.cs b/MedAP/DocArchive.aspx.designer.cs index 70225c0..2e695d3 100644 --- a/MedAP/DocArchive.aspx.designer.cs +++ b/MedAP/DocArchive.aspx.designer.cs @@ -31,13 +31,13 @@ namespace MedAP { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divTopFooter; /// - /// Controllo divTemplate. + /// Controllo divDocTpl. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divTemplate; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDocTpl; /// /// Controllo rblTipoFatt. @@ -57,24 +57,6 @@ namespace MedAP { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoDoc; - /// - /// Controllo cblRigheFatt. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.CheckBoxList cblRigheFatt; - - /// - /// Controllo odsTipoRow. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoRow; - /// /// Controllo divAddTemplate. /// @@ -111,6 +93,42 @@ namespace MedAP { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl div1; + /// + /// Controllo divRowTpl. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divRowTpl; + + /// + /// Controllo grViewRowTpl. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grViewRowTpl; + + /// + /// Controllo odsTipoRow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoRow; + + /// + /// Controllo div4. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl div4; + /// /// Controllo mod_searchParam. /// diff --git a/MedAP/WebUserControl/mod_DocsDetail.ascx b/MedAP/WebUserControl/mod_DocsDetail.ascx index 24d7fcc..93576c3 100644 --- a/MedAP/WebUserControl/mod_DocsDetail.ascx +++ b/MedAP/WebUserControl/mod_DocsDetail.ascx @@ -237,7 +237,6 @@ -
diff --git a/MedAP/bin/SHERPA.dll b/MedAP/bin/SHERPA.dll index eff0dd8..49cc65f 100644 Binary files a/MedAP/bin/SHERPA.dll and b/MedAP/bin/SHERPA.dll differ diff --git a/MedAP/bin/SHERPA.pdb b/MedAP/bin/SHERPA.pdb index 14437fa..dc936f4 100644 Binary files a/MedAP/bin/SHERPA.pdb and b/MedAP/bin/SHERPA.pdb differ diff --git a/MedAP/obj/Debug/SHERPA.dll b/MedAP/obj/Debug/SHERPA.dll index eff0dd8..49cc65f 100644 Binary files a/MedAP/obj/Debug/SHERPA.dll and b/MedAP/obj/Debug/SHERPA.dll differ diff --git a/MedAP/obj/Debug/SHERPA.pdb b/MedAP/obj/Debug/SHERPA.pdb index 14437fa..dc936f4 100644 Binary files a/MedAP/obj/Debug/SHERPA.pdb and b/MedAP/obj/Debug/SHERPA.pdb differ