From 4f00ee41ef1440c197b1e204c5b8ae06488fac0d Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 25 Nov 2011 14:03:11 +0000 Subject: [PATCH] Patch level : 10.0 Files correlati : ba2.exe Ricompilazione Demo : [ ] Commento : Aggiunto abilitazione all'uso del programma di gestione dninst delle chiavi 8453(Ilaria) 8517(Sara) 8578(Monica) git-svn-id: svn://10.65.10.50/branches/R_10_00@22504 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba2800.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ba/ba2800.cpp b/ba/ba2800.cpp index 24b03b9c2..633c13907 100644 --- a/ba/ba2800.cpp +++ b/ba/ba2800.cpp @@ -202,11 +202,11 @@ private: static int dongle_compare(const TSortable& o1, const TSortable& o2, void* jolly); const TString& remote_dninst() const; - TToken_string& find_or_create_line(TString_array& a, int key) const; void load_dninst(TString_array& a); bool load_odbc(TString_array& a) const; bool load_xml(TString_array& a) const; + TToken_string& find_or_create_line(TString_array& a, int key) const; protected: void fill_sheet(); @@ -385,7 +385,6 @@ bool Tdnist_mask::load_xml(TString_array& a) const TString msg; msg.format(FR("Scansione cartella %s: %d files"), (const char*)path, xml.items()); TProgind pi(xml.items(), msg); - TFilename fname; FOR_EACH_ARRAY_ROW(xml, r, row) { @@ -594,16 +593,20 @@ bool Tdnist_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) } } break; + case F_FTP: + if (e == fe_init && o.empty()) + o.set("ftp://guastalla:tk0nmo4q3@www.aga.it/release/v_10.0/program"); + break; case F_DSN: if (e == fe_button && !o.empty()) { TString query; - query << "ODBC(" << get(F_DSN) << ")\n" + query << "ODBC(" << o.get() << ")\n" << "SELECT * FROM chiavette,clienti WHERE chiavette.cliente=clienti.codice\n" << "ORDER BY "; switch(get_int(F_SORT)) { - case 1: query << "agente,RagioneSociale"; break; + case 1: query << "agente,RagioneSociale,chiavette.codice"; break; case 2: query << "RagioneSociale,chiavette.codice"; break; default: query << "chiavette.codice"; break; } @@ -677,7 +680,7 @@ protected: bool Tdninst_manager::create() { const word n = dongle().number(); - if (n != 8453 && !is_power_station()) + if (n != 8453 && n != 8517 && n != 8578 && !is_power_station()) return error_box(TR("Postazione non abilitata")); if (user() != dongle().administrator())