root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
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
This commit is contained in:
guy 2011-11-25 14:03:11 +00:00
parent 5dcf051f0a
commit 4f00ee41ef
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ba/ba2800.cpp
View File

@ -202,11 +202,11 @@ private:
static int dongle_compare(const TSortable& o1, const TSortable& o2, void* jolly); static int dongle_compare(const TSortable& o1, const TSortable& o2, void* jolly);
const TString& remote_dninst() const; const TString& remote_dninst() const;
TToken_string& find_or_create_line(TString_array& a, int key) const;
void load_dninst(TString_array& a); void load_dninst(TString_array& a);
bool load_odbc(TString_array& a) const; bool load_odbc(TString_array& a) const;
bool load_xml(TString_array& a) const; bool load_xml(TString_array& a) const;
TToken_string& find_or_create_line(TString_array& a, int key) const;
protected: protected:
void fill_sheet(); 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()); TString msg; msg.format(FR("Scansione cartella %s: %d files"), (const char*)path, xml.items());
TProgind pi(xml.items(), msg); TProgind pi(xml.items(), msg);
TFilename fname; TFilename fname;
FOR_EACH_ARRAY_ROW(xml, r, row) 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; 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: case F_DSN:
if (e == fe_button && !o.empty()) if (e == fe_button && !o.empty())
{ {
TString query; TString query;
query << "ODBC(" << get(F_DSN) << ")\n" query << "ODBC(" << o.get() << ")\n"
<< "SELECT * FROM chiavette,clienti WHERE chiavette.cliente=clienti.codice\n" << "SELECT * FROM chiavette,clienti WHERE chiavette.cliente=clienti.codice\n"
<< "ORDER BY "; << "ORDER BY ";
switch(get_int(F_SORT)) 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; case 2: query << "RagioneSociale,chiavette.codice"; break;
default: query << "chiavette.codice"; break; default: query << "chiavette.codice"; break;
} }
@ -677,7 +680,7 @@ protected:
bool Tdninst_manager::create() bool Tdninst_manager::create()
{ {
const word n = dongle().number(); 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")); return error_box(TR("Postazione non abilitata"));
if (user() != dongle().administrator()) if (user() != dongle().administrator())