add active_filters in HK_foreign_key

David RENÉ
1 parent b28ba961
Showing 16 changed files with 74 additions and 32 deletions Show diff stats
ds_files/graphviz.gv
hayamiki_ds_types.aproj
hayamiki_generator.aproj
hayamiki_lib
src/check.anubis
src/generation/columns.anubis
src/generation/extractor.anubis
src/generation/fields.anubis
src/generation/header.anubis
src/generation/html.anubis
src/generation/icons.anubis
src/generation/json.anubis
src/generation/vt_view.anubis
src/generation/web_args.anubis
src/main.anubis
src/model.3.0.0.anubis
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2018-11-10
- * Time: 17:14:38
+ * Date: 2019-07-14
+ * Time: 16:15:41
  * 
  */
  
@@ -159,6 +159,7 @@ digraph DS {
       <TR><TD  ALIGN="LEFT"><B><FONT COLOR="mediumblue">HK_App_Name</FONT></B></TD><TD  ALIGN="LEFT"  PORT="foreign_key_app_name" >app_name</TD></TR>
       <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">String</FONT></B></TD><TD  ALIGN="LEFT"  PORT="foreign_key_table_name" >table_name</TD></TR>
       <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">List</FONT>(<FONT COLOR="darkviolet">String</FONT>)</B></TD><TD  ALIGN="LEFT"  PORT="foreign_key_searchable_fields" >searchable_fields</TD></TR>
+      <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">List</FONT>(<FONT COLOR="mediumblue">HK_Foreign_Key_Active_Filter</FONT>)</B></TD><TD  ALIGN="LEFT"  PORT="foreign_key_hk_fk_active_filter" >hk_fk_active_filter</TD></TR>
       <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">List</FONT>(<FONT COLOR="mediumblue">HK_Foreign_Key_Clause</FONT>)</B></TD><TD  ALIGN="LEFT"  PORT="foreign_key_hk_fk_clause" >hk_fk_clause</TD></TR>
     <TR><TD COLSPAN="2" VALIGN="MIDDLE"  ALIGN="LEFT"><FONT COLOR="orangered"><B>)</B></FONT></TD></TR>
  
