From 5942f2b8e7b33e533ff1fd510fd9b55880dec305 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 22 Apr 2010 13:51:36 +0000 Subject: [PATCH] Patch level :10.0 Files correlati : Ricompilazione Demo : [ ] Commento : personalizzazione crpa in corso git-svn-id: svn://10.65.10.50/trunk@20369 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ps/ps1001300.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++++ ps/ps1001300a.h | 3 +++ ps/ps1001300a.uml | 38 +++++++++++++++++++++++++++------- 3 files changed, 86 insertions(+), 7 deletions(-) diff --git a/ps/ps1001300.cpp b/ps/ps1001300.cpp index f76d3f16b..89786ee2a 100755 --- a/ps/ps1001300.cpp +++ b/ps/ps1001300.cpp @@ -60,8 +60,22 @@ bool TVariazione_budget_mask::on_field_event(TOperable_field& o, TField_event e, break; case F_DATAINICMS: case F_DATAFINECMS: + _dirty = true; + break; + case S_DATACOMP: + case S_DATAFCOMP: if (e == fe_modify) + { + const TDate datainicms = get_date(F_DATAINICMS); + TDate datafinecms = get_date(F_DATAPRORCMS); + if (!datafinecms.ok()) + datafinecms = get_date(F_DATAFINECMS); + const TDate data = o.get(); + if (data < datainicms || (datafinecms.ok() && data > datafinecms)) + return error_box("Le date competenza devono rientrare nella durata della commessa!"); + _dirty = true; + } break; case DLG_CANCEL: if (e == fe_button) @@ -83,6 +97,44 @@ bool TVariazione_budget_mask::on_field_event(TOperable_field& o, TField_event e, check_all(!one_checked()); } break; + case DLG_TODATAINI: + if (e == fe_button) + { + const TString& datainicms = get(F_DATAINICMS); + TSheet_field& sf_righe = sfield(F_RIGHE); + const int pos = sf_righe.cid2index(S_DATACOMP); + FOR_EACH_SHEET_ROW(sf_righe, i, riga) if (riga->get_char(0) > ' ') //solo le righe checked!! + riga->add(datainicms, pos); + + sf_righe.force_update(); + } + break; + case DLG_TODATAFIN: + if (e == fe_button) + { + TString datafinecms = get(F_DATAPRORCMS); + if (!datafinecms.ok()) + datafinecms = get(F_DATAFINECMS); + TSheet_field& sf_righe = sfield(F_RIGHE); + const int pos = sf_righe.cid2index(S_DATAFCOMP); + FOR_EACH_SHEET_ROW(sf_righe, i, riga) if (riga->get_char(0) > ' ') //solo le righe checked!! + riga->add(datafinecms, pos); + + sf_righe.force_update(); + } + break; + case DLG_TOMATURATO: + if (e == fe_button) + { + TSheet_field& sf_righe = sfield(F_RIGHE); + const int pos_imp = sf_righe.cid2index(S_IMPORTO); + const int pos_mat = sf_righe.cid2index(S_MATURATO); + FOR_EACH_SHEET_ROW(sf_righe, i, riga) if (riga->get_char(0) > ' ') //solo le righe checked!! + riga->add(riga->get(pos_mat), pos_imp); + + sf_righe.force_update(); + } + break; default: break; } diff --git a/ps/ps1001300a.h b/ps/ps1001300a.h index 0fc1d19e1..a8802d29f 100755 --- a/ps/ps1001300a.h +++ b/ps/ps1001300a.h @@ -13,6 +13,9 @@ //bottoni #define DLG_CHECKALL 250 +#define DLG_TODATAINI 251 +#define DLG_TODATAFIN 252 +#define DLG_TOMATURATO 253 //campi dello sheet #define S_CHECK 101 diff --git a/ps/ps1001300a.uml b/ps/ps1001300a.uml index 921d647a5..34b5b02cd 100755 --- a/ps/ps1001300a.uml +++ b/ps/ps1001300a.uml @@ -20,16 +20,33 @@ BEGIN PICTURE TOOL_MULTISEL END -BUTTON DLG_NULL 4 2 +BUTTON DLG_NULL BEGIN - PROMPT 2 1 "" + PROMPT 4 1 "" PICTURE 0 END -//allinea alla dataini -//allinea alla data fine -BUTTON DLG_NULL 4 2 + +BUTTON DLG_TODATAINI BEGIN - PROMPT 2 1 "" + PROMPT 5 1 "All.~Ini" + PICTURE TOOL_TODATAINI +END + +BUTTON DLG_TODATAFIN +BEGIN + PROMPT 6 1 "All.~Fin" + PICTURE TOOL_TODATAFIN +END + +BUTTON DLG_TOMATURATO +BEGIN + PROMPT 7 1 "All.~Mat" + PICTURE TOOL_TOCALC +END + +BUTTON DLG_NULL +BEGIN + PROMPT 8 1 "" PICTURE 0 END @@ -85,7 +102,7 @@ BOOL F_PROROGATA BEGIN PROMPT 43 2 "Prorogata" MESSAGE FALSE CLEAR,F_DATAPRORCMS - MESSAGE ENABLE,F_DATAPRORCMS + MESSAGE TRUE ENABLE,F_DATAPRORCMS END DATE F_DATAPRORCMS @@ -169,16 +186,19 @@ END STRING S_CDC 4 BEGIN PROMPT 1 2 "Sede " + FLAGS "L" END STRING S_FASE 5 BEGIN PROMPT 1 3 "Fase " + FLAGS "L" END STRING S_CONTO 12 BEGIN PROMPT 1 4 "Conto " + FLAGS "L" END DATE S_DATACOMP @@ -199,6 +219,7 @@ END STRING S_COSRIC 1 BEGIN PROMPT 1 8 "Cst/Ric " + FLAGS "L" END NUMBER S_IMPORTO 15 2 @@ -220,16 +241,19 @@ END NUMBER S_NUMREG 7 BEGIN PROMPT 1 12 "N. reg. " + FLAGS "L" END NUMBER S_NUMRIG 3 BEGIN PROMPT 1 13 "N. riga " + FLAGS "L" END STRING S_TIPOMOV 1 BEGIN PROMPT 1 14 "Tipo " + FLAGS "L" END ENDPAGE