From 564248284ae93a48b962be3e07c64b9815dd1560 Mon Sep 17 00:00:00 2001 From: YNH Webdev Date: Sat, 11 Jan 2014 01:10:24 +0100 Subject: [PATCH] Add set value to value controls --- .../kernel/input/wsf_checkbox_control.e | 11 ++++++++--- .../kernel/input/wsf_checkbox_list_control.e | 9 +++++++++ .../wsf_js_widget/kernel/input/wsf_file_control.e | 5 +++++ .../wsf_js_widget/kernel/input/wsf_input_control.e | 5 +++++ .../kernel/webcontrol/wsf_form_element_control.e | 5 +++++ .../kernel/webcontrol/wsf_html_control.e | 13 ++++++++++--- .../kernel/webcontrol/wsf_value_control.e | 4 ++++ .../kernel/widgets/wsf_date_picker_control.e | 5 +++++ examples/widgetapp/upload_page.e | 2 +- 9 files changed, 52 insertions(+), 7 deletions(-) diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e index dbb35c61..b72125a4 100644 --- a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e +++ b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_control.e @@ -22,7 +22,7 @@ feature {NONE} -- Initialization make (l, c: STRING) -- Initialize with specified control name, do - make_value_control ( "input") + make_value_control ("input") label := l checked_value := c end @@ -54,9 +54,9 @@ feature --Event handling change_event := e end - handle_callback (cname: LIST[STRING]; event: STRING; event_parameter: detachable ANY) + handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY) do - if Current.control_name.same_string (cname[1]) and attached change_event as cevent then + if Current.control_name.same_string (cname [1]) and attached change_event as cevent then if event.same_string ("change") then cevent.call (Void) end @@ -81,6 +81,11 @@ feature -- Implementation Result := checked end + set_value (v: BOOLEAN) + do + checked := v + end + feature -- Properties label: STRING diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e index 6d9d2aff..1ce6cae5 100644 --- a/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e +++ b/draft/library/wsf_js_widget/kernel/input/wsf_checkbox_list_control.e @@ -48,4 +48,13 @@ feature -- Implementation end end + set_value (v: LIST [STRING]) + do + across + controls as c + loop + c.item.set_value (v.has (c.item.checked_value)) + end + end + end diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e index 4de584b4..43544951 100644 --- a/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e +++ b/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e @@ -146,6 +146,11 @@ feature -- Change end end + set_value (v: detachable WSF_FILE) + do + file := v + end + feature -- Properties disabled: BOOLEAN diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e index 5c5b8a5c..bfe25d64 100644 --- a/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e +++ b/draft/library/wsf_js_widget/kernel/input/wsf_input_control.e @@ -110,6 +110,11 @@ feature -- Implementation Result := text end + set_value (v: STRING) + do + text := v + end + feature -- Properties disabled: BOOLEAN diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e index 9cbbd50a..a3786a3b 100644 --- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e +++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_form_element_control.e @@ -71,6 +71,11 @@ feature -- Access Result := value_control.value end + set_value (v: G) + do + value_control.set_value (v) + end + feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management load_state (new_states: JSON_OBJECT) diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e index 59998e00..5e460fec 100644 --- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e +++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_html_control.e @@ -10,7 +10,9 @@ class inherit WSF_VALUE_CONTROL [STRING] - rename make as make_value_control end + rename + make as make_value_control + end create make @@ -20,7 +22,7 @@ feature {NONE} -- Initialization make (t, v: STRING) -- Initialize do - make_value_control ( t) + make_value_control (t) html := v end @@ -43,7 +45,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- State management feature --Event handling - handle_callback (cname: LIST[STRING]; event: STRING; event_parameter: detachable ANY) + handle_callback (cname: LIST [STRING]; event: STRING; event_parameter: detachable ANY) do end @@ -68,6 +70,11 @@ feature -- Implementation Result := html end + set_value (v: STRING) + do + html := v + end + feature -- Properties html: STRING diff --git a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e index 3b63e59b..44b940c0 100644 --- a/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e +++ b/draft/library/wsf_js_widget/kernel/webcontrol/wsf_value_control.e @@ -18,4 +18,8 @@ feature -- Access deferred end + set_value (v: G) + deferred + end + end diff --git a/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e b/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e index 290649d0..ab96e84f 100644 --- a/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e +++ b/draft/library/wsf_js_widget/kernel/widgets/wsf_date_picker_control.e @@ -54,6 +54,11 @@ feature -- Implementation Result := input.value end + set_value (v: STRING) + do + input.set_value (v) + end + feature -- Properties input: WSF_INPUT_CONTROL diff --git a/examples/widgetapp/upload_page.e b/examples/widgetapp/upload_page.e index c42d00ee..3504a126 100644 --- a/examples/widgetapp/upload_page.e +++ b/examples/widgetapp/upload_page.e @@ -8,7 +8,7 @@ class UPLOAD_PAGE inherit - + BASE_PAGE redefine initialize_controls