@@ -199,6 +200,7 @@ digraph DS {
   HK_Model_Field:char_field_choices -> HK_Text_Choices:TYPE
   HK_Model_Field:integer_field_choices -> HK_Int_Choices:TYPE
   HK_Model_Field:foreign_key_app_name -> HK_App_Name:TYPE
+  HK_Model_Field:foreign_key_hk_fk_active_filter -> HK_Foreign_Key_Active_Filter:TYPE
   HK_Model_Field:foreign_key_hk_fk_clause -> HK_Foreign_Key_Clause:TYPE
   HK_Model_Field:datetime_field_hk_dt_f_attr -> HK_Datetime_Field_Attr:TYPE
   HK_Model_Field:time_field_hk_dt_f_attr -> HK_Datetime_Field_Attr:TYPE
@@ -256,6 +258,20 @@ digraph DS {
   HK_Foreign_Key_Clause:on_delete_on_delete -> HK_Foreign_Key_Clause_On_Directive:TYPE
  
  
+  HK_Foreign_Key_Active_Filter [ label=<
+  <TABLE BORDER="1" CELLBORDER="0" CELLSPACING="0" CELLPADDING="2"  BGCOLOR="gray95">
+    <TR><TD COLSPAN="2" PORT="TYPE" VALIGN="MIDDLE" ALIGN="CENTER" BGCOLOR="lightblue" ><FONT COLOR="mediumblue"><B>HK_Foreign_Key_Active_Filter</B></FONT></TD></TR>
+
+    <TR><TD COLSPAN="2" PORT="alt:active_filter" VALIGN="MIDDLE" BGCOLOR="bisque"   ALIGN="LEFT"><FONT COLOR="orangered"><B>active_filter (</B></FONT></TD></TR>
+      <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">String</FONT></B></TD><TD  ALIGN="LEFT"  PORT="active_filter_column" >column</TD></TR>
+      <TR><TD  ALIGN="LEFT"><B><FONT COLOR="darkviolet">String</FONT></B></TD><TD  ALIGN="LEFT"  PORT="active_filter_fk_column" >fk_column</TD></TR>
+    <TR><TD COLSPAN="2" VALIGN="MIDDLE"  ALIGN="LEFT"><FONT COLOR="orangered"><B>)</B></FONT></TD></TR>
+
+  </TABLE>
+  >];
+
+
+
   HK_Int_Choices [ label=<
   <TABLE BORDER="1" CELLBORDER="0" CELLSPACING="0" CELLPADDING="2"  BGCOLOR="gray95">
     <TR><TD COLSPAN="2" PORT="TYPE" VALIGN="MIDDLE" ALIGN="CENTER" BGCOLOR="lightblue" ><FONT COLOR="mediumblue"><B>HK_Int_Choices</B></FONT></TD></TR>
@@ -26,6 +26,9 @@
     <Compile Include="hayamiki_ds_types.anubis" />
     <Compile Include="hayamiki_lib\controller\hk_controller.anubis" />
     <Compile Include="hayamiki_lib\controller\hk_delete.anubis" />
+    <Compile Include="hayamiki_lib\controller\hk_rows_import.anubis" />
+    <Compile Include="hayamiki_lib\controller\hk_sql_utils.anubis" />
+    <Compile Include="hayamiki_lib\controller\hk_trigger.anubis" />
     <Compile Include="hayamiki_lib\ds_files\ds_types.anubis" />
     <Compile Include="hayamiki_lib\hk_generator.anubis" />
     <Compile Include="hayamiki_lib\model\app.anubis" />
@@ -39,29 +42,47 @@
     <Compile Include="hayamiki_lib\model\tables.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_app.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_app_name.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_constraint.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_database.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_datetime_field_attr.anubis" />
-    <Compile Include="hayamiki_lib\model\types\hk_display.anubis" />
-    <Compile Include="hayamiki_lib\model\types\hk_edit_view.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_foreign_key_active_filter.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_foreign_key_clause.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_foreign_key_clause_on_directive.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_help_text.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_icon.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_int_choice.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_int_choices.anubis" />
-    <Compile Include="hayamiki_lib\model\types\hk_list_view.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_model.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_model_attr.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_model_column.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_model_field.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_on_conflict.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_phone_field_attr.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_table.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_text_choice.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_text_choices.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_text_field_attr.anubis" />
     <Compile Include="hayamiki_lib\types\hayamiki.anubis" />
+    <Compile Include="hayamiki_lib\view\hk_filter.anubis" />
+    <Compile Include="hayamiki_lib\view\jqgrid.anubis" />
+    <Compile Include="hayamiki_lib\view\load_vtm.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_display.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_editor.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_editor_table.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_filter.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_fk_view.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_form.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_form_entry.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_form_tab.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_form_table.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_view.anubis" />
+    <Compile Include="hayamiki_lib\view\types\hk_viewer.anubis" />
     <Compile Include="hayamiki_lib\view\view_apps_renderer.anubis" />
+    <Compile Include="hayamiki_lib\view\view_editor_renderer.anubis" />
+    <Compile Include="hayamiki_lib\view\view_rows_import.anubis" />
     <Compile Include="hayamiki_lib\view\view_table_manager.anubis" />
     <Compile Include="hayamiki_lib\view\view_table_manager_types.anubis" />
     <Compile Include="hayamiki_lib\view\view_table_renderer.anubis" />
-    <Compile Include="hayamiki_lib\view\view_table_types.anubis" />
     <Compile Include="hayamiki_lib\view\web_action.anubis" />
   </ItemGroup>
   <ItemGroup>
@@ -72,5 +93,6 @@
     <Folder Include="hayamiki_lib\model\types" />
     <Folder Include="hayamiki_lib\types" />
     <Folder Include="hayamiki_lib\view" />
+    <Folder Include="hayamiki_lib\view\types" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
@@ -147,6 +147,7 @@
     <Compile Include="hayamiki_lib\model\types\hk_constraint.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_database.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_datetime_field_attr.anubis" />
+    <Compile Include="hayamiki_lib\model\types\hk_foreign_key_active_filter.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_foreign_key_clause.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_foreign_key_clause_on_directive.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_help_text.anubis" />
@@ -163,9 +164,11 @@
     <Compile Include="hayamiki_lib\model\types\hk_text_choice.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_text_choices.anubis" />
     <Compile Include="hayamiki_lib\model\types\hk_text_field_attr.anubis" />
+    <Compile Include="hayamiki_lib\model\utils.anubis" />
     <Compile Include="hayamiki_lib\types\hayamiki.anubis" />
     <Compile Include="hayamiki_lib\view\hk_filter.anubis" />
     <Compile Include="hayamiki_lib\view\jqgrid.anubis" />
+    <Compile Include="hayamiki_lib\view\load_vtm.anubis" />
     <Compile Include="hayamiki_lib\view\view_apps_renderer.anubis" />
     <Compile Include="hayamiki_lib\view\view_editor_renderer.anubis" />
     <Compile Include="hayamiki_lib\view\view_rows_import.anubis" />
@@ -524,6 +527,7 @@
     <Compile Include="library\xml\basic_xml_parser.anubis" />
     <Compile Include="library\xml\xml_parser.apg.anubis" />
     <Compile Include="src\check.anubis" />
+    <Compile Include="src\generation\anubis.anubis" />
     <Compile Include="src\generation\choices_selector.anubis" />
     <Compile Include="src\generation\columns.anubis" />
     <Compile Include="src\generation\create_table.anubis" />
-Subproject commit 6b95d3a55ad17f9e884442211234e56ffd9735b6
+Subproject commit c6bd97b105cf57b04fe2daf4482ba45e119c7b5d
@@ -42,7 +42,7 @@ define Maybe(HK_Model_Column)
     HK_Model_Column col
   )=
   since col is hk_column(name, type, attrib, help),
-  if type is foreign_key(fk_app, fk_table, fields, fk_clause)  then
+  if type is foreign_key(fk_app, fk_table, fields, active_filter, fk_clause)  then
   //TODO check for searchable fields if exists in foreign table
     with mb_fk_app =  if (fk_app) is
                       {
@@ -59,7 +59,7 @@ define Maybe(HK_Model_Column)
     if mb_fk_app is
     {
       failure           then failure,
-      success(n_fk_app) then success(hk_column(name, foreign_key(if (fk_app) is app_name(_) then app_name(n_fk_app) else fk_app, (if length(n_fk_app)>0 then n_fk_app+"_"else "")+fk_table, fields, fk_clause), attrib, help))
+      success(n_fk_app) then success(hk_column(name, foreign_key(if (fk_app) is app_name(_) then app_name(n_fk_app) else fk_app, (if length(n_fk_app)>0 then n_fk_app+"_"else "")+fk_table, fields, active_filter, fk_clause), attrib, help))
     }
   else
     success(col).
@@ -156,7 +156,7 @@ public define Maybe(String)
                                                 auto_now_add then
                                                   if insert then success(name) else failure
                                               },
-    foreign_key(_,_,_,_)                then success(name),
+    foreign_key(_,_,_,_,_)              then success(name),
     integer_field(_)                    then success(name),
     float_field                         then success(name),
     char_field(_,_)                     then success(name),
@@ -251,12 +251,12 @@ public define Maybe(String)
                                                 auto_now     then success("information(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+".datetime, 18, "+to_Anubis_source(help)+")"),
                                                 auto_now_add then success("information(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+".datetime, 18, "+to_Anubis_source(help)+")")
                                               },
-    foreign_key(app,foreign_table,fields,_)      then
+    foreign_key(app,foreign_table,fields,active_filters,_)      then
                                                   if length(fields) = 0 then
-                                                    success("foreign_text(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+", \""+foreign_table+"\", hk_form_selector(get_selector_"+foreign_table+"), "+to_Anubis_source(help)+")")
+                                                    success("foreign_text(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+", \""+foreign_table+"\", hk_form_selector(get_selector_"+foreign_table+"), "+to_Anubis_source(active_filters)+", "+to_Anubis_source(help)+")")
                                                   else
                                                     with search_fields = join(", ", map((String field) |-> "\""+field+"\"",fields)),
-                                                    success("foreign_text_search(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+", \""+foreign_table+"\", ["+search_fields+"], "+to_Anubis_source(help)+")"),
+                                                    success("foreign_text_search(\""+to_upper(col_name)+"\", \""+col_name+"\", "+type_name+"."+col_name+", \""+foreign_table+"\", ["+search_fields+"], "+to_Anubis_source(active_filters)+", "+to_Anubis_source(help)+")"),
  
     integer_field(choices)              then 
       //success("integer(\""+to_upper(name)+"\", \""+name+"\", "+type_name+"."+name+", "+to_Anubis_source(help)+")"),
@@ -334,7 +334,7 @@ public define String
     date_field(attrs)                   then "to_String("+current_type_name+"."+name+")",
     time_field(attrs)                   then "to_String("+current_type_name+"."+name+")",
     datetime_field(attrs)               then "to_String("+current_type_name+"."+name+")"
-    foreign_key(app,foreign_table,_,_)  then "get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+")",
+    foreign_key(app,foreign_table,_,_,_)  then "get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+")",
     integer_field(_)                    then "to_String("+current_type_name+"."+name+")",
     float_field                         then "float_to_string("+current_type_name+"."+name+",5)",
     char_field(_,_)                     then current_type_name+"."+name,
