diff --git a/back/models/account.js b/back/models/account.js index 40b7e9c12..9e6ecba45 100644 --- a/back/models/account.js +++ b/back/models/account.js @@ -23,15 +23,13 @@ module.exports = Self => { description: 'Gets the current user data', accepts: [ { - arg: 'context', - type: 'object', - http: function(ctx) { - return ctx; - } + arg: 'ctx', + type: 'Object', + http: {source: 'context'} } ], returns: { - type: 'object', + type: 'Object', root: true }, http: { @@ -41,12 +39,18 @@ module.exports = Self => { }); Self.getCurrentUserData = async function(ctx) { - let filter = {fields: ['name']}; let userId = ctx.req.accessToken.userId; - let account = await Self.findById(userId, filter); - let worker = await Self.app.models.Worker.findOne({where: {userFk: userId}, fields: ['id']}); - return {accountName: account.name, workerId: worker.id}; + let account = await Self.findById(userId, { + fields: ['id', 'name', 'nickname'] + }); + + let worker = await Self.app.models.Worker.findOne({ + fields: ['id'], + where: {userFk: userId} + }); + + return Object.assign(account, {workerId: worker.id}); }; /** diff --git a/front/core/components/crud-model/crud-model.js b/front/core/components/crud-model/crud-model.js index 0839881ab..41b5390a7 100644 --- a/front/core/components/crud-model/crud-model.js +++ b/front/core/components/crud-model/crud-model.js @@ -208,7 +208,9 @@ export default class CrudModel extends ModelProxy { this.cancelRequest(); this.canceler = this.$q.defer(); this.isPaging = append; - if (!append) this.status = 'loading'; + + if (!append && this.status != 'ready') + this.status = 'loading'; let params = Object.assign( {filter}, diff --git a/front/core/components/data-viewer/index.html b/front/core/components/data-viewer/index.html index dd696fda3..8c843d869 100644 --- a/front/core/components/data-viewer/index.html +++ b/front/core/components/data-viewer/index.html @@ -2,7 +2,7 @@
+ class="vn-pt-md">
section { content: ':'; } } - & > span { - color: $color-font; - } & > vn-icon { vertical-align: middle; color: $color-font-secondary; diff --git a/front/core/components/list/index.js b/front/core/components/list/index.js new file mode 100644 index 000000000..423b033ce --- /dev/null +++ b/front/core/components/list/index.js @@ -0,0 +1 @@ +import './style.scss'; diff --git a/front/salix/styles/list.scss b/front/core/components/list/style.scss similarity index 96% rename from front/salix/styles/list.scss rename to front/core/components/list/style.scss index 3a6d0d6d9..7560d3288 100644 --- a/front/salix/styles/list.scss +++ b/front/core/components/list/style.scss @@ -14,7 +14,7 @@ color: inherit; & > vn-horizontal { - padding: $pad-medium; + padding: $spacing-md; & > vn-one { overflow: hidden; diff --git a/front/core/components/searchbar/style.scss b/front/core/components/searchbar/style.scss index e663f7cb9..3915c2089 100644 --- a/front/core/components/searchbar/style.scss +++ b/front/core/components/searchbar/style.scss @@ -13,6 +13,6 @@ vn-searchbar { max-height: 48em; & > form { - padding: $pad-large; + padding: $spacing-lg; } } \ No newline at end of file diff --git a/front/core/components/step-control/style.scss b/front/core/components/step-control/style.scss index f020a31f6..e1c29c9a2 100644 --- a/front/core/components/step-control/style.scss +++ b/front/core/components/step-control/style.scss @@ -12,31 +12,25 @@ vn-step-control { display: flex; flex-direction: row } - & > .steps > .step { justify-content: center; min-width: 125px; display: flex; flex: auto } - & > .steps > .step .circle { border: 2px solid $color-main; background-color: white; align-content: center; margin-top: -9.5px; - -moz-border-radius: 50%; - -webkit-border-radius: 50%; border-radius: 50%; cursor: pointer; height: 15px; width: 15px } - & > .steps > .step .circle.active { background-color: $color-main; } - & > .buttons { display: flex; flex: auto; @@ -44,11 +38,9 @@ vn-step-control { justify-content: space-between; margin-top: 10px } - & > .buttons > .step { display: flex } - & > .buttons > .step > .mdl-button { line-height: 32px; font-size: 12px; @@ -56,5 +48,4 @@ vn-step-control { height: 32px } } - } \ No newline at end of file diff --git a/front/core/components/subtitle/subtitle.html b/front/core/components/subtitle/subtitle.html index ac00ac0c2..40c244006 100644 --- a/front/core/components/subtitle/subtitle.html +++ b/front/core/components/subtitle/subtitle.html @@ -1,2 +1,2 @@ -
+
\ No newline at end of file diff --git a/front/core/components/title/title.html b/front/core/components/title/title.html index 773b40040..cfdad746f 100644 --- a/front/core/components/title/title.html +++ b/front/core/components/title/title.html @@ -1,3 +1,3 @@ -

+

\ No newline at end of file diff --git a/front/core/directives/uvc.html b/front/core/directives/uvc.html index 0248aefc1..907ea6f2a 100644 --- a/front/core/directives/uvc.html +++ b/front/core/directives/uvc.html @@ -8,10 +8,10 @@ class="modal-form" vn-id="uvc"> - +
Fields to show
 -
+
.body { - padding: $pad-small; + padding: $spacing-sm; & > * { - padding: $pad-small; + padding: $spacing-sm; } & > .attributes > h5 { - padding-bottom: $pad-small; + padding-bottom: $spacing-sm; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; @@ -45,7 +45,7 @@ padding: 0; & > vn-icon { - padding: $pad-small; + padding: $spacing-sm; color: $color-secondary; font-size: 1.5em; @@ -62,7 +62,7 @@ padding: 0; & > a { - padding: $pad-small; + padding: $spacing-sm; & > vn-icon { font-size: 1.8em; diff --git a/front/salix/components/index.js b/front/salix/components/index.js index a5ce18e4c..a61b037b0 100644 --- a/front/salix/components/index.js +++ b/front/salix/components/index.js @@ -7,3 +7,5 @@ import './side-menu/side-menu'; import './left-menu/left-menu'; import './topbar/topbar'; import './user-configuration-popover'; +import './descriptor'; +import './summary'; diff --git a/front/salix/components/left-menu/left-menu.html b/front/salix/components/left-menu/left-menu.html index 31dcb7903..12cea49a3 100644 --- a/front/salix/components/left-menu/left-menu.html +++ b/front/salix/components/left-menu/left-menu.html @@ -1,4 +1,4 @@ -
-