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

Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-03-05 08:48:26 +01:00
parent f8a4ad0f28 ef483bcc12
commit 596eb8d695
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,9 @@
<section ng-repeat="day in $ctrl.days" class="day {{day.color}}" <section ng-repeat="day in $ctrl.days" class="day {{day.color}}"
ng-click="$ctrl.select($index)"> ng-click="$ctrl.select($index)">
<span ng-if="day.event" vn-tooltip="{{day.event.title}}"> <span ng-if="day.event" vn-tooltip="{{day.event.title}}">
{{::day.date | dateTime: 'd'}} {{::day.date | date: 'd'}}
</span> </span>
<span ng-if="!day.event">{{::day.date | dateTime: 'd'}}</span> <span ng-if="!day.event">{{::day.date | date: 'd'}}</span>
</section> </section>
</vn-horizontal> </vn-horizontal>
</vn-vertical> </vn-vertical>

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

@ -116,9 +116,6 @@ export default class Calendar extends Component {
} }
addDay(date, day, color = '') { addDay(date, day, color = '') {
const curDate = new Date();
curDate.setHours(0, 0, 0, 0);
const newDate = new Date( const newDate = new Date(
date.getFullYear(), date.getFullYear(),
date.getMonth(), day); date.getMonth(), day);