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

1361 - Añadir filtro por año #348

Merged
joan merged 16 commits from 1361-calendar_date_filter into dev 2020-08-18 12:18:41 +00:00
Conversation 0 Commits 16 Files Changed 8 +23 -33
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64abd29257 - Show all commits

47
front/core/components/calendar/index.html
View File

@ -19,33 +19,28 @@
ng-if="$ctrl.displayControls">
</vn-button>
</div>
<div class="rows">
<div class="weeksNumber">a</div>
<div class="weeks">
<div class="weekdays">
<section
ng-repeat="day in ::$ctrl.weekDays"
translate-attr="::{title: day.name}"
ng-click="$ctrl.selectWeekDay($event, day.index)">
<span>{{::day.localeChar}}</span>
</section>
</div>
<div class="weekdays">
<section
ng-repeat="day in ::$ctrl.weekDays"
translate-attr="::{title: day.name}"
ng-click="$ctrl.selectWeekDay($event, day.index)">
<span>{{::day.localeChar}}</span>
</section>
</div>
<div
class="days"
ng-class="{'hide-contiguous': $ctrl.hideContiguous}">
<section
ng-repeat="day in $ctrl.days"
class="day"
ng-class="::$ctrl.getDayClasses(day)"
vn-repeat-last
on-last="$ctrl.repeatLast()">
<div
class="days"
ng-class="{'hide-contiguous': $ctrl.hideContiguous}">
<section
ng-repeat="day in $ctrl.days"
class="day"
ng-class="::$ctrl.getDayClasses(day)"
vn-repeat-last
on-last="$ctrl.repeatLast()">
<div
class="day-number"
ng-click="$ctrl.select($event, day)">
{{::day | date: 'd'}}
</div>
</section>
class="day-number"
ng-click="$ctrl.select($event, day)">
{{::day | date: 'd'}}
</div>
</div>
</section>
</div>
</div>

9
front/core/components/calendar/style.scss
View File

@ -19,12 +19,7 @@
color: inherit;
}
}
& > .rows > .weeksNumber,
& > .rows > .weeks {
float: left
}
& > .rows > .weeks > .weekdays {
& > .weekdays {
display: flex;
color: $color-font-secondary;
margin-bottom: 8px;
@ -38,7 +33,7 @@
cursor: pointer;
}
}
& > .rows > .weeks > .days {
& > .days {
display: flex;
justify-content: center;
align-items: center;