backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'widget_grid' into widget

Browse Source 
Conflicts:
	examples/widgetapp/widget.coffee
	examples/widgetapp/widget.js
This commit is contained in:
YNH Webdev
2013-09-15 14:04:45 +02:00
parent 45e3a6d7cc 1ba9792547
commit 81952e7898
32 changed files with 963 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
library/server/wsf_html/webcontrol/grid/wsf_datasource.e
View File

@@ -7,14 +7,28 @@ note
deferred class
WSF_DATASOURCE [G -> WSF_ENTITY]
feature -- Update event
set_on_update_agent (f: PROCEDURE [ANY, TUPLE []])
do
on_update_agent := f
end
update
do
if attached on_update_agent as a then
a.call ([])
end
end
on_update_agent: detachable PROCEDURE [ANY, TUPLE []]
feature --State
state: JSON_OBJECT
-- Return state which contains the current html and if there is an event handle attached
do
create Result.make
Result.put (create {JSON_NUMBER}.make_integer (page), create {JSON_STRING}.make_json ("page"))
Result.put (create {JSON_NUMBER}.make_integer (page_size), create {JSON_STRING}.make_json ("page_size"))
if attached sort_column as a_sort_column then
Result.put (create {JSON_STRING}.make_json (a_sort_column), create {JSON_STRING}.make_json ("sort_column"))
else
@@ -43,16 +57,6 @@ feature --State
feature
set_page (a_page: like page)
do
page := a_page
end
set_page_size (a_page_size: like page_size)
do
page_size := a_page_size
end
set_sort_column (a_sort_column: like sort_column)
do
sort_column := a_sort_column

70
library/server/wsf_html/webcontrol/grid/wsf_grid_control.e
View File

@@ -9,7 +9,10 @@ class
inherit
WSF_CONTROL
WSF_REPEATER_CONTROL [G]
redefine
render
end
create
make_grid
@@ -18,40 +21,23 @@ feature {NONE}
make_grid (n: STRING; a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G])
do
make_control (n, "div")
make_repeater (n, a_datasource)
columns := a_columns
datasource := a_datasource
end
feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
update
do
end
set_state (new_state: JSON_OBJECT)
-- Restore html from json
do
if attached {JSON_OBJECT} new_state.item (create {JSON_STRING}.make_json ("datasource")) as datasource_state then
datasource.set_state (datasource_state)
end
end
state: JSON_OBJECT
-- Return state which contains the current html and if there is an event handle attached
do
create Result.make
Result.put (datasource.state, create {JSON_STRING}.make_json ("datasource"))
end
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING)
do
end
feature -- Implementation
render_item (item: G): STRING
do
Result := ""
across
columns as c
loop
Result.append (render_tag_with_tagname ("td", c.item.render_column (item), "", ""))
end
Result := render_tag_with_tagname ("tr", Result, "", "")
end
render_header: STRING
do
Result := ""
@@ -63,34 +49,22 @@ feature -- Implementation
Result := render_tag_with_tagname ("thead", render_tag_with_tagname ("tr", Result, "", ""), "", "")
end
render_body: STRING
render: STRING
local
row: STRING
table: STRING
do
table := render_tag_with_tagname ("table", render_header + render_tag_with_tagname ("tbody", render_body, "", ""), "", "table table-striped")
Result := ""
across
datasource.data as entity
controls as c
loop
row := ""
across
columns as c
loop
row.append (render_tag_with_tagname ("td", c.item.render_column (entity.item), "", ""))
end
Result.append (render_tag_with_tagname ("tr", row, "", ""))
Result := c.item.render + Result
end
Result := render_tag_with_tagname ("tbody", Result, "", "")
end
render: STRING
do
Result := render_tag (render_tag_with_tagname ("table", render_header + render_body, "", "table table-striped"), "")
Result := render_tag (table + Result, "")
end
feature
columns: ITERABLE [WSF_GRID_COLUMN]
datasource: WSF_DATASOURCE [G]
end

38
library/server/wsf_html/webcontrol/grid/wsf_grid_image_column.e Normal file
View File

