refs #5334 fix errors

This commit is contained in:
Carlos Satorres 2023-06-30 09:40:12 +02:00
parent 6b4501146d
commit 83b096c206
5 changed files with 57 additions and 29 deletions

View File

@ -1,4 +1,11 @@
module.exports = Self => {
Self.validatesFormatOf('Email', {
message: 'Invalid email',
allowNull: true,
allowBlank: true,
with: /^[\W]*([\w+\-.%]+@[\w\-.]+\.[A-Za-z]{1,61}[\W]*,{1}[\W]*)*([\w+\-.%]+@[\w\-.]+\.[A-Za-z]{1,61})[\W]*$/
});
require('../methods/department/getLeaves')(Self);
require('../methods/department/createChild')(Self);
require('../methods/department/removeChild')(Self);

View File

@ -1,7 +1,6 @@
import ngModule from '../../module';
import Section from 'salix/components/section';
ngModule.vnComponent('vnWorkerDepartmentBasicData', {
template: require('./index.html'),
controller: Section,

View File

@ -33,7 +33,7 @@
<div ng-transclude="btnOne">
<vn-quick-link vn-anchor="{state: 'worker.index', params: {q: {departmentFk: $ctrl.$params.id} } }"
vn-tooltip="Department workers"
icon="icon-ticket">
icon="icon-worker">
</vn-quick-link>
</div>
</div>

View File

@ -4,6 +4,14 @@
limit="20"
order="id">
</vn-crud-model>
<vn-portal slot="topbar">
<vn-searchbar
vn-focus
info="Search departments by id, name or code"
on-search="$ctrl.onSearch($params)"
base-state="worker.department">
</vn-searchbar>
</vn-portal>
<ui-view>
<vn-worker-department-index></vn-worker-department-index>
</ui-view>

View File

@ -1,3 +1,11 @@
<vn-portal slot="topbar">
<vn-searchbar
vn-focus
info="Search departments by id, name or code"
on-search="$ctrl.onSearch($params)"
base-state="worker.department">
</vn-searchbar>
</vn-portal>
<vn-card class="summary">
<h5>
<span>{{summary.name}}</span>
@ -34,8 +42,8 @@
<vn-label-value label="Self-consumption customer"
value="{{summary.client.name}}">
</vn-label-value>
</vn-one>
<vn-vertical>
<vn-one>
<vn-check
label="Telework"
ng-model="summary.isTeleworking"
@ -46,22 +54,28 @@
ng-model="summary.hasToMistake"
disabled="true">
</vn-check>
</vn-one>
<vn-one>
<vn-check
label="worksInProduction"
ng-model="summary.isProduction"
disabled="true">
</vn-check>
<vn-check
label="Fill in days without physical check-ins"
ng-model="summary.hasToRefill"
disabled="true">
</vn-check>
<vn-check
label="Send check-ins by email"
ng-model="summary.hasToSendMail"
disabled="true">
</vn-check>
</vn-one>
</vn-vertical>
</vn-one>
</vn-horizontal>
</vn-card>
<vn-worker-department-descriptor-popover