@@ -25,7 +25,7 @@ public define String
     date_field(_)                       then "db_date(text"+cursor_index+")",
     time_field(_)                       then "db_time(text"+cursor_index+")",
     datetime_field(_)                   then "db_datetime(text"+cursor_index+")",      
-    foreign_key(_,_,_,_)                then "db_id((Int)db_integer"+cursor_index+")",
+    foreign_key(_,_,_,_,_)              then "db_id((Int)db_integer"+cursor_index+")",
     integer_field(_)                    then "(Int)db_integer"+cursor_index,
     float_field                         then "db_float"+cursor_index,
     char_field(_,_)                     then "text"+cursor_index,
@@ -30,7 +30,7 @@ public define String
     date_field(_)                       then "DB_date",
     time_field(_)                       then "DB_time",
     datetime_field(_)                   then "DB_datetime",      
-    foreign_key(_,_,_,_)                then "DB_id",
+    foreign_key(_,_,_,_,_)              then "DB_id",
     integer_field(_)                    then "Int",
     float_field                         then "Float",
     char_field(_,_)                     then "String",
@@ -56,7 +56,7 @@ public define String
     date_field(_)                       then "extern_type(\"DB_date\", \"calexium_lib/database/db_types.anubis\")",
     time_field(_)                       then "extern_type(\"DB_time\", \"calexium_lib/database/db_types.anubis\")",
     datetime_field(_)                   then "extern_type(\"DB_datetime\", \"calexium_lib/database/db_types.anubis\")",      