@@ -0,0 +1,38 @@
note
description: "Summary description for {WSF_GRID_IMAGE_COLUMN}."
author: ""
date: "$Date$"
revision: "$Revision$"
class
WSF_GRID_IMAGE_COLUMN
inherit
WSF_GRID_COLUMN
redefine
render_column
end
create
make_image_column
feature {NONE}
make_image_column (a_header, a_field: STRING)
do
make_column (a_header, a_field)
end
feature
render_column (e: WSF_ENTITY): STRING
do
if attached e.get (field_name) as data then
Result := "<img src=%"" + data.out + "%" />"
else
Result := "[VOID]"
end
end
end

77
library/server/wsf_html/webcontrol/grid/wsf_pagable_datasource.e Normal file
View File

@@ -0,0 +1,77 @@
note
description: "Summary description for {WSF_PAGABLE}."
author: ""
date: "$Date$"
revision: "$Revision$"
deferred class
WSF_PAGABLE_DATASOURCE [G -> WSF_ENTITY]
inherit
WSF_DATASOURCE [G]
redefine
state,
set_state,
update
end
feature -- Update event
set_on_update_page_agent (f: PROCEDURE [ANY, TUPLE []])
do
on_update_page_agent := f
end
update
do
if attached on_update_agent as a then
a.call ([])
end
if attached on_update_page_agent as a then
a.call ([])
end
end
on_update_page_agent: detachable PROCEDURE [ANY, TUPLE []]
feature --States
state: JSON_OBJECT
-- Return state which contains the current html and if there is an event handle attached
do
Result := Precursor
Result.put (create {JSON_NUMBER}.make_integer (page), create {JSON_STRING}.make_json ("page"))
Result.put (create {JSON_NUMBER}.make_integer (page_size), create {JSON_STRING}.make_json ("page_size"))
Result.put (create {JSON_NUMBER}.make_integer (row_count), create {JSON_STRING}.make_json ("row_count"))
end
set_state (new_state: JSON_OBJECT)
do
Precursor (new_state)
if attached {JSON_NUMBER} new_state.item (create {JSON_STRING}.make_json ("page")) as new_page then
page := new_page.item.to_integer
end
if attached {JSON_NUMBER} new_state.item (create {JSON_STRING}.make_json ("page_size")) as new_page_size then
page_size := new_page_size.item.to_integer
end
if attached {JSON_NUMBER} new_state.item (create {JSON_STRING}.make_json ("row_count")) as new_row_count then
row_count := new_row_count.item.to_integer
end
end
feature
set_page (p: INTEGER)
do
page := p.min (page_count).max (1)
end
row_count: INTEGER
page_count: INTEGER
do
Result := (row_count / page_size).ceiling
end
end

92
library/server/wsf_html/webcontrol/grid/wsf_pagination_control.e Normal file
View File

