verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 Releases Wiki Activity

4856-worker.time-control #1375

Merged
joan merged 32 commits from 4856-worker.time-control into dev 2023-03-16 06:39:02 +00:00
Conversation 0 Commits 32 Files Changed 15 +4 -7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4dc9e9e590 - Show all commits

3
front/core/components/calendar/index.js
View File

@ -159,8 +159,6 @@ export default class Calendar extends FormInput {
this.repaint(); this.repaint();
this.emit('move', {$date: date}); this.emit('move', {$date: date});
this.getMailStates({$day: date});
} }
vicent marked this conversation as resolved Outdated
joan commented 2023-03-13 09:32:10 +00:00
Outdated
Review
Copy Link

Esta funció pareix específica de la secció que estás modificant. Calendar es un component genéric i deu de ser agnóstic al funcionament de la secció WorkerTimeControl

Esta funció pareix específica de la secció que estás modificant. Calendar es un component genéric i deu de ser agnóstic al funcionament de la secció WorkerTimeControl
/* /*
@ -237,7 +235,6 @@ ngModule.vnComponent('vnCalendar', {
bindings: { bindings: {
defaultDate: '=?', defaultDate: '=?',
hasEvents: '&?', hasEvents: '&?',
getMailStates: '&?',
getClass: '&?', getClass: '&?',
formatDay: '&?', formatDay: '&?',
formatWeek: '&?', formatWeek: '&?',

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

@ -123,7 +123,7 @@
class="vn-pt-md" class="vn-pt-md"
ng-model="$ctrl.date" ng-model="$ctrl.date"
format-week="$ctrl.formatWeek($element)" format-week="$ctrl.formatWeek($element)"
get-mail-states="$ctrl.getMailStates($day)" on-move="$ctrl.getMailStates($date)"
has-events="$ctrl.hasEvents($day)"> has-events="$ctrl.hasEvents($day)">
</vn-calendar> </vn-calendar>
</div> </div>

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

@ -421,10 +421,10 @@ class Controller extends Section {
return [parseInt(hours), parseInt(minutes), parseInt(seconds)]; return [parseInt(hours), parseInt(minutes), parseInt(seconds)];
} }
getMailStates(day) { getMailStates(date) {
const params = { const params = {
month: day.getMonth() + 1, month: date.getMonth() + 1,
year: day.getFullYear() year: date.getFullYear()
}; };
const query = `WorkerTimeControls/${this.$params.id}/getMailStates`; const query = `WorkerTimeControls/${this.$params.id}/getMailStates`;
this.$http.get(query, {params}) this.$http.get(query, {params})