aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2012-03-23 14:56:45 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-03-23 14:56:45 +0100
commit5c31946735f90b86f92fc957334b96730cffb655 (patch)
tree4360cfde5b201d6ae23667708198ee3f1d7e5bdc
parent3fb1d74dffd126435a463e195375dd49f9400c7d (diff)
webapp: Move ProcedureWidget code to one place
-rw-r--r--WebApp.st77
1 files changed, 38 insertions, 39 deletions
diff --git a/WebApp.st b/WebApp.st
index 2349501..694b539 100644
--- a/WebApp.st
+++ b/WebApp.st
@@ -106,8 +106,46 @@ Iliad.ILWidget subclass: ProcedureWidget [
self lightbox: (ErrorWidget initWith: aName, ' could not be started.')
]
]
+
+ showStatus: item on: form [
+ | status |
+ status := item isComplete
+ ifTrue: [
+ item mainProc success
+ ifTrue: [item mainProc name, ' completed with success']
+ ifFalse: [item mainProc name, ' completed with failure'].
+ ]
+ ifFalse: [
+ item mainProc name, ' in-progress'
+ ].
+
+ form text: status.
+ form button
+ text: 'Remove';
+ action: [self markDirty.
+ item isComplete
+ ifFalse: [
+ item sendClearRequest.
+ ].
+ self session procedures remove: item.].
+ ]
+
+ contents [
+ ^ [:e | | procs |
+ e a
+ action: [self markDirty];
+ text: 'Refresh Procedures'.
+
+ procs := self session procedures.
+ procs do: [:each |
+ e form build: [:form |
+ self showStatus: each on: form.]
+ ]
+ ]
+ ]
]
+
ProcedureWidget subclass: LUWidget [
contents [
^ [:e |
@@ -150,45 +188,6 @@ ProcedureWidget subclass: USSDWidget [
]
]
-Iliad.ILWidget subclass: ProcedureWidget [
- showStatus: item on: form [
- | status |
- status := item isComplete
- ifTrue: [
- item mainProc success
- ifTrue: [item mainProc name, ' completed with success']
- ifFalse: [item mainProc name, ' completed with failure'].
- ]
- ifFalse: [
- item mainProc name, ' in-progress'
- ].
-
- form text: status.
- form button
- text: 'Remove';
- action: [self markDirty.
- item isComplete
- ifFalse: [
- item sendClearRequest.
- ].
- self session procedures remove: item.].
- ]
-
- contents [
- ^ [:e | | procs |
- e a
- action: [self markDirty];
- text: 'Refresh Procedures'.
-
- procs := self session procedures.
- procs do: [:each |
- e form build: [:form |
- self showStatus: each on: form.]
- ]
- ]
- ]
-]
-
Iliad.ILSession subclass: GSMTestphoneSession [
| user gsmConfig procedures |