verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2023-07-14 13:11:09 +02:00
parent 5716acaa3c
commit 6980392ba1
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/changes/232802/01-aclAddAlias.sql → db/changes/232802/01-aclWorkerDisable.sql
View File

24
modules/worker/front/calendar/index.html
View File

@ -59,20 +59,20 @@
<div class="vn-pt-md"> <div class="vn-pt-md">
<vn-autocomplete label="Year" <vn-autocomplete label="Year"
data="$ctrl.yearFilter" data="$ctrl.yearFilter"
ng-model="$ctrl.year" ng-model="$ctrl.year"
show-field="year" show-field="year"
value-field="year" value-field="year"
order="DESC"> order="DESC">
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete label="Contract" <vn-autocomplete label="Contract"
url="Workers/{{$ctrl.$params.id}}/contracts" url="Workers/{{$ctrl.$params.id}}/contracts"
fields="['started', 'ended']" fields="['started', 'ended']"
ng-model="$ctrl.businessId" ng-model="$ctrl.businessId"
search-function="{businessFk: $search}" search-function="{businessFk: $search}"
value-field="businessFk" value-field="businessFk"
order="businessFk DESC" order="businessFk DESC"
limit="5"> limit="5">
<tpl-item> <tpl-item>
<div>#{{businessFk}}</div> <div>#{{businessFk}}</div>
<div class="text-caption text-secondary"> <div class="text-caption text-secondary">
@ -82,10 +82,8 @@
</vn-autocomplete> </vn-autocomplete>
</div> </div>
<div name="absenceTypes" class="input vn-py-md" style="overflow: hidden;"> <div name="absenceTypes" class="input vn-py-md" style="overflow: hidden;">
<vn-chip ng-repeat="absenceType in absenceTypes" ng-class="::{'selectable': $ctrl.isSubordinate}" <vn-chip ng-repeat="absenceType in absenceTypes" ng-class="::{'selectable': $ctrl.isSubordinate}" ng-click="$ctrl.pick(absenceType)">
ng-click="$ctrl.pick(absenceType)"> <vn-avatar ng-style="{backgroundColor: absenceType.rgb}">
<vn-avatar
ng-style="{backgroundColor: absenceType.rgb}">
<vn-icon icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon> <vn-icon icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon>
</vn-avatar> </vn-avatar>
{{absenceType.name}} {{absenceType.name}}