Skip to content

Commit

Permalink
URI param returnuri defines that in the last step (goodbye), if the…
Browse files Browse the repository at this point in the history 
… profile is complete, the browser redirects to the given uri.
  • Loading branch information
Szaby Grünwald committed Mar 15, 2013
1 parent 22455ff commit a1ef92d
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 16 deletions.
6 changes: 3 additions & 3 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html><html><head><title>README</title><meta http-equiv="Content-Type" content="text/html" charset="UTF-8"><link rel="stylesheet" media="all" href="./docco.css"></head><body><div id="container"><div id="background"></div><div id="jump_to">Jump To &hellip;<div id="jump_wrapper"><div id="jump_page"><a href="./index.html" class="source"><span class="file_name">README</span></a><a href="./lib/capkomsymbolwidget/capkomsymbolwidget.coffee.html" class="source "><span class="base_path">lib / capkomsymbolwidget / </span><span class="file_name">capkomsymbolwidget.coffee</span></a><a href="./lib/explain/explain.coffee.html" class="source "><span class="base_path">lib / explain / </span><span class="file_name">explain.coffee</span></a><a href="./lib/sizedetect/sizedetect.coffee.html" class="source "><span class="base_path">lib / sizedetect / </span><span class="file_name">sizedetect.coffee</span></a><a href="./lib/ttswidget/ttswidget.coffee.html" class="source "><span class="base_path">lib / ttswidget / </span><span class="file_name">ttswidget.coffee</span></a><a href="./lib/wordmatch/wordmatch.coffee.html" class="source "><span class="base_path">lib / wordmatch / </span><span class="file_name">wordmatch.coffee</span></a><a href="./src/fontsizewidget.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">fontsizewidget.coffee</span></a><a href="./src/navigation.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">navigation.coffee</span></a><a href="./src/profile.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">profile.coffee</span></a><a href="./src/stages.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">stages.coffee</span></a><a href="./src/symbolset.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">symbolset.coffee</span></a><a href="./src/symbolsets.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">symbolsets.coffee</span></a><a href="./src/thememap.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">thememap.coffee</span></a><a href="./src/wizard.coffee.html" class="source "><span class="base_path">src / </span><span class="file_name">wizard.coffee</span></a></div></div></div><table cellpadding="0" cellspacing="0"><thead><tr><th class="docs"></th><th class="code"></th></tr></thead><tbody><tr id="section"><td class="docs"><h1>CapkomWizard
</h1><p>Wizard to create a user profile for making the visualisation of a site accessible/usable/understandable for people with cognitive difficulties.</p><h3>Version</h3><p>0.2.0</p><h3>Author</h3><p><span class="gravatar"><img src="http://www.gravatar.com/avatar/225267813448c9526a9875cc98a95137"/><span>Szaby Grünwald &lt;szaby.gruenwald@salzburgresearch.at&gt;</span></span></p><h3>Dependencies </h3><ul><li><b>jquery </b><span>&gt;=1.5.0</span></li><li><b>mysql </b><span>~0.9.6</span></li><li><b>jugglingdb </b><span>~0.1.9</span></li><li><b>nodext </b><span>~0.1.2</span></li><li><b>express </b><span>~2.5.9</span></li></ul><p><h3>Stats</h3><pre class="code_stats">
http://cloc.sourceforge.net v 1.55 T=0.5 s (26.0 files/s, 6116.0 lines/s)
http://cloc.sourceforge.net v 1.55 T=0.5 s (26.0 files/s, 6130.0 lines/s)
-------------------------------------------------------------------------------
Language files blank comment code
-------------------------------------------------------------------------------
CoffeeScript 13 186 282 2590
CoffeeScript 13 185 282 2598
-------------------------------------------------------------------------------
SUM: 13 186 282 2590
SUM: 13 185 282 2598
-------------------------------------------------------------------------------
</pre></p></td><td id="content" class="code"><h1>CapKom Wizard</h1>

