diff --git a/ps/ps0099100.cpp b/ps/ps0099100.cpp index 2f00d86b3..78c88dc02 100755 --- a/ps/ps0099100.cpp +++ b/ps/ps0099100.cpp @@ -1,5 +1,6 @@ #include "ps0099100.h" +#include #include #include #include @@ -16,15 +17,12 @@ class TStatistiche_ANIVAL_mask : public TAutomask { protected: virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); - public: TStatistiche_ANIVAL_mask(); - virtual ~TStatistiche_ANIVAL_mask() {} }; TStatistiche_ANIVAL_mask::TStatistiche_ANIVAL_mask() : TAutomask("ps0099100") -{ -} +{ } bool TStatistiche_ANIVAL_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) { @@ -642,7 +640,7 @@ void TStatistiche_ANIVAL::elabora(const TMask& mask) const default: break; } - csv->save_as(path, fmt_silk); + csv->save_as(path, fmt_html); //accoppa la riga con le intestazioni dei campi csv->destroy(0); @@ -705,12 +703,9 @@ void TStatistiche_ANIVAL::elabora(const TMask& mask) const void TStatistiche_ANIVAL::main_loop() { - TStatistiche_ANIVAL_mask mask; - + TStatistiche_ANIVAL_mask mask; while (mask.run() == K_ENTER) - { elabora(mask); - } } bool TStatistiche_ANIVAL::create() @@ -719,11 +714,6 @@ bool TStatistiche_ANIVAL::create() if (!has_module(VEAUT)) return error_box(TR("Modulo non autorizzato")); - //se non paghi ti stronco!!! - const TDate oggi(TODAY); - if (oggi >= 20091114) - return false; - return TSkeleton_application::create(); } diff --git a/ps/ps0099100.uml b/ps/ps0099100.uml index c9f02b9cd..f814c4e5f 100755 --- a/ps/ps0099100.uml +++ b/ps/ps0099100.uml @@ -1,6 +1,10 @@ #include "ps0099100.h" -PAGE "Statistiche ANIVAL" -1 -1 0 0 +TOOLBAR "topbar" 0 0 0 2 +#include +ENDPAGE + +PAGE "Statistiche ANIVAL" 0 2 0 0 GROUPBOX -1 78 5 BEGIN @@ -274,16 +278,6 @@ BEGIN CHECKTYPE REQUIRED END -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -12 -2 "" -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -22 -2 "" -END - ENDPAGE ENDMASK diff --git a/ps/ps0430100.cpp b/ps/ps0430100.cpp index 6b945de87..7748f55ec 100755 --- a/ps/ps0430100.cpp +++ b/ps/ps0430100.cpp @@ -256,13 +256,7 @@ protected: virtual void init_insert_mode(TMask& m) { read(m); } virtual bool find(word key = 0); virtual TMask* get_mask(int mode = MODE_QUERY) { return (TMask *) _mask;} - -public: - - virtual const char * extra_modules() const {return "ba";} - - TRelArticoli_multirel_app() {} - virtual ~TRelArticoli_multirel_app() {} + virtual const char* extra_modules() const { return "ba"; } }; void TRelArticoli_multirel_app::get_mask_name(TString& tabname) const