upgraded jquery and jquery.gantt
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 93e38d8..2f52e7f 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,10 +1,11 @@
erpnext.updates = [
- ["14th November 2012", [
+ ["16th November 2012", [
"Appraisal: Cleaned up form and logic. Removed complex and unnecessary approval logic, \
the appraiser can select the template and role and make an appraisal. \
Normal user can see self created Appraisals. HR Manager can see all Appraisals.",
+ "Project: Bugfix in Gantt Chart (caused due to jquery conflict)",
]],
- ["14th November 2012", [
+ ["15th November 2012", [
"Customer Issue: Moved all allocations to 'Assigned' so that there is avoid duplication fo features.",
"Letter Head: Show preview, make upload button more visible.",
"Price List: Removed import, now import from Data Import Tool.",
diff --git a/public/js/gantt_task.js b/public/js/gantt_task.js
index 29c0bef..066ad34 100644
--- a/public/js/gantt_task.js
+++ b/public/js/gantt_task.js
@@ -27,24 +27,26 @@
var source = [];
// projects
$.each(r.message, function(i,v) {
- source.push({
- name: v.project,
- desc: v.subject,
- values: [{
- label: v.subject,
- desc: v.description || v.subject,
- from: '/Date("'+v.exp_start_date+'")/',
- to: '/Date("'+v.exp_end_date+'")/',
- customClass: {
- 'Open':'ganttRed',
- 'Pending Review':'ganttOrange',
- 'Working':'',
- 'Completed':'ganttGreen',
- 'Cancelled':'ganttGray'
- }[v.status],
- dataObj: v
- }]
- })
+ if(v.exp_start_date && v.exp_end_date) {
+ source.push({
+ name: v.project,
+ desc: v.subject,
+ values: [{
+ label: v.subject,
+ desc: v.description || v.subject,
+ from: '/Date("'+v.exp_start_date+'")/',
+ to: '/Date("'+v.exp_end_date+'")/',
+ customClass: {
+ 'Open':'ganttRed',
+ 'Pending Review':'ganttOrange',
+ 'Working':'',
+ 'Completed':'ganttGreen',
+ 'Cancelled':'ganttGray'
+ }[v.status],
+ dataObj: v
+ }]
+ })
+ }
});
return source
}
@@ -63,7 +65,7 @@
source: get_source(r),
navigate: project ? "button" : "scroll",
scale: "weeks",
- minScale: "weeks",
+ minScale: "day",
maxScale: "months",
onItemClick: function(data) {
wn.set_route('Form', 'Task', data.name);