7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00
4 changed files with 39 additions and 4 deletions
Showing only changes of commit 3c58f86c2a - Show all commits

View File

@ -115,6 +115,9 @@
}, },
"Operator": { "Operator": {
"dataSource": "vn" "dataSource": "vn"
},
"locker": {
"dataSource": "vn"
} }
} }

View File

@ -0,0 +1,28 @@
{
"name": "locker",
"description": "Employee´s locker",
"base": "Loggable",
"options": {
"mysql": {
"table": "locker"
}
},
"properties": {
"code": {
"type": "string"
},
"gender": {
"type": "string"
},
"workerFk": {
"type": "number"
}
},
"relations": {
"id": {
"type": "belongsTo",
"model": "worker",
"foreignKey": "workerFk"
}
}
}

View File

@ -75,11 +75,10 @@
ng-model="$ctrl.worker.SSN" ng-model="$ctrl.worker.SSN"
rule> rule>
</vn-textfield> </vn-textfield>
<vn-input-number <vn-autocomplete
min="0"
label="Locker" label="Locker"
ng-model="$ctrl.worker.locker"> ng-model="$ctrl.worker.locker"></vn-autocomplete>
</vn-input-number> <!-- ng-click="ctrl.choose"> -->
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>

View File

@ -13,6 +13,11 @@ class Controller extends Section {
return this.$.watcher.submit() return this.$.watcher.submit()
.then(() => this.card.reload()); .then(() => this.card.reload());
} }
chooseLocker() {
const workerGender = this.worker.sex;
console.log(workerGender);
}
} }
ngModule.vnComponent('vnWorkerBasicData', { ngModule.vnComponent('vnWorkerBasicData', {