jingrow/gantt
1
0
Fork 0
Code Pull Requests Activity

[fix] date text in week mode

Browse Source
This commit is contained in:
Faris Ansari 2017-02-02 16:49:09 +05:30
parent 9bcd2a4236
commit 630f8405e1
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/frappe-gantt.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/frappe-gantt.js.map vendored
View File

File diff suppressed because one or more lines are too long

12
src/Gantt.js
View File

@ -134,6 +134,7 @@ export default function Gantt(element, tasks, config) {
function prepare_dates() { function prepare_dates() {
self.gantt_start = self.gantt_end = null;
for(let task of self.tasks) { for(let task of self.tasks) {
// set global start and end date // set global start and end date
if(!self.gantt_start || task._start < self.gantt_start) { if(!self.gantt_start || task._start < self.gantt_start) {
@ -400,10 +401,13 @@ export default function Gantt(element, tasks, config) {
'Quarter Day_lower': date.format('HH'), 'Quarter Day_lower': date.format('HH'),
'Half Day_lower': date.format('HH'), 'Half Day_lower': date.format('HH'),
'Day_lower': date.date() !== last_date.date() ? date.format('D') : '', 'Day_lower': date.date() !== last_date.date() ? date.format('D') : '',
'Week_lower': 'Week ' + date.format('W'), 'Week_lower': date.month() !== last_date.month() ?
date.format('D MMM') : date.format('D'),
'Month_lower': date.format('MMMM'), 'Month_lower': date.format('MMMM'),
'Quarter Day_upper': date.date() !== last_date.date() ? date.format('D MMM') : '', 'Quarter Day_upper': date.date() !== last_date.date() ? date.format('D MMM') : '',
'Half Day_upper': date.date() !== last_date.date() ? date.format('D MMM') : '', 'Half Day_upper': date.date() !== last_date.date() ?
date.month() !== last_date.month() ?
date.format('D MMM') : date.format('D') : '',
'Day_upper': date.month() !== last_date.month() ? date.format('MMMM') : '', 'Day_upper': date.month() !== last_date.month() ? date.format('MMMM') : '',
'Week_upper': date.month() !== last_date.month() ? date.format('MMMM') : '', 'Week_upper': date.month() !== last_date.month() ? date.format('MMMM') : '',
'Month_upper': date.year() !== last_date.year() ? date.format('YYYY') : '' 'Month_upper': date.year() !== last_date.year() ? date.format('YYYY') : ''
@ -422,9 +426,9 @@ export default function Gantt(element, tasks, config) {
'Half Day_upper': 0, 'Half Day_upper': 0,
'Day_lower': self.config.column_width / 2, 'Day_lower': self.config.column_width / 2,
'Day_upper': (self.config.column_width * 30) / 2, 'Day_upper': (self.config.column_width * 30) / 2,
'Week_lower': self.config.column_width / 2, 'Week_lower': 0,
'Week_upper': (self.config.column_width * 4) / 2, 'Week_upper': (self.config.column_width * 4) / 2,
'Month_lower': (date.daysInMonth() * self.config.column_width / 30) / 2, 'Month_lower': self.config.column_width / 2,
'Month_upper': (self.config.column_width * 12) / 2 'Month_upper': (self.config.column_width * 12) / 2
}; };

6
src/gantt.scss
View File

@ -109,14 +109,14 @@ $handle-color: #ddd;
} }
} }
.primary-text, .secondary-text { .lower-text, .upper-text {
font-size: 12px; font-size: 12px;
text-anchor: middle; text-anchor: middle;
} }
.primary-text { .upper-text {
fill: $text-light; fill: $text-light;
} }
.secondary-text { .lower-text {
fill: $text-color; fill: $text-color;
} }