-    foreign_key(_,_,_,_)                then "extern_type(\"DB_id\", \"calexium_lib/database/db_types.anubis\")",
+    foreign_key(_,_,_,_,_)              then "extern_type(\"DB_id\", \"calexium_lib/database/db_types.anubis\")",
     integer_field(_)                    then "int",
     float_field                         then "float",
     char_field(_,_)                     then "string",
@@ -89,7 +89,7 @@ public define String
     datetime_field(dt_attrs)            then
       with new_attributes = if dt_attrs is auto_now_add then [default("(datetime('now', 'LOCALTIME'))")] else attributes,
       fill("DATETIME", 15) + format_attributes(new_attributes),
-    foreign_key(app,fk,_,fk_clause)     then fill("INTEGER", 15)  + format_attributes(attributes)+" REFERENCES "+fk+"(id) "+format_fk_clause(fk_clause),
+    foreign_key(app,fk,_,_,fk_clause)   then fill("INTEGER", 15)  + format_attributes(attributes)+" REFERENCES "+fk+"(id) "+format_fk_clause(fk_clause),
     integer_field(_)                    then fill("INTEGER", 15)  + format_attributes(attributes),
     float_field                         then fill("DOUBLE", 15)   + format_attributes(attributes), 
     char_field(_,size)                  then fill("VARCHAR("+size+")", 15) + format_attributes(attributes),
@@ -116,7 +116,7 @@ public define String
     date_field(_)                       then "db_date(\"\")",
     time_field(_)                       then "db_time(\"\")",
     datetime_field(_)                   then "db_datetime(\"\")",      
-    foreign_key(_,_,_,_)                then "(DB_id)none",
+    foreign_key(_,_,_,_,_)              then "(DB_id)none",
     integer_field(_)                    then "(Int)0",
     float_field                         then "(Float)0.0",
     char_field(choices,size)            then "\"\"",
