Setting for app preview by benrudolph · Pull Request #13779 · dimagi/commcare-hq

benrudolph · 2016-10-31T21:33:07Z

@biyeun @wpride Adds basic ability to turn on and off one question per screen. label because there are a few things i want to do first

write some tests
fix navigate for phone preview after selecting a setting
one question per screen for full screen mode

Here's what it currently looks like (looks a bit better in full screen mode):

@biyeun one question per screen doesn't work in full screen mode because i think we conflate the phoneMode and oneQuestionPerScreen mode. will try and make a pass at getting OQPS to work in full screen mode:

benrudolph · 2016-10-31T21:33:21Z

cc: @emord @nickpell

benrudolph

(easiest to review all at once)

benrudolph · 2016-10-31T21:34:07Z

corehq/apps/app_manager/static/app_manager/js/preview_app.js

    _private.navigateBack = function() {
-        var previewWindow = $appPreviewIframe[0].contentWindow;
+        var $appPreviewIframe = $(module.SELECTORS.PREVIEW_WINDOW.IFRAME),
+            previewWindow = $appPreviewIframe[0].contentWindow;


this fixes a minor issue in this PR: #13774 (comment)

benrudolph · 2016-10-31T21:34:48Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js

+    savedDisplayOptions = _.pick(
+        Util.getSavedDisplayOptions(),
+        FormplayerFrontend.Constants.ALLOWED_SAVED_OPTIONS
+    );


essentially we'll load the saved display options from localStorage. the key is namespaced by domain and username

benrudolph · 2016-10-31T21:36:11Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq.events.js

        // For Chrome, the origin property is in the event.originalEvent object
        var origin = event.origin || event.originalEvent.origin,
            data = event.data,
-            returnValue = null,


this was unfortunate, but it's impossible to use postMessage with callbacks since it only accepts serializable data. the only other option is to use eval which i don't want to do. i think we'll have to use this as a one way messaging API

benrudolph · 2016-10-31T21:36:56Z

corehq/apps/style/static/app_manager/less/preview_app-main.less

+  .btn-hardware {
+    display: inline-block;
+  }
+}


this is only temporary until redesign of hardware buttons happen

dimagimon · 2016-11-01T21:12:59Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js

 FormplayerFrontend.on('clearRestoreAsUser', function() {
-    var user = FormplayerFrontend.request('currentUser');
+    var user = FormplayerFrontend.request('currentUser'),
+        appId;


'appId' is defined but never used (no-unused-vars)

dimagimon · 2016-11-01T21:12:59Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/integration_spec.js

+                domain: 'domain',
+                apps: [],
+            };
+            sinon.stub(Backbone.history, 'start', sinon.spy());


'Backbone' is not defined. (no-undef)

dimagimon · 2016-11-01T21:13:00Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/integration_spec.js

+
+        afterEach(function() {
+            server.restore();
+            Backbone.history.start.restore();


'Backbone' is not defined. (no-undef)

dimagimon · 2016-11-01T21:13:00Z

corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/util_spec.js

+        });
+
+        it('should retrieve saved display options', function() {
+            var options = { option: 'yes' }


Missing semicolon. (semi)

Conflicts: corehq/apps/app_manager/static/app_manager/js/preview_app.js corehq/apps/app_manager/templates/app_manager/v1/partials/preview_app.html

benrudolph · 2016-11-01T21:15:58Z

3772d57 @biyeun i moved the form entry navigation to the form entry templates. was curious if you had it outside of the templates for a reason. anyways, doing that enabled one question per screen to work on both preview and regular formplayer (with a little jankiness):

benrudolph · 2016-11-02T15:05:56Z

Ok this should now be g2g. made a last minute decision to not show the settings tile on regular formplayer until one question per screen is better supported

benrudolph added the Open for review: do not merge A work in progress label Oct 31, 2016

benrudolph commented Oct 31, 2016

View reviewed changes

dimagimon added No lint errors and removed No lint errors labels Oct 31, 2016

dimagimon reviewed Nov 1, 2016

View reviewed changes

Ben Rudolph added 16 commits November 1, 2016 17:13

WIP

ae8bd19

Conflicts: corehq/apps/app_manager/static/app_manager/js/preview_app.js corehq/apps/app_manager/templates/app_manager/v1/partials/preview_app.html

Fix bug with nav back

f850ffe

remove settings button

911ff65

Remove ability to have callbacks

003572e

add settings icon

7c31664

Basic settings display

e0f871d

Basic save and load of display options

f5a3509

namespace display options saving

8c9a165

explicit version

076c4c2

[ci skip] dimagimon

16f249c

don't require appId for navigate home

5497bcc

better padding for preview app done button

d31a03f

Move form nav to form entry

3772d57

Remove irrelevant tests

9dc24fb

hide fixtures

14e5d9d

Add tests

7c783cc

benrudolph force-pushed the br/hardware-settings-2 branch from 1757bc1 to 7c783cc Compare November 1, 2016 21:13

[ci skip] dimagimon

4a1366f

dimagimon added the No lint errors label Nov 1, 2016

benrudolph removed the Open for review: do not merge A work in progress label Nov 1, 2016

Ben Rudolph added 2 commits November 2, 2016 00:42

fix typo

99e162f

Regenerate diff

658c3f9

dimagimon added No lint errors and removed No lint errors labels Nov 2, 2016

Remove settings from regular fomplayer

d164876

dimagimon added No lint errors and removed No lint errors labels Nov 2, 2016

nickpell merged commit b0750a9 into master Nov 2, 2016

nickpell deleted the br/hardware-settings-2 branch November 2, 2016 17:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Setting for app preview#13779

Setting for app preview#13779
nickpell merged 20 commits intomasterfrom
br/hardware-settings-2

benrudolph commented Oct 31, 2016 •

edited

Loading

Uh oh!

benrudolph commented Oct 31, 2016

Uh oh!

benrudolph left a comment

Uh oh!

benrudolph Oct 31, 2016

Uh oh!

benrudolph Oct 31, 2016

Uh oh!

benrudolph Oct 31, 2016

Uh oh!

benrudolph Oct 31, 2016

Uh oh!

dimagimon Nov 1, 2016

Uh oh!

dimagimon Nov 1, 2016

Uh oh!

dimagimon Nov 1, 2016

Uh oh!

dimagimon Nov 1, 2016

Uh oh!

benrudolph commented Nov 1, 2016

Uh oh!

benrudolph commented Nov 2, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

benrudolph commented Oct 31, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

benrudolph commented Oct 31, 2016

Uh oh!

benrudolph left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

benrudolph commented Nov 1, 2016

Uh oh!

benrudolph commented Nov 2, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

benrudolph commented Oct 31, 2016 •

edited

Loading