From fccb6776b0d3c7b4b19223016661691219a86aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20M=C3=BCnger?= <souvarin.m@gmail.com>
Date: Sun, 15 Sep 2013 23:47:04 +0200
Subject: [PATCH] Fixed progressbar

---
 .../progress/increasing_progresssource.e      | 20 +++++++++++++------
 examples/widgetapp/sample_page.e              |  5 ++++-
 examples/widgetapp/widget.coffee              |  6 ++++--
 examples/widgetapp/widget.js                  |  8 +++++---
 .../progressbar/wsf_progress_control.e        |  3 +++
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/examples/widgetapp/progress/increasing_progresssource.e b/examples/widgetapp/progress/increasing_progresssource.e
index 0d884713..f62b2acd 100644
--- a/examples/widgetapp/progress/increasing_progresssource.e
+++ b/examples/widgetapp/progress/increasing_progresssource.e
@@ -16,20 +16,28 @@ create
 
 feature {NONE} -- Initialization
 
-	progress_value: INTEGER
+	control: detachable WSF_PROGRESS_CONTROL
 
-	make
+	make ()
 		do
-			progress_value := 0
 		end
 
 feature -- Implementation
 
+	set_control (c: WSF_PROGRESS_CONTROL)
+		do
+			control := c
+		end
+
 	progress: INTEGER
 		do
-			Result := progress_value
-			if progress_value < 100 then
-				progress_value := progress_value + 1
+			if attached control as c then
+				Result := c.progress
+				if c.progress < 100 then
+					Result := Result + 1
+				end
+			else
+				Result := 0
 			end
 		end
 
diff --git a/examples/widgetapp/sample_page.e b/examples/widgetapp/sample_page.e
index 6c797e4a..a2ca8cec 100644
--- a/examples/widgetapp/sample_page.e
+++ b/examples/widgetapp/sample_page.e
@@ -27,6 +27,7 @@ feature
 			n4_container: WSF_FORM_ELEMENT_CONTROL [STRING]
 			n5_container: WSF_FORM_ELEMENT_CONTROL [STRING]
 			cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING]]
+			source: INCREASING_PROGRESSSOURCE
 		do
 			Precursor
 			create form.make_form_control ("panel")
@@ -75,7 +76,9 @@ feature
 
 				--Progress bar
 			container.add_control (create {WSF_BASIC_CONTROL}.make_with_body("h4","","Number1/Number2"))
-			create progress.make_progress_with_source ("progress1", create {INCREASING_PROGRESSSOURCE}.make)
+			create source.make
+			create progress.make_progress_with_source ("progress1", source)
+			source.set_control (progress)
 			container.add_control (progress)
 		end
 
diff --git a/examples/widgetapp/widget.coffee b/examples/widgetapp/widget.coffee
index 7a97c246..fc1fb612 100644
--- a/examples/widgetapp/widget.coffee
+++ b/examples/widgetapp/widget.coffee
@@ -24,6 +24,7 @@ trigger_callback = (control_name,event,event_parameter)->
     for name,state of new_states
       controls[name]?.update(state)
     return
+
 class WSF_VALIDATOR
   constructor: (@parent_control, @settings)->
     @error = @settings.error
@@ -256,13 +257,14 @@ class WSF_PROGRESS_CONTROL extends WSF_CONTROL
 
   attach_events:() ->
     self = @
-    setInterval(@fetch, 1000)
+    runfetch= ()->
+            self.fetch()
+    setInterval(runfetch, 100)
 
   fetch: ()->
     trigger_callback(@control_name, 'progress_fetch')
 
   update: (state)->
-    alert('update')
     if state.progress?
       window.states[@control_name]['progress'] = state.progress
       @$el.children('.progress-bar').attr('aria-valuenow', state.progress).width(state.progress + '%')
diff --git a/examples/widgetapp/widget.js b/examples/widgetapp/widget.js
index 6c8fe004..c1d2e318 100644
--- a/examples/widgetapp/widget.js
+++ b/examples/widgetapp/widget.js
@@ -478,9 +478,12 @@
     }
 
     WSF_PROGRESS_CONTROL.prototype.attach_events = function() {
-      var self;
+      var runfetch, self;
       self = this;
-      return setInterval(this.fetch, 1000);
+      runfetch = function() {
+        return self.fetch();
+      };
+      return setInterval(runfetch, 100);
     };
 
     WSF_PROGRESS_CONTROL.prototype.fetch = function() {
@@ -488,7 +491,6 @@
     };
 
     WSF_PROGRESS_CONTROL.prototype.update = function(state) {
-      alert('update');
       if (state.progress != null) {
         window.states[this.control_name]['progress'] = state.progress;
         return this.$el.children('.progress-bar').attr('aria-valuenow', state.progress).width(state.progress + '%');
diff --git a/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e b/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e
index 0012a372..1d5f7779 100644
--- a/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e
+++ b/library/server/wsf_html/webcontrol/progressbar/wsf_progress_control.e
@@ -33,6 +33,9 @@ feature -- State handling
 
 	set_state (new_state: JSON_OBJECT)
 		do
+			if attached {JSON_NUMBER} new_state.item (create {JSON_STRING}.make_json ("progress")) as new_progress then
+				progress := new_progress.item.to_integer
+			end
 		end
 
 	state: JSON_OBJECT