@@ -161,7 +161,7 @@ public define String
                                                   else 
                                                     ""
                                               },
-    foreign_key(_,_,_,_)              then "bind_DB_id_or_NULL(\":v_"+name+"\", "+type_name+"."+name+")",
+    foreign_key(_,_,_,_,_)            then "bind_DB_id_or_NULL(\":v_"+name+"\", "+type_name+"."+name+")",
     integer_field(_)                  then "bind_Int(\":v_"+name+"\", "+type_name+"."+name+")",
     float_field                       then "bind_Float(\":v_"+name+"\", "+type_name+"."+name+")",
     char_field(_,_)                   then "bind_String"+or_null+"(\":v_"+name+"\", "+type_name+"."+name+")",
@@ -22,7 +22,7 @@ define Maybe(One)
     []      then  success(unique),
     [h . t] then  
       since h is hk_column(_, type, _, _),
-        if type is foreign_key(app, table_name, _, _) then
+        if type is foreign_key(app, table_name, _, _, _) then
         if write_string(stream, "\nread database/generated/"+table_name+".anubis") is
         {
           failure     then failure,
@@ -98,7 +98,7 @@ public define String
         date_field(attrs)                   then to_HTML_cell_text(column, data_name, general_type_name),
         time_field(attrs)                   then to_HTML_cell_text(column, data_name, general_type_name),
         datetime_field(attrs)               then to_HTML_cell_text(column, data_name, general_type_name),
-        foreign_key(app, foreign_table,_,_) then to_HTML_cell_text(column, data_name, general_type_name),
+        foreign_key(app, foreign_table,_,_,_) then to_HTML_cell_text(column, data_name, general_type_name),
         integer_field(choices)              then to_HTML_cell_text(column, data_name, general_type_name),
         float_field                         then to_HTML_cell_text(column, data_name, general_type_name),
         char_field(choices, size)           then to_HTML_cell_text(column, data_name, general_type_name),
@@ -28,7 +28,7 @@ public define String
     date_field(attrs)                   then icn16_clock,
     time_field(attrs)                   then icn16_clock,
     datetime_field(attrs)               then icn16_clock,
-    foreign_key(app,foreign_table,_,_)  then icn16_question,
+    foreign_key(app,foreign_table,_,_,_)  then icn16_question,
     integer_field(choice)               then icn16_question,
     float_field                         then icn16_question,
     char_field(choice, size)            then icn16_question,
@@ -28,7 +28,7 @@ public define String
     date_field(attrs)                   then "to_JSON_String(to_String("+current_type_name+"."+name+"))",
     time_field(attrs)                   then "to_JSON_String(to_String("+current_type_name+"."+name+"))",
     datetime_field(attrs)               then "to_JSON_String(to_String("+current_type_name+"."+name+"))",
-    foreign_key(app,foreign_table,_,_)  then "to_JSON_String(get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+"))",
+    foreign_key(app,foreign_table,_,_,_)  then "to_JSON_String(get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+"))",
     integer_field(_)                    then current_type_name+"."+name,
     float_field                         then "float_to_string("+current_type_name+"."+name+",5)",
     char_field(_,_)                     then "to_JSON_String("+current_type_name+"."+name+")",
@@ -62,7 +62,7 @@ public define String
     date_field(attrs)                   then "json_member(\""+name+"\", json_string("+current_type_name+"."+name+"))",
     time_field(attrs)                   then "json_member(\""+name+"\", json_string("+current_type_name+"."+name+"))",
     datetime_field(attrs)               then "json_member(\""+name+"\", json_string("+current_type_name+"."+name+"))",
-    foreign_key(app,foreign_table,_,_)  then "json_member(\""+name+"\", if resolve_fk then json_string(get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+"))) else json_int("+current_type_name+"."+name+")",
+    foreign_key(app,foreign_table,_,_,_)  then "json_member(\""+name+"\", if resolve_fk then json_string(get_"+foreign_table+"_show_string(db, "+current_type_name+"."+name+"))) else json_int("+current_type_name+"."+name+")",
     integer_field(_)                    then "json_member(\""+name+"\", json_int("+current_type_name+"."+name+"))",
     float_field                         then "json_member(\""+name+"\", json_float("+current_type_name+"."+name+",5))",
     char_field(_,_)                     then "json_member(\""+name+"\", json_string("+current_type_name+"."+name+"))",
