root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cambiato nei prompt MRP in M.R.P.

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22939 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2014-05-14 08:28:56 +00:00
parent db741508ef
commit 0d2ca9f760
5 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mr/mr0.cpp
View File

@ -4,16 +4,12 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int a = argc > 1 ? (argv[1][1] - '0') : 0; const int a = argc > 1 ? (argv[1][1] - '0') : 0;
switch (a) switch (a)
{ {
case 3: case 3: mr0400(argc, argv); break; // parametri ditta
mr0400(argc,argv); break; // parametri ditta case 4: mr0500(argc, argv); break; // rilevazione produzione
case 4: default: mr0100(argc, argv);break; // M.R.P.
mr0500(argc,argv); break; // rilevazione produzione
case 0:
default:
mr0100(argc, argv);
} }
return 0; return 0;
} }

15
mr/mr0400.cpp
View File

@ -61,10 +61,8 @@ public:
virtual bool preprocess_config (TMask& mask, TConfig& config); virtual bool preprocess_config (TMask& mask, TConfig& config);
virtual bool postprocess_config (TMask& mask, TConfig& config); virtual bool postprocess_config (TMask& mask, TConfig& config);
virtual bool user_create(); virtual bool user_create();
virtual bool user_destroy();
TConf_MRP_application() : TConfig_application(CONFIG_DITTA) { _mask = NULL;} TConf_MRP_application() : TConfig_application(CONFIG_DITTA) { _mask = NULL;}
virtual ~TConf_MRP_application() {}
}; };
void TConf_MRP_application::load_mask() void TConf_MRP_application::load_mask()
@ -185,20 +183,13 @@ bool TConf_MRP_application::postprocess_config (TMask& mask, TConfig& c)
bool TConf_MRP_application::user_create() bool TConf_MRP_application::user_create()
{ {
TConfig conf(CONFIG_DITTA); ini_set_string(CONFIG_DITTA, "mr", "EdMask", "mr0400a");
conf.set( "EdMask", "mr0400a", "mr"); return true;
return TRUE;
}
bool TConf_MRP_application::user_destroy()
{
return TRUE;
} }
int mr0400(int argc, char* argv[]) int mr0400(int argc, char* argv[])
{ {
TConf_MRP_application app; TConf_MRP_application app;
app.run(argc, argv, TR("Parametri M.R.P."));
app.run(argc, argv, TR("Parametri gestione MRP"));
return 0; return 0;
} }

6
mr/mr0400a.uml
View File

@ -11,7 +11,7 @@ END
ENDPAGE ENDPAGE
PAGE "Parametri ditta" 0 0 0 0 PAGE "Parametri M.R.P." 0 2 0 0
BOOLEAN F_GESTIMPIANTI BOOLEAN F_GESTIMPIANTI
BEGIN BEGIN
@ -50,7 +50,6 @@ BEGIN
OUTPUT F_DEFAULT_IMP CODTAB OUTPUT F_DEFAULT_IMP CODTAB
END END
LISTBOX F_NTURNI 3 LISTBOX F_NTURNI 3
BEGIN BEGIN
PROMPT 2 4 "Numero turni " PROMPT 2 4 "Numero turni "
@ -196,7 +195,6 @@ BEGIN
GROUP 3 13 14 15 16 17 18 28 38 GROUP 3 13 14 15 16 17 18 28 38
END END
NUMBER F_T4HINIZIO 2 NUMBER F_T4HINIZIO 2
BEGIN BEGIN
PROMPT 2 8 "Ora inizio quarto turno " PROMPT 2 8 "Ora inizio quarto turno "
@ -589,4 +587,4 @@ END
ENDPAGE ENDPAGE
ENDMASK ENDMASK

8
mr/mr2200a.uml
View File

@ -784,7 +784,7 @@ END
BUTTON F_MSP_RESORT 9 BUTTON F_MSP_RESORT 9
BEGIN BEGIN
PROMPT 68 3 "Riordina" PROMPT 68 4 "Riordina"
END END
//BUTTON F_CHECK_MSP 9 2 //BUTTON F_CHECK_MSP 9 2
@ -935,19 +935,19 @@ END
BUTTON F_PRIORITY_HI 2 2 BUTTON F_PRIORITY_HI 2 2
BEGIN BEGIN
PROMPT -1 11 "Su'" PROMPT -1 11 "^"
PICTURE USER_BMP_ARROWUP PICTURE USER_BMP_ARROWUP
END END
BUTTON F_PRIORITY_ST 2 2 BUTTON F_PRIORITY_ST 2 2
BEGIN BEGIN
PROMPT -1 13 "Su'" PROMPT -1 13 "Stop"
PICTURE BMP_STOPREC PICTURE BMP_STOPREC
END END
BUTTON F_PRIORITY_LO 2 2 BUTTON F_PRIORITY_LO 2 2
BEGIN BEGIN
PROMPT -1 15 "Giu'" PROMPT -1 15 "v"
PICTURE USER_BMP_ARROWDOWN PICTURE USER_BMP_ARROWDOWN
END END

4
mr/mrplib.cpp
View File

@ -771,7 +771,7 @@ long TCalendar_win::handler(WINDOW win, EVENT* ep)
calname << '"'<< _calendario->linea() << '"'; calname << '"'<< _calendario->linea() << '"';
break; break;
} }
TMask m(calname, 1, 40, 8); TMask m(calname, 1, 40, 11);
m.add_static(DLG_NULL, 0, TR("Turni del giorno "), 1, 1); m.add_static(DLG_NULL, 0, TR("Turni del giorno "), 1, 1);
m.add_date(101, 0, "", 1, 2, "D"); m.add_date(101, 0, "", 1, 2, "D");
m.add_string(102, 0, "", 19, 2, 9, "D"); m.add_string(102, 0, "", 19, 2, 9, "D");
@ -878,11 +878,9 @@ void TCalendar_win::update()
set_brush(FOCUS_BACK_COLOR); set_brush(FOCUS_BACK_COLOR);
hide_pen(); hide_pen();
for (TDate d = from ; d <= to; ++d) for (TDate d = from ; d <= to; ++d)
{ {
RCT rect; RCT rect;
rect.left = rct.right * (d.day() + 1) / 33; rect.left = rct.right * (d.day() + 1) / 33;
rect.right = rct.right * (d.day() + 2) / 33; rect.right = rct.right * (d.day() + 2) / 33;
rect.top = rct.bottom * d.month() / 13; rect.top = rct.bottom * d.month() / 13;