More functionality added to the script part.

ourbiz/edit-entity-window.nut

@@ -1,10 +1,3 @@
-class Fl_Progress extends Fl_Box {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-
 class EditEntityWindow extends EditWindow {
 	db_entities_id=null;
 	db_entities_name_ro=null;

ourbiz/edit-order-window.nut

@@ -1,28 +1,3 @@
-class Fl_Float_Input_Fmt extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class My_Fl_Float_Input extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-
-class My_Fl_Return_Button extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class Fl_Choice_Str extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
 //class EditOrderWindow extends Fl_Group {
 class EditOrderWindow extends EditWindow {
 	delivery_calc_window = 0;
@@ -1295,6 +1270,7 @@ calendar_window = 0;
 db_orders_order_type_id->textfont(db_orders_order_type_id->labelfont());
 db_orders_order_type_id->textsize(db_orders_order_type_id->labelsize());
 end();
+print(__FILE__, "db_orders_entity_id :", db_orders_entity_id->x(), db_orders_entity_id->y(), db_orders_entity_id->w(), db_orders_entity_id->h());
 }
 
 function cb_Wrap(){}

ourbiz/edit-product-window.nut

@@ -1,35 +1,3 @@
-class Fl_Image_Box extends Fl_Box {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-
-class Fl_Float_Input_Fmt extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class My_Fl_Float_Input extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-
-class My_Fl_Return_Button extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class Fl_Choice_Str extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-	
 //class EditProductWindow extends Fl_Group {
 class EditProductWindow extends EditWindow {
 	db_products_id=null;

ourbiz/list-search-window.nut

@@ -1,38 +1,3 @@
-class Fl_Image_Box extends Fl_Box {
-	image_id = null;
-	image_type = null;
-	thumbIMG = null;
-	
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-
-class Fl_Float_Input_Fmt extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class My_Fl_Float_Input extends Fl_Float_Input {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class My_Fl_Return_Button extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-
-class Fl_Choice_Str extends Fl_Button {
-	constructor(px, py, pw, ph, pl=""){
-		base.constructor(px, py, pw, ph, pl);
-	}
-}
-	
 //class BaseReportA4 extends Fl_Group {
 class ListSearch extends MyBaseWindow {
 	topGroup=null;

ourbiz/ourbiz-fltk.nut

@@ -99,6 +99,29 @@ class Fl_Box_ClearLabel extends Fl_Box {
 	}
 }
 
+class Fl_Image_Box extends Fl_Box {
+	image_id = null;
+	image_type = null;
+	thumbIMG = null;
+	
+	constructor(px, py, pw, ph, pl=""){
+		base.constructor(px, py, pw, ph, pl);
+	}
+}
+
+class My_Fl_Float_Input extends Fl_Float_Input {
+	constructor(px, py, pw, ph, pl=""){
+		base.constructor(px, py, pw, ph, pl);
+	}
+}
+
+
+class My_Fl_Return_Button extends Fl_Button {
+	constructor(px, py, pw, ph, pl=""){
+		base.constructor(px, py, pw, ph, pl);
+	}
+}
+
 class Fl_Choice_Int extends Fl_Choice {
 	my_values = null;
 	
@@ -138,6 +161,12 @@ class Fl_Choice_Int extends Fl_Choice {
 	function my_clear (){ value(-1);}
 }
 
+class Fl_Choice_Str extends Fl_Choice_Int {	
+	constructor(px, py, pw, ph, pl=null){
+		base.constructor(px, py, pw, ph, pl);
+	}
+}
+
 enum DbAction_Enum {
 		e_none, e_insert, e_update, e_delete,
 		e_export, e_import, e_refresh, e_copy, e_last
@@ -330,10 +359,15 @@ class EditWindow extends MyBaseWindow {
 						//set_widget_value((Fl_Check_Button*)wdg, fld_name);
 						wdg->value(value == "1" ? 1 : 0);
 					}
-					else if(classId == Fl_Choice.className() && wdg instanceof Fl_Choice_Int){
-						//set_widget_value((Fl_Choice_Int*)wdg, fld_name);
-						if(value && value.len()) wdg->my_set_value(value.tointeger());
-						else wdg->my_clear();
+					else if(classId == Fl_Choice.className()){
+						if(wdg instanceof Fl_Choice_Str){
+							if(value && value.len()) wdg->my_set_value(value);
+							else wdg->my_clear();
+						}
+						else if(wdg instanceof Fl_Choice_Int){
+							if(value && value.len()) wdg->my_set_value(value.tointeger());
+							else wdg->my_clear();
+						}
 					}
 					/*
 					else if(classId == Fl_Choice_Str.className()){
@@ -1166,6 +1200,8 @@ class MyEditOrderWindow extends EditOrderWindow {
 		_main_table = "orders";
 		btnCalcDelivery.callback(cb_btnCalcDelivery);
 		btnShowCalendar.callback(cb_btnShowCalendar);
+		btnSearchEntity.callback(cb_btnSearchEntity);
+		print(__LINE__, "db_orders_entity_id :", db_orders_entity_id->x(), db_orders_entity_id->y(), db_orders_entity_id->w(), db_orders_entity_id->h());
 	}
 	function get_record(id){
 		appServer.get_record(_record, _main_table, 0, id, "&with_lines=1");
@@ -1180,6 +1216,11 @@ class MyEditOrderWindow extends EditOrderWindow {
 		local dc = getChildWindow("Calendar", MyCalendarWindow);
 		dc.show();
 	}
+	function cb_btnSearchEntity(sender, udata){
+		this = sender->window();
+		print("Fl_Pack :", pack_line2->x(), pack_line2->y(), pack_line2->w(), pack_line2->h());
+		print("db_orders_entity_id :", db_orders_entity_id->x(), db_orders_entity_id->y(), db_orders_entity_id->w(), db_orders_entity_id->h());
+	}
 }
 
 class OrdersListSearch extends MyListSearchWindow {

ourbiz/utils-fltk.nut

@@ -39,7 +39,6 @@ function setAppFont(fontName)
                         font1 = FL_HELVETICA;
                         font2 = FL_TIMES;
                     }
-                    //print(bit.band(my_font_attr, FL_BOLD), my_font_attr, font1, font2)
                     Fl.set_font(font1, i);
                     Fl.set_font(font2, i);
                     //break
@@ -52,7 +51,6 @@ function setAppFont(fontName)
 function widget_focus_changing_Match(widget){
 	if (widget){
 		local ttype = widget.classId();
-		//print(ttype);
 		if (ttype.find("_Input")) return 1;
 		if (ttype.find("_Browser")) return 2;
 		if (ttype.find("_Tree")) return false;
@@ -66,9 +64,6 @@ function widget_focus_changing_Match(widget){
 }
 		
 function fltk_focus_changing(wfrom, wto){
-	//print(wfrom.classId(), wto.classId());
-	//print(wfrom, wto);
-	
 	if (widget_focus_changing_Match(wfrom)){
 		wfrom.color(FL_WHITE);
 		wfrom.redraw();
@@ -77,7 +72,6 @@ function fltk_focus_changing(wfrom, wto){
 	if (wt) {
 		wto.color(FL_YELLOW);
 		wto.redraw();
-		//if (wt == 1) wto.position(0,10000);
 	}
 	
 	return 0;