@@ -92,7 +92,7 @@ public define String
     date_field(_)                       then "json_member(\""+name+"\", json_string(text"+cursor_index+"))",
     time_field(_)                       then "json_member(\""+name+"\", json_string(text"+cursor_index+"))",
     datetime_field(_)                   then "json_member(\""+name+"\", json_string(text"+cursor_index+"))",      
-    foreign_key(app,foreign_table,_,_)  then 
+    foreign_key(app,foreign_table,_,_,_)  then 
       "    if resolve_fk then\n"+
       "      json_member(\""+name+"\", json_string(get_"+foreign_table+"_show_string(db, db_id((Int)db_integer"+cursor_index+"))))\n"+
       "    else\n"+
@@ -49,7 +49,7 @@ define String
     date_field(attrs)                   then "date(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")",
     time_field(attrs)                   then "time(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")",
     datetime_field(attrs)               then "datetime(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")",
-    foreign_key(app,foreign_table,_,_)  then "foreign_text(\""+to_upper(name)+"\", \""+name+"\", hk_form_selector(get_selector_"+foreign_table+"), "+to_Anubis_source(help)+")",
+    foreign_key(app,foreign_table,_,active_filters,_)  then "foreign_text(\""+to_upper(name)+"\", \""+name+"\", hk_form_selector(get_selector_"+foreign_table+"), "+to_Anubis_source(help)+")",
     integer_field(choices)              then 
                                           if choices is 
                                           {
@@ -26,7 +26,7 @@ public define String
     date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_date,",
     time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_time,",
     datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_datetime,",      
-    foreign_key(_,_,_,_)              then "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
+    foreign_key(_,_,_,_,_)            then "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
     integer_field(_)                  then "get_Int(lwa, __prefix__+\""+name+"\")",
     float_field                       then "get_Float(lwa, __prefix__+\""+name+"\")",
     char_field(_,_)                   then "get_String(lwa, __prefix__+\""+name+"\")",
@@ -81,7 +81,7 @@ public define String
     date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+")," else "get_dummy_DB_date,",
     time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+")," else "get_dummy_DB_time,",
     datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+")," else "get_dummy_DB_datetime,",      
-    foreign_key(_,_,_,_)              then "get_DB_id(lwa, __prefix__+\""+name+"\"),",
+    foreign_key(_,_,_,_,_)            then "get_DB_id(lwa, __prefix__+\""+name+"\"),",
     integer_field(_)                  then "get_Int(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+"),",
     float_field                       then "get_Float(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+"),",
     char_field(_,_)                   then "get_String(lwa, __prefix__+\""+name+"\", "+to_Anubis_default(col_type)+"),",
@@ -195,7 +195,7 @@ public define String
         auto_now      then  "[field(\""+name+"\", bind_Datetime(\":v_"+name+"\", db_now))]",
         auto_now_add  then  "[]"
       },
-    foreign_key(_,_,_,_)              then //"with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
+    foreign_key(_,_,_,_,_)            then //"with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
       "if get_mb_DB_id(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_DB_id_or_NULL(\":v_"+name+"\", "+name+"))] }"    
     integer_field(_)                  then //"get_Int(lwa, __prefix__+\""+name+"\")",
       "if get_Int(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Int(\":v_"+name+"\", "+name+"))] }"    
@@ -3,7 +3,7 @@
  *   
  * *Title*      Interfacing, generating and controling a database with Anubis
  *   
- * *Copyright*  Copyright © David René 2015-2017. 
+ * *Copyright*  Copyright © David René 2015-2019. 
  *
  *   
  *  
@@ -121,7 +121,7 @@ public define HK_Table   production_production_table =
       [
  
         hk_column("date",           date_field(none),    []), 
-        hk_column("assembler_id",   foreign_key(app_name("staff"),"staff", [], []),   []),
+        hk_column("assembler_id",   foreign_key(app_name("staff"),"staff"),   []),
         hk_column("type_ref_id",    foreign_key("type_number"),   []),
         hk_column("product_ref_id", foreign_key("product_reference"),   []),
         hk_column("site_id",        foreign_key("production_site"),   []),