diff options
author | Koren Lev <korenlev@gmail.com> | 2017-08-14 18:04:50 +0300 |
---|---|---|
committer | Koren Lev <korenlev@gmail.com> | 2017-08-14 18:04:50 +0300 |
commit | 502402dde98e63677e34078c50e3854964c81694 (patch) | |
tree | ee681d8001b6a5beee5f2a2ad2f52ffeac7bf946 /ui/imports/ui/components/scanning-request | |
parent | 472b870cd5fb1eda282af648ef1b0b92d12d8c5e (diff) |
add mulitple dept attirubute showing in popup window + lose us-move-up-scan-opening-message-in-ui
Change-Id: I3480d155c418c30224856f89c874c889dd3da9e5
Signed-off-by: Koren Lev <korenlev@gmail.com>
Diffstat (limited to 'ui/imports/ui/components/scanning-request')
-rw-r--r-- | ui/imports/ui/components/scanning-request/scanning-request.html | 17 | ||||
-rw-r--r-- | ui/imports/ui/components/scanning-request/scanning-request.js | 14 |
2 files changed, 22 insertions, 9 deletions
diff --git a/ui/imports/ui/components/scanning-request/scanning-request.html b/ui/imports/ui/components/scanning-request/scanning-request.html index 9f0e044..b28e5b2 100644 --- a/ui/imports/ui/components/scanning-request/scanning-request.html +++ b/ui/imports/ui/components/scanning-request/scanning-request.html @@ -22,6 +22,15 @@ <h3>{{ pageHeader }}</h3> <div class="sm-form-container"> + + {{#if (getState 'isMessage') }} + <div class="js-message-panel alert {{#if (getState 'isError')}}alert-danger{{/if}} + {{#if (getState 'isSuccess')}}alert-success{{/if}}" + role="alert"> + {{ getState 'message' }} + </div> + {{/if }} + <form role="form" class="form-horizontal"> {{#each commandOption in commandOptions }} @@ -61,14 +70,6 @@ </form> - {{#if (getState 'isMessage') }} - <div class="js-message-panel alert {{#if (getState 'isError')}}alert-danger{{/if}} - {{#if (getState 'isSuccess')}}alert-success{{/if}}" - role="alert"> - {{ getState 'message' }} - </div> - {{/if }} - </div> </div> </template> diff --git a/ui/imports/ui/components/scanning-request/scanning-request.js b/ui/imports/ui/components/scanning-request/scanning-request.js index 6181150..6e6d3e4 100644 --- a/ui/imports/ui/components/scanning-request/scanning-request.js +++ b/ui/imports/ui/components/scanning-request/scanning-request.js @@ -52,11 +52,13 @@ Template.ScanningRequest.onCreated(function() { disabled: false, notifications: {}, model: {}, - beforeInsert: true + beforeInsert: true, + reload: null, }); instance.autorun(function () { let data = Template.currentData(); + instance.state.get('reload'); new SimpleSchema({ action: { type: String, allowedValues: ['insert', 'view', 'update'] }, @@ -67,6 +69,12 @@ Template.ScanningRequest.onCreated(function() { }, }).validate(data); + instance.state.set('isError', false); + instance.state.set('isSuccess', false); + instance.state.set('isMessage', false); + instance.state.set('message', null); + instance.state.set('disabled', false); + switch (data.action) { case 'insert': initInsertView(instance, data); @@ -318,6 +326,10 @@ function processActionResult(instance, error) { } else if (action === 'update') { instance.state.set('message', 'Record had been updated successfully'); } + + setTimeout(() => { + instance.state.set('reload', Date.now()); + }, 7000); } } |