diff --git a/sc/sc0101.cpp b/sc/sc0101.cpp index 3abd1e08d..71e3af47f 100755 --- a/sc/sc0101.cpp +++ b/sc/sc0101.cpp @@ -932,13 +932,22 @@ bool TGame_mask::prima_nota(const long nreg) { app().partite().destroy(); // Distrugge tutte le partite in memoria - const char* const pn = "cg2 -0"; - TExternal_app prima_nota(pn); - TString numreg; numreg << "1|" << nreg; - TMessage msg(pn, MSG_LN, numreg); - msg.send(); // Messaggio di collegamento al movimento nreg - bool ok = prima_nota.run() == 0; // Lancia la prima nota + // Nuovo modo elegante + TRectype pn(LF_MOV); + pn.put(MOV_NUMREG, nreg); + bool ok = pn.edit(); + if (!ok) + { + // Vecchio modo, brutto ed obsoleto + const char* const pn = "cg2 -0"; + TExternal_app prima_nota(pn); + TString numreg; numreg << "1|" << nreg; + TMessage msg(pn, MSG_LN, numreg); // Messaggio di collegamento al movimento nreg + msg.send(); + ok = prima_nota.run() == 0; // Lancia la prima nota + } + fill_partite(); // Rilegge partite return ok; diff --git a/sc/sc2100.cpp b/sc/sc2100.cpp index cce59772e..af7c64b05 100755 --- a/sc/sc2100.cpp +++ b/sc/sc2100.cpp @@ -1609,12 +1609,16 @@ int TStampaEC_application::print_ec(TEC_Game_list* games) update_numec(clf, +1); // Incrementa contatore TString16 last_game; + int last_year = 0; + for (cur = 0; cur.pos() < items; ++cur) { + const int curr_year = curr.get_int(PART_ANNO); const TString& curr_game = curr.get(PART_NUMPART); - if (curr_game == last_game) + if (curr_year == last_year && curr_game == last_game) continue; last_game = curr_game; + last_year = curr_year; // Non fregare i clienti agli altri agenti! if (games != NULL && !games->has_game(curr)) diff --git a/sc/sc3100.cpp b/sc/sc3100.cpp index 8c2de9b81..c80dbba68 100755 --- a/sc/sc3100.cpp +++ b/sc/sc3100.cpp @@ -892,9 +892,8 @@ bool TForm_EC_editor::ask_profile() if (fcode != 0 && yesno_box(FR("Confermare la cancellazione del profilo %04ld%c"), fcode,flng)) { - TProgind pi(50,TR("Cancellazione in corso..."),FALSE,FALSE); + TIndwin pi(100,TR("Cancellazione in corso..."),FALSE,FALSE); remove_form(frm,rfr,fform,cod); - pi.cancel(); mask().set(F_BASE,BASE_EC_PROFILE); mask().set(F_CODE,""); mask().set(F_CODEL,"");