Gabriellate tabella pagamenti

git-svn-id: svn://10.65.10.50/trunk@2101 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
villa 1995-11-07 11:36:38 +00:00
parent 7cb6b921f8
commit 09381b469a
2 changed files with 22 additions and 22 deletions

View File

@ -64,7 +64,6 @@ public:
virtual ~BA3700_application() {} virtual ~BA3700_application() {}
}; };
// app-data per handlers // app-data per handlers
struct sht { struct sht {
TMask* _msk; TMask* _msk;
@ -73,8 +72,6 @@ struct sht {
TArray* _rws; TArray* _rws;
} shuttle; } shuttle;
bool BA3700_application::user_create() bool BA3700_application::user_create()
{ {
_rel = new TRelation(TAB_CPG); _rel = new TRelation(TAB_CPG);
@ -175,13 +172,16 @@ bool BA3700_application::intervallo_rate(TMask_field& f, KEY k)
if (!pag || msk->get(F_INT_RATE).empty()) return TRUE; if (!pag || msk->get(F_INT_RATE).empty()) return TRUE;
pag->set_intervallo_rate(msk->get_int(F_INT_RATE)); pag->set_intervallo_rate(msk->get_int(F_INT_RATE));
if (pag->dirty()) if (pag->dirty())
{ {
pag->set_sheet(*shf); pag->set_sheet(*shf);
(*(s->_rws)) = shf->rows_array(); (*(s->_rws)) = shf->rows_array();
msk->field(F_MESECOMM).set(pag->mese_commerciale() ? "X" : ""); msk->field(F_MESECOMM).set(pag->mese_commerciale() ? "X" : "");
} }
else f.set(format("%d",pag->intervallo_rate()));
return TRUE; return TRUE;
} }
@ -341,7 +341,6 @@ bool BA3700_application::ult_class(TMask_field& f, KEY k)
return TRUE; return TRUE;
} }
// qui viene il belloccio // qui viene il belloccio
bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k) bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
{ {
@ -389,7 +388,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
if (strcmp(ts.get(2),newt) != 0) // modificato tipo pagamento if (strcmp(ts.get(2),newt) != 0) // modificato tipo pagamento
mod = m_tipo = TRUE; mod = m_tipo = TRUE;
if (strcmp(ts.get(4),newu) != 0) // modificata ulteriore classificazione if (strcmp(ts.get(3),newu) != 0) // modificata ulteriore classificazione
mod = m_ulc = TRUE; mod = m_ulc = TRUE;
} }
break; break;
@ -432,6 +431,7 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
if (m_scad) trw.add(news,0); if (m_scad) trw.add(news,0);
if (m_perc) trw.add(newp,1); if (m_perc) trw.add(newp,1);
if (m_tipo) trw.add(newt,2); if (m_tipo) trw.add(newt,2);
if (m_ulc) trw.add(newu,3);
// validate the payment // validate the payment
if ((ahiahi = pag->validate()) != P_OK) if ((ahiahi = pag->validate()) != P_OK)
pag->rata(r) = srw; pag->rata(r) = srw;
@ -451,19 +451,19 @@ bool BA3700_application::sheet_action(TSheet_field&, int r, KEY k)
msk->set(F_NUM_RATE, pag->n_rate()); msk->set(F_NUM_RATE, pag->n_rate());
} }
else if (recalc && mod && need_recalc) else if (recalc && mod && need_recalc)
{ {
// ridefinisci lo sheet sulla base delle nuove rate // ridefinisci lo sheet sulla base delle nuove rate
pag->set_sheet(*shf); pag->set_sheet(*shf);
shf->force_update(-1); shf->force_update(-1);
rws->destroy(); rws->destroy();
(*rws) = shf->rows_array(); (*rws) = shf->rows_array();
} }
msk->field(F_NUM_RATE).set(format("%d", pag->n_rate())); msk->field(F_NUM_RATE).set(format("%d", pag->n_rate()));
} }
return doit; return doit;
} }

View File

@ -202,8 +202,8 @@ BEGIN
PROMPT 36 9 "(2) " PROMPT 36 9 "(2) "
FIELD I1 FIELD I1
HELP "Giorno scadenza obbligato: seconda alternativa" HELP "Giorno scadenza obbligato: seconda alternativa"
NUM_EXPR (#F_FIXSCAD_2>=0)&&(#F_FIXSCAD_2<=31) NUM_EXPR (#F_FIXSCAD_2==0)||((#F_FIXSCAD_2>0)&&(#F_FIXSCAD_2<=31)&&(#F_FIXSCAD_2>#F_FIXSCAD_1))
WARNING "Il giorno del mese e' compreso tra 1 e 31!" WARNING "Giorno errato o non in sequenza"
END END
NUMBER F_FIXSCAD_3 2 NUMBER F_FIXSCAD_3 2
@ -211,8 +211,8 @@ BEGIN
PROMPT 44 9 "(3) " PROMPT 44 9 "(3) "
FIELD I2 FIELD I2
HELP "Giorno scadenza obbligato: terza alternativa" HELP "Giorno scadenza obbligato: terza alternativa"
NUM_EXPR (#F_FIXSCAD_3>=0)&&(#F_FIXSCAD_3<=31) NUM_EXPR (#F_FIXSCAD_3==0)||((#F_FIXSCAD_3>0)&&(#F_FIXSCAD_3<=31)&&(#F_FIXSCAD_3>#F_FIXSCAD_2)&&(#F_FIXSCAD_3>#F_FIXSCAD_1))
WARNING "Il giorno del mese e' compreso tra 1 e 31!" WARNING "Giorno errato o non in sequenza"
END END
BOOLEAN F_MESECOMM BOOLEAN F_MESECOMM