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

refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Vicent Llopis 2023-08-24 09:10:04 +02:00
parent f8fd2bbd17
commit 1f63648697
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/233601/00-ACL_workerDepartment.sql Normal file
View File

@ -0,0 +1,3 @@
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
VALUES
('WorkerDepartment', '*', '*', 'ALLOW', 'ROLE', 'employee');

12
modules/worker/front/time-control/index.html
View File

@ -79,32 +79,30 @@
</vn-table>
</vn-card>
<vn-button-bar ng-show="$ctrl.state" class="vn-w-lg">
<vn-button-bar class="vn-w-lg">
<vn-button
label="Satisfied"
disabled="$ctrl.state == 'CONFIRMED'"
ng-if="$ctrl.isHimSelf"
ng-show="$ctrl.state && $ctrl.isHimSelf"
ng-click="$ctrl.isSatisfied()">
</vn-button>
<vn-button
label="Not satisfied"
disabled="$ctrl.state == 'REVISE'"
ng-if="$ctrl.isHimSelf"
ng-show="$ctrl.state && $ctrl.isHimSelf"
ng-click="reason.show()">
</vn-button>
<vn-button
label="Reason"
ng-if="$ctrl.reason && ($ctrl.isHimSelf || $ctrl.isHr)"
ng-show="$ctrl.state && $ctrl.reason && ($ctrl.isHimSelf || $ctrl.isHr)"
ng-click="reason.show()">
</vn-button>
</vn-button-bar>
<vn-button-bar ng-show="$ctrl.canResend" class="vn-w-lg">
<vn-button
label="Resend"
ng-click="sendEmailConfirmation.show()"
class="right"
vn-tooltip="Resend email of this week to the user"
ng-show="::$ctrl.isHr">
ng-show="$ctrl.isHr && $ctrl.canResend">
</vn-button>
</vn-button-bar>
</div>

3
modules/worker/front/time-control/index.js
View File

@ -117,7 +117,8 @@ class Controller extends Section {
where: {
year: this._date.getFullYear(),
week: this.getWeekNumber(this._date)
}
},
limit: 1
};
this.$http.get('WorkerTimeControlMails', {filter})
.then(res => {