refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2023-05-26 12:58:03 +02:00
parent 2b06c62876
commit 0789804352
5 changed files with 23 additions and 20 deletions

View File

@ -45,9 +45,7 @@ export default class LeftMenu {
if (acl && !this.aclService.hasAny(acl))
continue;
}
console.log('MyItem:', item);
console.log('MyState:', state);
console.log(item.description, state.description);
let myItem = {
icon: item.icon,
description: item.description || state.description,

View File

@ -1,7 +1,7 @@
<vn-descriptor-content
module="department"
module="worker"
description="$ctrl.department.name"
summary="$ctrl.$.summary">
base-state="worker.department">
<slot-menu>
<vn-item
ng-click="$ctrl.handleExcluded()"
@ -15,19 +15,19 @@
<p>{{worker.department.id}}</p>
<div class="attributes">
<vn-label-value
label="Chat"
label="Chat"
value="{{$ctrl.worker.department.chatName}}">
</vn-label-value>
<vn-label-value
label="Email"
label="Email"
value="{{$ctrl.worker.department.emailNotification}}">
</vn-label-value>
<vn-label-value
label="Self-consumption customer"
label="Self-consumption customer"
value="{{$ctrl.worker.department.clientFK}}">
</vn-label-value>
<vn-label-value
label="Boss department"
label="Boss department"
value="{{$ctrl.worker.department.workerFk}}">
</vn-label-value>
</div>
@ -39,7 +39,7 @@
</vn-popup>
<!-- Upload photo dialog -->
<!-- <vn-upload-photo
vn-id="uploadPhoto"
<!-- <vn-upload-photo
vn-id="uploadPhoto"
on-response="$ctrl.onUploadResponse()">
</vn-upload-photo>
</vn-upload-photo>

View File

@ -3,6 +3,6 @@ import './index/';
import './summary';
import './card';
import './descriptor';
// import './create';
import './basic-data';
// import './create';
// import './search-panel';

View File

@ -9,7 +9,8 @@
vn-focus
panel="vn-worker-search-panel"
info="Search workers by id, firstName, lastName or user name"
model="model">
model="model"
base-state="worker.department">
</vn-searchbar>
</vn-portal>
<ui-view>

View File

@ -24,7 +24,8 @@
"description": "Wikipedia"
},
{"state": "worker.card.workerLog", "icon": "history"}
], "department": [
],
"department": [
{"state": "worker.department.card.basicData", "icon": "settings"}
]
},
@ -138,15 +139,18 @@
"params": {
"department": "$ctrl.department"
}
}, {
},
{
"url": "/basic-data",
"state": "worker.deparment.card.basicData",
"state": "worker.department.card.basicData",
"component": "vn-worker-department-basic-data",
"description": "Basic data",
"params": {
"department": "$ctrl.department"
}
}, {
"item-type": "$ctrl.itemType"
},
"acl": ["buyer"]
},
{
"url": "/dms",
"state": "worker.card.dms",
"abstract": true,