amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 12:25:23 +00:00
Code Issues Projects Releases Wiki Activity

(js) Preserve selected date when switching view

Browse Source
This commit is contained in:
Francis Lachapelle
2016-01-12 13:38:54 -05:00
parent 77baffb85c
commit dad9b71a5b
5 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/SchedulerUI/UIxCalDayView.wox
+6 -6
View File
@@ -12,12 +12,12 @@
<md-button class="md-icon-button"
label:aria-label="Previous Day"
var:date="prevDayQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
<div><var:string value="currentDayName" /></div>
<md-button class="md-icon-button"
label:aria-label="Next Day"
var:date="nextDayQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button class="md-icon-button md-accent"
label:aria-label="Today"
@@ -28,16 +28,16 @@
<a class="md-icon-button md-button"
label:aria-label="Day"
ng-disabled="true"
href="#/calendar/day"><md-icon>view_day</md-icon></a>
ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Week"
href="#/calendar/week"><md-icon>view_week</md-icon></a>
ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Month"
href="#/calendar/month"><md-icon>view_module</md-icon></a>
ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Multicolumn Day View"
href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
</md-card-actions>
<var:component
UI/Templates/SchedulerUI/UIxCalMonthView.wox
+7 -7
View File
@@ -12,12 +12,12 @@
<md-button class="md-icon-button"
label:aria-label="Previous Month"
var:date="prevMonthQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
<var:string value="monthNameOfThisMonth" /> <var:string value="selectedDate.yearOfCommonEra" />
ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
<var:string value="monthNameOfThisMonth" /> <var:string value="selectedDate.yearOfCommonEra" />
<md-button class="md-icon-button"
label:aria-label="Next Month"
var:date="nextMonthQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button class="md-icon-button md-accent"
label:aria-label="Today"
@@ -27,17 +27,17 @@
</md-button>
<a class="md-icon-button md-button"
label:aria-label="Day"
href="#/calendar/day"><md-icon>view_day</md-icon></a>
ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Week"
href="#/calendar/week"><md-icon>view_week</md-icon></a>
ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Month"
ng-disabled="true"
href="#/calendar/month"><md-icon>view_module</md-icon></a>
ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Multicolumn Day View"
href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
</md-card-actions>
<md-toolbar class="monthView">
UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+6 -6
View File
@@ -12,12 +12,12 @@
<md-button class="md-icon-button"
label:aria-label="Previous Day"
var:date="prevDayQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
<div><var:string value="currentDayName" /></div>
<md-button class="md-icon-button"
label:aria-label="Next Day"
var:date="nextDayQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button class="md-icon-button md-accent"
label:aria-label="Today"
@@ -27,17 +27,17 @@
</md-button>
<a class="md-icon-button md-button"
label:aria-label="Day"
href="#/calendar/day"><md-icon>view_day</md-icon></a>
ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Week"
href="#/calendar/week"><md-icon>view_week</md-icon></a>
ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Month"
href="#/calendar/month"><md-icon>view_module</md-icon></a>
ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Multicolumn Day View"
ng-disabled="true"
href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
</md-card-actions>
<var:component
UI/Templates/SchedulerUI/UIxCalWeekView.wox
+6 -6
View File
@@ -12,12 +12,12 @@
<md-button class="md-icon-button"
label:aria-label="Previous Week"
var:date="prevWeekQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_left</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_left</md-icon></md-button>
<div><var:string value="currentWeekName" /></div>
<md-button class="md-icon-button"
label:aria-label="Next Week"
var:date="nextWeekQueryParameters.day"
ng-click="calendar.changeView($event)"><md-icon>chevron_right</md-icon></md-button>
ng-click="calendar.changeDate($event)"><md-icon>chevron_right</md-icon></md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button class="md-icon-button md-accent"
label:aria-label="Today"
@@ -27,17 +27,17 @@
</md-button>
<a class="md-icon-button md-button"
label:aria-label="Day"
href="#/calendar/day"><md-icon>view_day</md-icon></a>
ng-click="calendar.changeView('day')"><md-icon>view_day</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Week"
ng-disabled="true"
href="#/calendar/week"><md-icon>view_week</md-icon></a>
ng-click="calendar.changeView('week')"><md-icon>view_week</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Month"
href="#/calendar/month"><md-icon>view_module</md-icon></a>
ng-click="calendar.changeView('month')"><md-icon>view_module</md-icon></a>
<a class="md-icon-button md-button"
label:aria-label="Multicolumn Day View"
href="#/calendar/multicolumnday"><md-icon>view_array</md-icon></a>
ng-click="calendar.changeView('multicolumnday')"><md-icon>view_array</md-icon></a>
</md-card-actions>
<var:component
className="UIxCalDayTable"
UI/WebServerResources/js/Scheduler/CalendarController.js
+10 -4
View File
@@ -11,6 +11,7 @@
var vm = this, deregisterCalendarsList;
vm.views = stateEventsBlocks;
vm.changeDate = changeDate;
vm.changeView = changeView;
// Refresh current view when the list of calendars is modified
@@ -32,12 +33,17 @@
});
}
// Change calendar's view
function changeView($event) {
// Change calendar's date
function changeDate($event) {
var date = angular.element($event.currentTarget).attr('date');
$state.go('calendars.view', { view: $stateParams.view, day: date });
$state.go('calendars.view', { day: date });
}
}
// Change calendar's view
function changeView(view) {
$state.go('calendars.view', { view: view });
}
}
angular
.module('SOGo.SchedulerUI')