Expand Down
19 changes: 13 additions & 6 deletions docs/src/stages.coffee.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,31 +425,38 @@
<span class="nx">db</span><span class="p">.</span><span class="nx">info</span> <span class="nv">success: </span><span class="nf">(data) -&gt;</span>
<span class="nx">Capkom</span><span class="p">.</span><span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&#39;view data&#39;</span><span class="p">,</span> <span class="nx">data</span><span class="p">.</span><span class="nx">doc_count</span>
<span class="nx">cb</span> <span class="s">&quot;UT-</span><span class="si">#{</span><span class="nx">data</span><span class="p">.</span><span class="nx">doc_count</span><span class="si">}</span><span class="s">&quot;</span>
<span class="nv">Capkom.saveTestData = </span><span class="nf">(doc) -&gt;</span>
<span class="nv">Capkom.saveTestData = </span><span class="nf">(doc, cb) -&gt;</span>
<span class="nv">logEl = </span><span class="nx">jQuery</span><span class="p">(</span><span class="s">&#39;#log&#39;</span><span class="p">)</span>
<span class="nv">saveErr = </span><span class="nf">(msg) -&gt;</span>
<span class="nx">logEl</span><span class="p">.</span><span class="nx">html</span> <span class="nx">msg</span> <span class="o">+</span> <span class="s">&quot; Bitte ein Mail mit dieser Fehlermeldung an szaby.gruenwald@salzburgresearch.at zu schicken.&quot;</span>
<span class="nx">unless</span> <span class="nx">jQuery</span><span class="p">.</span><span class="nx">couch</span>
<span class="nx">saveErr</span> <span class="s">&quot;Fehler: Die Datenbank ist unerreichbar.&quot;</span>
<span class="k">return</span>
<span class="nv">jQuery.couch.urlPrefix = </span><span class="s">&quot;http://dev.iks-project.eu/couchdb&quot;</span></pre></div></td></tr><tr id="section-27"><td class="docs"><div class="pilwrap"><a href="#section-27" class="pilcrow">&#182;</a></div><p>else
jQuery.couch.urlPrefix = "http://dev.iks-project.eu/cors/dev.iks-project.eu:80/couchdb";</p>
</td><td class="code"><div class="highlight"><pre> <span class="nx">jQuery</span><span class="p">.</span><span class="nx">couch</span><span class="p">.</span><span class="nx">info</span> <span class="nv">success: </span><span class="nf">(data) -&gt;</span>
<span class="k">return</span></pre></div></td></tr><tr id="section-27"><td class="docs"><div class="pilwrap"><a href="#section-27" class="pilcrow">&#182;</a></div><p>jQuery.couch.urlPrefix = "http://dev.iks-project.eu/couchdb"
else</p>
</td><td class="code"><div class="highlight"><pre> <span class="nv">jQuery.couch.urlPrefix = </span><span class="s">&quot;http://dev.iks-project.eu/cors/dev.iks-project.eu:80/couchdb&quot;</span><span class="p">;</span>
<span class="nx">jQuery</span><span class="p">.</span><span class="nx">couch</span><span class="p">.</span><span class="nx">info</span> <span class="nv">success: </span><span class="nf">(data) -&gt;</span>
<span class="nv">db = </span><span class="nx">jQuery</span><span class="p">.</span><span class="nx">couch</span><span class="p">.</span><span class="nx">db</span><span class="p">(</span><span class="s">&#39;capkom-testresults&#39;</span><span class="p">)</span>
<span class="nx">db</span><span class="p">.</span><span class="nx">info</span>
<span class="nv">success: </span><span class="nf">(data) -&gt;</span>
<span class="nx">Capkom</span><span class="p">.</span><span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&#39;db info&#39;</span><span class="p">,</span> <span class="nx">data</span>
<span class="nv">error: </span><span class="nf">(jqXhr, message) -&gt;</span>
<span class="nx">Capkom</span><span class="p">.</span><span class="nx">console</span><span class="p">.</span><span class="nx">error</span> <span class="s">&quot;couchdb info error: </span><span class="si">#{</span><span class="nx">message</span><span class="si">}</span><span class="s">&quot;</span>
<span class="nx">saveErr</span> <span class="s">&quot;Server konnte nicht nicht erreicht werden. </span><span class="si">#{</span><span class="nx">message</span><span class="si">}</span><span class="s">&quot;</span>

<span class="nv">save = </span><span class="o">-&gt;</span>
<span class="nx">db</span><span class="p">.</span><span class="nx">saveDoc</span> <span class="nx">doc</span><span class="p">.</span><span class="nx">toJSON</span><span class="p">(),</span>
<span class="nv">success: </span><span class="nf">(res) -&gt;</span>
<span class="k">if</span> <span class="nx">res</span><span class="p">.</span><span class="nx">ok</span>
<span class="nx">Capkom</span><span class="p">.</span><span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&quot;doc saved&quot;</span><span class="p">,</span> <span class="nx">res</span>
<span class="nx">doc</span><span class="p">.</span><span class="nx">set</span> <span class="nv">_rev: </span><span class="nx">res</span><span class="p">.</span><span class="nx">rev</span>
<span class="nx">jQuery</span><span class="p">(</span><span class="s">&#39;#usertest-id&#39;</span><span class="p">).</span><span class="nx">html</span> <span class="s">&quot;</span><span class="si">#{</span><span class="nx">doc</span><span class="p">.</span><span class="nx">get</span> <span class="s">&#39;_id&#39;</span><span class="si">}</span><span class="s">&quot;</span>
<span class="nv">returnUri = </span><span class="nx">Capkom</span><span class="p">.</span><span class="nx">getUrlParameter</span><span class="p">(</span><span class="s">&#39;returnuri&#39;</span><span class="p">)</span>
<span class="k">if</span> <span class="nx">returnUri</span>
<span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&quot;Forwarding in 2 seconds to&quot;</span><span class="p">,</span> <span class="nx">returnUri</span>
<span class="nx">setTimeout</span> <span class="o">-&gt;</span>
<span class="nb">window</span><span class="p">.</span><span class="nv">location = </span><span class="nb">encodeURIComponent</span> <span class="nx">returnUri</span>
<span class="p">,</span> <span class="mi">2000</span>
<span class="k">else</span>
<span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&quot;No returnuri= URL param, no forwarding.&quot;</span>
<span class="k">else</span>
<span class="nx">Capkom</span><span class="p">.</span><span class="nx">console</span><span class="p">.</span><span class="nx">info</span> <span class="s">&#39;Error saving Usertest document&#39;</span><span class="p">,</span> <span class="nx">res</span>
<span class="nv">error: </span><span class="nf">(jqXhr, message) -&gt;</span>
Expand Down
16 changes: 13 additions & 3 deletions lib/capkomwizard.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions src/stages.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,16 +456,16 @@ Capkom.getTestDataId = (cb) ->
db.info success: (data) ->
Capkom.console.info 'view data', data.doc_count
cb "UT-#{data.doc_count}"
Capkom.saveTestData = (doc) ->
Capkom.saveTestData = (doc, cb) ->
logEl = jQuery('#log')
saveErr = (msg) ->
logEl.html msg + " Bitte ein Mail mit dieser Fehlermeldung an szaby.gruenwald@salzburgresearch.at zu schicken."
unless jQuery.couch
saveErr "Fehler: Die Datenbank ist unerreichbar."
return
jQuery.couch.urlPrefix = "http://dev.iks-project.eu/couchdb"
# jQuery.couch.urlPrefix = "http://dev.iks-project.eu/couchdb"
# else
# jQuery.couch.urlPrefix = "http://dev.iks-project.eu/cors/dev.iks-project.eu:80/couchdb";
jQuery.couch.urlPrefix = "http://dev.iks-project.eu/cors/dev.iks-project.eu:80/couchdb";
jQuery.couch.info success: (data) ->
db = jQuery.couch.db('capkom-testresults')
db.info
Expand All @@ -474,14 +474,21 @@ Capkom.saveTestData = (doc) ->
error: (jqXhr, message) ->
Capkom.console.error "couchdb info error: #{message}"
saveErr "Server konnte nicht nicht erreicht werden. #{message}"

save = ->
db.saveDoc doc.toJSON(),
success: (res) ->
if res.ok
Capkom.console.info "doc saved", res
doc.set _rev: res.rev
jQuery('#usertest-id').html "#{doc.get '_id'}"
returnUri = Capkom.getUrlParameter('returnuri')
if returnUri
console.info "Forwarding in 2 seconds to", returnUri
setTimeout ->
window.location = encodeURIComponent returnUri
, 2000
else
console.info "No returnuri= URL param, no forwarding."
else
Capkom.console.info 'Error saving Usertest document', res
error: (jqXhr, message) ->
Expand Down

0 comments on commit a1ef92d

Please sign in to comment.