fixed month issues, change lib name to frappe-gantt
This commit is contained in:
parent
4297b28113
commit
abfbaa709b
39
lib/gantt.js → dist/frappe-gantt.js
vendored
39
lib/gantt.js → dist/frappe-gantt.js
vendored
@ -2,11 +2,11 @@
|
||||
if(typeof exports === 'object' && typeof module === 'object')
|
||||
module.exports = factory();
|
||||
else if(typeof define === 'function' && define.amd)
|
||||
define("gantt", [], factory);
|
||||
define("Gantt", [], factory);
|
||||
else if(typeof exports === 'object')
|
||||
exports["gantt"] = factory();
|
||||
exports["Gantt"] = factory();
|
||||
else
|
||||
root["gantt"] = factory();
|
||||
root["Gantt"] = factory();
|
||||
})(this, function() {
|
||||
return /******/ (function(modules) { // webpackBootstrap
|
||||
/******/ // The module cache
|
||||
@ -117,6 +117,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
// fire viewmode_change event
|
||||
trigger_event('view_change', [mode]);
|
||||
}
|
||||
self.change_view_mode = change_view_mode;
|
||||
|
||||
function prepare() {
|
||||
prepare_tasks();
|
||||
@ -141,9 +142,11 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
if (!task.start && !task.end) {
|
||||
task._start = moment().startOf('day');
|
||||
task._end = moment().startOf('day').add(2, 'days');
|
||||
} else if (!task.start) {
|
||||
}
|
||||
if (!task.start && task.end) {
|
||||
task._start = task._end.clone().add(-2, 'days');
|
||||
} else {
|
||||
}
|
||||
if (task.start && !task.end) {
|
||||
task._end = task._start.clone().add(2, 'days');
|
||||
}
|
||||
|
||||
@ -153,19 +156,17 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
}
|
||||
|
||||
// dependencies
|
||||
var deps = void 0;
|
||||
|
||||
if (task.dependencies) {
|
||||
deps = task.dependencies.split(',').map(function (d) {
|
||||
return d.trim();
|
||||
}).filter(function (d) {
|
||||
return d;
|
||||
});
|
||||
} else {
|
||||
deps = [];
|
||||
if (typeof task.dependencies === 'string' || !task.dependencies) {
|
||||
var deps = [];
|
||||
if (task.dependencies) {
|
||||
deps = task.dependencies.split(',').map(function (d) {
|
||||
return d.trim();
|
||||
}).filter(function (d) {
|
||||
return d;
|
||||
});
|
||||
}
|
||||
task.dependencies = deps;
|
||||
}
|
||||
task.dependencies = deps;
|
||||
|
||||
return task;
|
||||
});
|
||||
}
|
||||
@ -1518,7 +1519,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
var x = self.task._start.diff(gt.gantt_start, 'hours') / gt.config.step * gt.config.column_width;
|
||||
|
||||
if (gt.view_is('Month')) {
|
||||
x = self.task._start.diff(gt.config.start, 'days') * gt.config.column_width / 30;
|
||||
x = self.task._start.diff(gt.gantt_start, 'days') * gt.config.column_width / 30;
|
||||
}
|
||||
return x;
|
||||
}
|
||||
@ -1721,4 +1722,4 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
/******/ ])
|
||||
});
|
||||
;
|
||||
//# sourceMappingURL=gantt.js.map
|
||||
//# sourceMappingURL=frappe-gantt.js.map
|
||||
1
dist/frappe-gantt.js.map
vendored
Normal file
1
dist/frappe-gantt.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
2
dist/frappe-gantt.min.js
vendored
Normal file
2
dist/frappe-gantt.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/frappe-gantt.min.js.map
vendored
Normal file
1
dist/frappe-gantt.min.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -18,7 +18,7 @@
|
||||
</style>
|
||||
<script src="node_modules/moment/min/moment.min.js"></script>
|
||||
<script src="node_modules/snapsvg/dist/snap.svg-min.js"></script>
|
||||
<script src="lib/gantt.js"></script>
|
||||
<script src="dist/frappe-gantt.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
@ -32,7 +32,7 @@
|
||||
var tasks = arr.map(function(i){
|
||||
return {
|
||||
start: "2016-10-0"+i,
|
||||
end: "2016-10-2"+i,
|
||||
end: "2016-11-0"+i,
|
||||
name: "Task "+i,
|
||||
id: "Task"+i,
|
||||
progress: i*10
|
||||
@ -41,7 +41,7 @@
|
||||
tasks[1].dependencies = 'Task1';
|
||||
tasks[2].dependencies = 'Task2';
|
||||
|
||||
var gantt_chart = gantt("#gantt", tasks, {
|
||||
var gantt_chart = Gantt("#gantt", tasks, {
|
||||
date_format: "YYYY-MM-DD",
|
||||
bar: {
|
||||
height: 20
|
||||
|
||||
File diff suppressed because one or more lines are too long
2
lib/gantt.min.js
vendored
2
lib/gantt.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
23
package.json
23
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gantt",
|
||||
"version": "0.1.3",
|
||||
"name": "frappe-gantt",
|
||||
"version": "0.0.1",
|
||||
"description": "Visualize tasks on a timeline",
|
||||
"main": "lib/gantt.js",
|
||||
"scripts": {
|
||||
@ -28,23 +28,20 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/krasimir/webpack-library-starter.git"
|
||||
"url": "https://github.com/frappe/gantt.git"
|
||||
},
|
||||
"keywords": [
|
||||
"webpack",
|
||||
"es6",
|
||||
"starter",
|
||||
"library",
|
||||
"universal",
|
||||
"umd",
|
||||
"commonjs"
|
||||
"gantt",
|
||||
"svg",
|
||||
"simple gantt",
|
||||
"project timeline"
|
||||
],
|
||||
"author": "Krasimir Tsonev",
|
||||
"author": "Faris Ansari",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/krasimir/webpack-library-starter/issues"
|
||||
"url": "https://github.com/frappe/gantt/issues"
|
||||
},
|
||||
"homepage": "https://github.com/krasimir/webpack-library-starter",
|
||||
"homepage": "https://github.com/frappe/gantt",
|
||||
"dependencies": {
|
||||
"moment": "^2.17.1",
|
||||
"snapsvg": "^0.4.0"
|
||||
|
||||
@ -400,7 +400,7 @@ export default function Bar(gt, task) {
|
||||
gt.config.step * gt.config.column_width;
|
||||
|
||||
if (gt.view_is('Month')) {
|
||||
x = self.task._start.diff(gt.config.start, 'days') *
|
||||
x = self.task._start.diff(gt.gantt_start, 'days') *
|
||||
gt.config.column_width / 30;
|
||||
}
|
||||
return x;
|
||||
|
||||
27
src/Gantt.js
27
src/Gantt.js
@ -61,6 +61,7 @@ export default function Gantt(element, tasks, config) {
|
||||
// fire viewmode_change event
|
||||
trigger_event('view_change', [mode]);
|
||||
}
|
||||
self.change_view_mode = change_view_mode;
|
||||
|
||||
function prepare() {
|
||||
prepare_tasks();
|
||||
@ -85,9 +86,11 @@ export default function Gantt(element, tasks, config) {
|
||||
if(!task.start && !task.end) {
|
||||
task._start = moment().startOf('day');
|
||||
task._end = moment().startOf('day').add(2, 'days');
|
||||
} else if(!task.start) {
|
||||
}
|
||||
if(!task.start && task.end) {
|
||||
task._start = task._end.clone().add(-2, 'days');
|
||||
} else {
|
||||
}
|
||||
if(task.start && !task.end) {
|
||||
task._end = task._start.clone().add(2, 'days');
|
||||
}
|
||||
|
||||
@ -97,18 +100,16 @@ export default function Gantt(element, tasks, config) {
|
||||
}
|
||||
|
||||
// dependencies
|
||||
let deps;
|
||||
|
||||
if(task.dependencies) {
|
||||
deps = task.dependencies
|
||||
.split(',')
|
||||
.map(d => d.trim())
|
||||
.filter((d) => d);
|
||||
} else {
|
||||
deps = [];
|
||||
if(typeof task.dependencies === 'string' || !task.dependencies) {
|
||||
let deps = [];
|
||||
if(task.dependencies) {
|
||||
deps = task.dependencies
|
||||
.split(',')
|
||||
.map(d => d.trim())
|
||||
.filter((d) => d);
|
||||
}
|
||||
task.dependencies = deps;
|
||||
}
|
||||
task.dependencies = deps;
|
||||
|
||||
return task;
|
||||
});
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ var UglifyJsPlugin = webpack.optimize.UglifyJsPlugin;
|
||||
var path = require('path');
|
||||
var env = require('yargs').argv.mode;
|
||||
|
||||
var libraryName = 'gantt';
|
||||
var libraryName = 'frappe-gantt';
|
||||
|
||||
var plugins = [], outputFile;
|
||||
|
||||
@ -18,9 +18,9 @@ let config = {
|
||||
entry: __dirname + '/src/Gantt.js',
|
||||
devtool: 'source-map',
|
||||
output: {
|
||||
path: __dirname + '/lib',
|
||||
path: __dirname + '/dist',
|
||||
filename: outputFile,
|
||||
library: libraryName,
|
||||
library: 'Gantt',
|
||||
libraryTarget: 'umd',
|
||||
umdNamedDefine: true
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user