@@ -0,0 +1,92 @@
note
description: "Summary description for {WSF_PAGINATION}."
author: ""
date: "$Date$"
revision: "$Revision$"
class
WSF_PAGINATION_CONTROL [G -> WSF_ENTITY]
inherit
WSF_CONTROL
create
make_paging
feature {NONE}
make_paging (n: STRING; ds: WSF_PAGABLE_DATASOURCE [G])
do
make_control (n, "ul")
add_class ("pagination")
datasource := ds
datasource.set_on_update_page_agent (agent update)
end
feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
state: JSON_OBJECT
-- Return state which contains the current html and if there is an event handle attached
do
create Result.make
end
set_state (new_state: JSON_OBJECT)
do
end
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
if Current.control_name.is_equal (cname) then
if event.is_equal ("next") then
datasource.set_page (datasource.page + 1)
elseif event.is_equal ("prev") then
datasource.set_page (datasource.page - 1)
elseif event.is_equal ("goto") then
if attached event_parameter as p and then attached p.to_integer as i then
datasource.set_page (i)
end
end
datasource.update
end
end
feature
update
do
state_changes.replace (create {JSON_STRING}.make_json (render), create {JSON_STRING}.make_json ("_html"))
end
render: STRING
local
paging_start: INTEGER
paging_end: INTEGER
cssclass: STRING
do
Result := render_tag_with_tagname ("li", render_tag_with_tagname ("a", "&laquo;", "href=%"#%" data-nr=%"prev%"", ""), "", "")
paging_start := (datasource.page - 4).max (1)
paging_end := (paging_start + 8).min (datasource.page_count)
paging_start := (paging_end - 8).max (1)
across
paging_start |..| paging_end as n
loop
if n.item = datasource.page then
cssclass := "active"
else
cssclass := ""
end
Result := Result + render_tag_with_tagname ("li", render_tag_with_tagname ("a", n.item.out, "href=%"#%" data-nr=%"" + n.item.out + "%"", ""), "", cssclass)
end
Result := Result + render_tag_with_tagname ("li", render_tag_with_tagname ("a", "&raquo;", "href=%"#%" data-nr=%"next%"", ""), "", "")
Result := render_tag (Result, "")
end
feature
datasource: WSF_PAGABLE_DATASOURCE [G]
end

100
library/server/wsf_html/webcontrol/grid/wsf_repeater_control.e Normal file
View File

@@ -0,0 +1,100 @@
note
description: "Summary description for {WSF_REPEATER_CONTROL}."
author: ""
date: "$Date$"
revision: "$Revision$"
deferred class
WSF_REPEATER_CONTROL [G -> WSF_ENTITY]
inherit
WSF_MULTI_CONTROL [WSF_STATELESS_CONTROL]
redefine
set_state,
state,
handle_callback,
render
end
feature {NONE}
make_repeater (n: STRING; a_datasource: WSF_DATASOURCE [G])
do
make_multi_control (n)
datasource := a_datasource
datasource.set_on_update_agent (agent update)
if attached {WSF_PAGABLE_DATASOURCE [G]} a_datasource as ds then
create pagination_control.make_paging (n + "_paging", ds)
add_control (pagination_control)
end
end
feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
update
do
state_changes.replace (create {JSON_STRING}.make_json (render_body), create {JSON_STRING}.make_json ("_body"))
state_changes.replace (datasource.state, create {JSON_STRING}.make_json ("datasource"))
end
set_state (new_state: JSON_OBJECT)
-- Restore html from json
do
if attached {JSON_OBJECT} new_state.item (create {JSON_STRING}.make_json ("datasource")) as datasource_state then
datasource.set_state (datasource_state)
end
end
state: JSON_OBJECT
-- Return state which contains the current html and if there is an event handle attached
do
create Result.make
Result.put (datasource.state, create {JSON_STRING}.make_json ("datasource"))
end
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
Precursor (cname, event, event_parameter)
end
feature -- Implementation
render_item (item: G): STRING
deferred
end
render_body: STRING
do
Result := ""
across
datasource.data as entity
loop
Result.append (render_item (entity.item))
end
end
render: STRING
local
content: STRING
do
content := render_tag_with_tagname ("div", render_body, "", "repeater_content")
Result := ""
across
controls as c
loop
Result := c.item.render + Result
end
-- Fix generator name since the user will extend this class to define item_render
Result := render_tag_with_generator_name ("WSF_REPEATER_CONTROL", content + Result, "")
end
feature
datasource: WSF_DATASOURCE [G]
pagination_control: detachable WSF_PAGINATION_CONTROL [G]
end

4
library/server/wsf_html/webcontrol/input/wsf_autocomplete_control.e
View File

@@ -45,9 +45,9 @@ feature -- State
feature -- Callback
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
Precursor {WSF_INPUT_CONTROL} (cname, event)
Precursor {WSF_INPUT_CONTROL} (cname, event, event_parameter)
if cname.is_equal (control_name) and event.is_equal ("autocomplete") then
state_changes.put (create_json_list.item ([text]), create {JSON_STRING}.make_json ("suggestions"))
end

2
library/server/wsf_html/webcontrol/input/wsf_checkbox_control.e
View File

@@ -50,7 +50,7 @@ feature --EVENT HANDLING
change_event := e
end
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
if Current.control_name.is_equal (cname) and attached change_event as cevent then
if event.is_equal ("change") then

2
library/server/wsf_html/webcontrol/input/wsf_input_control.e
View File

@@ -49,7 +49,7 @@ feature --EVENT HANDLING
change_event := e
end
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
if Current.control_name.is_equal (cname) and attached change_event as cevent then
if event.is_equal ("change") then

40
library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e
View File

@@ -12,14 +12,20 @@ inherit
WSF_CONTROL
create
make_progress
make_progress, make_progress_with_source
feature {NONE} -- Initialization
make_progress (n: STRING; p: WSF_PROGRESSSOURCE)
make_progress (n: STRING)
do
make_control (n, "div")
add_class ("progress")
progress := 0
end
make_progress_with_source (n: STRING; p: WSF_PROGRESSSOURCE)
do
make_progress (n)
progress_source := p
end
@@ -32,15 +38,15 @@ feature -- State handling
state: JSON_OBJECT
do
create Result.make
Result.put (create {JSON_NUMBER}.make_integer (progress_source.progress), "progress")
Result.put (create {JSON_NUMBER}.make_integer (progress_value), "progress")
end
feature -- Event handling
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
if cname.is_equal (control_name) and event.is_equal ("progress_fetch") then
state_changes.put (create {JSON_NUMBER}.make_integer (progress_source.progress), create {JSON_STRING}.make_json ("progress"))
state_changes.put (create {JSON_NUMBER}.make_integer (progress_value), create {JSON_STRING}.make_json ("progress"))
end
end
@@ -48,12 +54,32 @@ feature -- Rendering
render: STRING
do
Result := render_tag_with_tagname ("div", "", "role=%"progressbar%" aria-valuenow=%"" + progress_source.progress.out + "%" aria-valuemin=%"0%" aria-valuemax=%"100%" style=%"width: " + progress_source.progress.out + "%%;%"", "progress-bar")
Result := render_tag_with_tagname ("div", "", "role=%"progressbar%" aria-valuenow=%"" + progress_value.out + "%" aria-valuemin=%"0%" aria-valuemax=%"100%" style=%"width: " + progress_value.out + "%%;%"", "progress-bar")
Result := render_tag (Result, "")
end
feature --Change progress
set_progress (p: INTEGER)
require
no_progress_source: not (attached progress_source)
do
progress := p
state_changes.put (create {JSON_NUMBER}.make_integer (progress), create {JSON_STRING}.make_json ("progress"))
end
feature
progress_source: WSF_PROGRESSSOURCE
progress_source: detachable WSF_PROGRESSSOURCE
progress: INTEGER
progress_value: INTEGER
do
Result := progress
if attached progress_source as ps then
Result := ps.progress
end
end
end

10
library/server/wsf_html/webcontrol/wsf_basic_control.e
View File

@@ -12,7 +12,8 @@ inherit
WSF_STATELESS_CONTROL
create
make_control
make_control,
make_with_body
feature {NONE} -- Initialization
@@ -27,6 +28,13 @@ feature {NONE} -- Initialization
content := ""
end
make_with_body (t,attr,a_content: STRING)
do
make (t)
attributes := attr
content := a_content
end
feature -- Rendering
render: STRING

2
library/server/wsf_html/webcontrol/wsf_button_control.e
View File

@@ -50,7 +50,7 @@ feature --EVENT HANDLING
click_event := e
end
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
if Current.control_name.is_equal (cname) and attached click_event as cevent then
cevent.call ([])

11
library/server/wsf_html/webcontrol/wsf_control.e
View File

@@ -1,4 +1,4 @@
note
note
description: "Summary description for {WSF_CONTROL}."
author: ""
date: "$Date$"
@@ -68,6 +68,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
feature -- Rendering
render_tag (body, attrs: STRING): STRING
do
Result:=render_tag_with_generator_name (generator, body, attrs)
end
render_tag_with_generator_name (a_generator, body, attrs: STRING): STRING
local
css_classes_string: STRING
l_attributes: STRING
@@ -78,13 +83,13 @@ feature -- Rendering
loop
css_classes_string := css_classes_string + " " + c.item
end
l_attributes := "id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + generator + "%" " + attrs
l_attributes := "id=%"" + control_name + "%" data-name=%"" + control_name + "%" data-type=%"" + a_generator + "%" " + attrs
Result := render_tag_with_tagname (tag_name, body, l_attributes, css_classes_string)
end
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
-- Method called if any callback received. In this method you can route the callback to the event handler
deferred
end

5
library/server/wsf_html/webcontrol/wsf_form_element_control.e
View File

@@ -41,7 +41,6 @@ feature {NONE}
if attached {WSF_HTML_CONTROL} c then
c.add_class ("form-control-static")
end
value_control := c
validators := v
label := a_label
@@ -94,7 +93,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
-- Pass callback to subcontrols
do
if equal (cname, control_name) then
@@ -102,7 +101,7 @@ feature --EVENT HANDLING
validate
end
else
value_control.handle_callback (cname, event)
value_control.handle_callback (cname, event, event_parameter)
end
end

2
library/server/wsf_html/webcontrol/wsf_html_control.e
View File

@@ -41,7 +41,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
do
end

19
library/server/wsf_html/webcontrol/wsf_multi_control.e
View File

@@ -48,16 +48,11 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
end
set_state (new_state: JSON_OBJECT)
-- Before we process the callback. We restore the state of control.
do
across
controls as c
loop
if attached {WSF_CONTROL} c.item as cont then
cont.set_state (new_state)
end
end
end
read_state (states: JSON_OBJECT)
-- Read states in subcontrols
do
@@ -92,7 +87,7 @@ feature {WSF_PAGE_CONTROL, WSF_CONTROL} -- STATE MANAGEMENT
feature --EVENT HANDLING
handle_callback (cname: STRING; event: STRING)
handle_callback (cname: STRING; event: STRING; event_parameter: detachable STRING)
-- Pass callback to subcontrols
do
if equal (cname, control_name) then
@@ -101,7 +96,7 @@ feature --EVENT HANDLING
controls as c
loop
if attached {WSF_CONTROL} c.item as cont then
cont.handle_callback (cname, event)
cont.handle_callback (cname, event, event_parameter)
end
end
end
@@ -120,9 +115,11 @@ feature
Result := render_tag (Result, "")
end
add_control (c: G)
add_control (c: detachable G)
do
controls.put_front (c)
if attached c as d then
controls.put_front (d)
end
end
controls: LINKED_LIST [G]

8
library/server/wsf_html/webcontrol/wsf_page_control.e
View File

@@ -43,6 +43,7 @@ feature
-- If request is not a callback. Run process and render the html page
local
event: detachable STRING
event_parameter: detachable STRING
control_name: detachable STRING
states: detachable STRING
states_changes: JSON_OBJECT
@@ -50,13 +51,14 @@ feature
do
control_name := get_parameter ("control_name")
event := get_parameter ("event")
event_parameter := get_parameter ("event_parameter")
states := get_parameter ("states")
if attached event and attached control_name and attached control and attached states then
create json_parser.make_parser (states)
if attached {JSON_OBJECT} json_parser.parse_json as sp then
control.load_state (sp)
end
control.handle_callback (control_name, event)
control.handle_callback (control_name, event, event_parameter)
create states_changes.make
control.read_state_changes (states_changes)
response.put_header ({HTTP_STATUS_CODE}.ok, <<["Content-Type", "application/json"]>>)
@@ -74,14 +76,14 @@ feature
page: WSF_PAGE_RESPONSE
states: JSON_OBJECT
do
create states.make
control.read_state (states)
data := "<html><head>"
data.append ("<link href=%"/bootstrap.min.css%" rel=%"stylesheet%">")
data.append ("<link href=%"/widget.css%" rel=%"stylesheet%">")
data.append ("</head><body>")
data.append (control.render)
data.append ("<script type=%"text/javascript%">window.states=")
create states.make
control.read_state (states)
data.append (states.representation)
data.append (";</script>")
data.append ("<script src=%"//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js%"></script>")