From a372a7c6c5bede78b0f08fc86e51caba153e3cc9 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 18 Apr 2011 23:50:40 +0000 Subject: [PATCH] Patch level : 10.976 Files correlati : ci2.exe Ricompilazione Demo : [ ] Commento : Modificata la proposta dei costi nella rilevazione ore git-svn-id: svn://10.65.10.50/branches/R_10_00@21976 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ci/ci0200a.uml | 7 +++++-- ci/ci0500a.uml | 7 +++++-- ci/ci0600a.uml | 6 ++++-- ci/ci1300a.uml | 4 +++- ci/ci2100.cpp | 5 ++--- ci/ci2100a.uml | 6 ++++-- ci/ci2200.cpp | 10 +++++----- ci/ci2200a.uml | 6 ++++-- 8 files changed, 32 insertions(+), 19 deletions(-) diff --git a/ci/ci0200a.uml b/ci/ci0200a.uml index 1031fac8e..483a27682 100755 --- a/ci/ci0200a.uml +++ b/ci/ci0200a.uml @@ -103,6 +103,7 @@ BEGIN OUTPUT F_RISOATT CODTAB[1,1] OUTPUT F_CODICE CODTAB[2,17] GROUP 1 + FLAGS "U" CHECKTYPE NORMAL END @@ -116,6 +117,7 @@ BEGIN OUTPUT F_CODRIS CODTAB OUTPUT F_DESRIS S0 GROUP 2 + FLAGS "U" CHECKTYPE NORMAL END @@ -138,6 +140,7 @@ BEGIN OUTPUT F_DESATT S0 GROUP 3 CHECKTYPE NORMAL + FLAGS "U" END STRING F_DESATT 50 27 @@ -193,7 +196,7 @@ BEGIN OUTPUT S_CODRIS CODTAB OUTPUT S_DESRIS S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 1 END @@ -216,7 +219,7 @@ BEGIN OUTPUT S_CODATT CODTAB OUTPUT S_DESATT S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 2 END diff --git a/ci/ci0500a.uml b/ci/ci0500a.uml index cd388937c..e7b97877e 100755 --- a/ci/ci0500a.uml +++ b/ci/ci0500a.uml @@ -85,6 +85,7 @@ BEGIN OUTPUT F_RISOATT CODTAB[1,1] OUTPUT F_CODICE CODTAB[2,17] GROUP 1 + FLAGS "U" CHECKTYPE NORMAL END @@ -98,6 +99,7 @@ BEGIN OUTPUT F_CODRIS CODTAB OUTPUT F_DESRIS S0 GROUP 2 + FLAGS "U" CHECKTYPE NORMAL END @@ -119,6 +121,7 @@ BEGIN OUTPUT F_CODATT CODTAB OUTPUT F_DESATT S0 GROUP 3 + FLAGS "U" CHECKTYPE NORMAL END @@ -174,7 +177,7 @@ BEGIN OUTPUT S_CODRIS CODTAB OUTPUT S_DESRIS S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 1 END @@ -197,7 +200,7 @@ BEGIN OUTPUT S_CODATT CODTAB OUTPUT S_DESATT S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 2 END diff --git a/ci/ci0600a.uml b/ci/ci0600a.uml index a2abc5262..1eb42333a 100755 --- a/ci/ci0600a.uml +++ b/ci/ci0600a.uml @@ -82,6 +82,7 @@ BEGIN OUTPUT F_CODRIS CODTAB OUTPUT F_DESRIS S0 GROUP 1 + FLAGS "U" CHECKTYPE NORMAL END @@ -102,6 +103,7 @@ BEGIN OUTPUT F_CODATT CODTAB OUTPUT F_DESATT S0 GROUP 2 + FLAGS "U" CHECKTYPE NORMAL END @@ -169,7 +171,7 @@ BEGIN OUTPUT S_CODRIS CODTAB OUTPUT S_DESRIS S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 1 END @@ -191,7 +193,7 @@ BEGIN OUTPUT S_CODATT CODTAB OUTPUT S_DESATT S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 2 END diff --git a/ci/ci1300a.uml b/ci/ci1300a.uml index 7816d86da..d73f69ee7 100755 --- a/ci/ci1300a.uml +++ b/ci/ci1300a.uml @@ -57,7 +57,8 @@ BEGIN OUTPUT F_A_CODRIS CODTAB OUTPUT F_A_DESRIS S0 CHECKTYPE NORMAL - GROUP 1 + FLAGS "U" + GROUP 1 END STRING F_A_DESRIS 50 43 @@ -82,6 +83,7 @@ BEGIN OUTPUT F_DA_CODATT CODTAB OUTPUT F_DA_DESATT S0 CHECKTYPE NORMAL + FLAGS "U" GROUP 2 END diff --git a/ci/ci2100.cpp b/ci/ci2100.cpp index f3c7e93c6..100c077c8 100755 --- a/ci/ci2100.cpp +++ b/ci/ci2100.cpp @@ -526,8 +526,8 @@ void TRilevamento_prev_msk::riempi_sheet() void TRilevamento_prev_msk::nuova_riga() { TSheet_field& sheet = sfield(F_SHEET); - const int r = sheet.items() - 1; TToken_string & riga = sheet.row(-1); + const int r = sheet.items() - 1; TMask& msk = sheet.sheet_mask(); //guardo il tipo risorsa / attrezzatura che sto ricercando @@ -555,9 +555,8 @@ void TRilevamento_prev_msk::nuova_riga() riga.add(tpora, sheet.cid2index(S_TPORA)); get_anal_fields(codcosto, codcms, codfase); put_row_anal_fields(riga, codcosto, codcms, codfase); - sheet.check_row(r); - sheet.update_row(r); sheet.select(r); + sheet.check_row(r); riga.add(proponi_costo(riga), sheet.cid2index(S_COSTO)); sheet.force_update(); } diff --git a/ci/ci2100a.uml b/ci/ci2100a.uml index 8ccd56bb6..bf5fbd73a 100755 --- a/ci/ci2100a.uml +++ b/ci/ci2100a.uml @@ -85,6 +85,7 @@ BEGIN OUTPUT F_CODRIS CODTAB OUTPUT F_DESRIS S0 GROUP 2 + FLAGS "U" CHECKTYPE NORMAL END @@ -105,6 +106,7 @@ BEGIN OUTPUT F_CODATT CODTAB OUTPUT F_DESATT S0 GROUP 3 + FLAGS "U" CHECKTYPE NORMAL END @@ -173,7 +175,7 @@ BEGIN OUTPUT S_CODRIS CODTAB OUTPUT S_DESRIS S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 1 END @@ -195,7 +197,7 @@ BEGIN OUTPUT S_CODATT CODTAB OUTPUT S_DESATT S0 CHECKTYPE REQUIRED - FLAGS "GD" + FLAGS "GDU" GROUP 2 END diff --git a/ci/ci2200.cpp b/ci/ci2200.cpp index 0a3921fd1..9d40c36aa 100755 --- a/ci/ci2200.cpp +++ b/ci/ci2200.cpp @@ -816,12 +816,13 @@ void TRilevamento_cons_msk::riempi_sheet() void TRilevamento_cons_msk::nuova_riga() { TSheet_field& sheet = sfield(F_SHEET); - const int r = sheet.items() - 1; - TToken_string & riga = sheet.row(r); + TToken_string & riga = sheet.row(-1); + const int r = sheet.items() - 1; TMask& msk = sheet.sheet_mask(); //guardo il tipo risorsa / attrezzatura che sto ricercando + const bool tutti = get(F_RISOATT)[0] == 'T'; const TString4 tipo = tutti ? "R" : get(F_RISOATT); TString codice; @@ -841,9 +842,8 @@ void TRilevamento_cons_msk::nuova_riga() riga.add(tpora, sheet.cid2index(S_TPORA)); get_anal_fields(codcosto, codcms, codfase); put_row_anal_fields(riga, codcosto, codcms, codfase); - sheet.check_row(r); - sheet.update_row(r); - sheet.select(r); + sheet.select(r); + sheet.check_row(r); riga.add(proponi_costo(riga), sheet.cid2index(S_COSTO)); sheet.force_update(); } diff --git a/ci/ci2200a.uml b/ci/ci2200a.uml index b56d35239..b954cd768 100755 --- a/ci/ci2200a.uml +++ b/ci/ci2200a.uml @@ -90,6 +90,7 @@ BEGIN OUTPUT F_CODRIS CODTAB OUTPUT F_DESRIS S0 GROUP 2 + FLAGS "U" CHECKTYPE NORMAL END @@ -110,6 +111,7 @@ BEGIN OUTPUT F_CODATT CODTAB OUTPUT F_DESATT S0 GROUP 3 + FLAGS "U" CHECKTYPE NORMAL END @@ -217,7 +219,7 @@ BEGIN OUTPUT S_CODRIS CODTAB OUTPUT S_DESRIS S0 CHECKTYPE REQUIRED - FLAGS "G" + FLAGS "GU" GROUP 1 CHECKTYPE REQUIRED END @@ -239,7 +241,7 @@ BEGIN OUTPUT S_CODATT CODTAB OUTPUT S_DESATT S0 CHECKTYPE REQUIRED - FLAGS "G" + FLAGS "GU" GROUP 2 END