Commit 8d0bb086 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

cosmetic change only : tab -> 8 spaces.

parent 7c574b00
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
if (spreadsheet_data !== undefined) { if (spreadsheet_data !== undefined) {
var spreadsheet = $('#spreadsheet_input'); var spreadsheet = $('#spreadsheet_input');
spreadsheet.handsontable('populateFromArray', 0, 0, spreadsheet_data); spreadsheet.handsontable('populateFromArray', 0, 0, spreadsheet_data);
spreadsheet.find('.htCore').width(spreadsheet.width()); spreadsheet.find('.htCore').width(spreadsheet.width());
} }
var preference = data.preference !== undefined ? var preference = data.preference !== undefined ?
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
dream_instance.redraw(); dream_instance.redraw();
} }
} catch (e) { } catch (e) {
alert('Loading data failed.'); alert('Loading data failed.');
} }
}; };
// Check if there is already data when we first load the page, if yes, then build graph from it // Check if there is already data when we first load the page, if yes, then build graph from it
...@@ -324,27 +324,27 @@ ...@@ -324,27 +324,27 @@
working_data = [], working_data = [],
ticks = [], ticks = [],
counter = 1, counter = 1,
spreadsheet_data = [[ spreadsheet_data = [[
"Jobs", "Jobs",
"ID", "ID",
"Order Date", "Order Date",
"Due Date", "Due Date",
"Priority", "Priority",
"Material", "Material",
"Entrance Time", "Entrance Time",
"Station ID", "Station ID",
"Step No." "Step No."
]], ]],
gantt_data = { gantt_data = {
data: [], data: [],
link: [] link: []
}; };
// temporary hack // temporary hack
var now = new Date(); var now = new Date();
now.setHours(0); now.setHours(0);
now.setMinutes(0); now.setMinutes(0);
now.setSeconds(0); now.setSeconds(0);
$.each(data['success'].elementList, function (idx, obj) { $.each(data['success'].elementList, function (idx, obj) {
if (obj.results.working_ratio !== undefined) { if (obj.results.working_ratio !== undefined) {
...@@ -375,48 +375,48 @@ ...@@ -375,48 +375,48 @@
counter++; counter++;
} }
if (obj._class === 'Dream.Job') { if (obj._class === 'Dream.Job') {
var property_dict = obj.extraPropertyDict; var property_dict = obj.extraPropertyDict;
var duration = 0; var duration = 0;
var start_date = new Date(now.getTime()); var start_date = new Date(now.getTime());
gantt_data.data.push({ gantt_data.data.push({
id: obj['id'], id: obj['id'],
text: property_dict['name'], text: property_dict['name'],
start_date: start_date, start_date: start_date,
duration: obj['results'].completionTime, duration: obj['results'].completionTime,
project: 1, project: 1,
open: true open: true
}); });
$.each(obj['results']['schedule'], function (i, schedule) { $.each(obj['results']['schedule'], function (i, schedule) {
spreadsheet_data.push([ spreadsheet_data.push([
property_dict['name'], property_dict['name'],
obj['id'], obj['id'],
property_dict['order_date'], property_dict['order_date'],
property_dict['due_date'], property_dict['due_date'],
property_dict['priority'], property_dict['priority'],
property_dict['material'], property_dict['material'],
schedule['entranceTime'], schedule['entranceTime'],
schedule['stationId'], schedule['stationId'],
schedule['stepNumber'] schedule['stepNumber']
]); ]);
if (obj['results']['schedule'][i+1]) { if (obj['results']['schedule'][i+1]) {
duration = obj['results']['schedule'][i+1]['entranceTime'] - schedule['entranceTime']; duration = obj['results']['schedule'][i+1]['entranceTime'] - schedule['entranceTime'];
} else { } else {
duration = obj['results'].completionTime - schedule['entranceTime']; duration = obj['results'].completionTime - schedule['entranceTime'];
} }
if (duration > 0.0) { if (duration > 0.0) {
var task_start_date = new Date(start_date.getTime()); var task_start_date = new Date(start_date.getTime());
task_start_date.setDate(task_start_date.getDate() + schedule['entranceTime']); task_start_date.setDate(task_start_date.getDate() + schedule['entranceTime']);
gantt_data.data.push({ gantt_data.data.push({
id:obj['id'] + '.' + schedule['stepNumber'], id:obj['id'] + '.' + schedule['stepNumber'],
text: schedule['stationId'], text: schedule['stationId'],
start_date: task_start_date, start_date: task_start_date,
duration: duration, duration: duration,
parent: obj['id'] parent: obj['id']
}); });
} }
}); });
} }
}); });
var series = [{ var series = [{
...@@ -452,20 +452,20 @@ ...@@ -452,20 +452,20 @@
}; };
$.plot("#graph", series, options); $.plot("#graph", series, options);
if (spreadsheet_data.length > 1) { if (spreadsheet_data.length > 1) {
var spreadsheet = $('#spreadsheet_output'); var spreadsheet = $('#spreadsheet_output');
spreadsheet.show(); spreadsheet.show();
spreadsheet.handsontable({ spreadsheet.handsontable({
data: spreadsheet_data, data: spreadsheet_data,
readOnly: true readOnly: true
}); });
spreadsheet.find('.htCore').width(spreadsheet.width()); spreadsheet.find('.htCore').width(spreadsheet.width());
$('#gantt_output').show().dhx_gantt({ $('#gantt_output').show().dhx_gantt({
data: gantt_data, data: gantt_data,
scale_unit: 'day', scale_unit: 'day',
step: 7 step: 7
}); });
} }
} else { } else {
$("#json_result").effect('shake', 50).val(data['error']); $("#json_result").effect('shake', 50).val(data['error']);
} }
......
...@@ -114,14 +114,14 @@ ...@@ -114,14 +114,14 @@
priv.initSpreadSheet = function () { priv.initSpreadSheet = function () {
var spreadsheet = $('#spreadsheet_input'); var spreadsheet = $('#spreadsheet_input');
var data = [[ var data = [[
"Jobs", "Jobs",
"ID", "ID",
"Order Date", "Order Date",
"Due Date", "Due Date",
"Priority", "Priority",
"Material", "Material",
"Sequence", "Sequence",
"Processing Times" "Processing Times"
]]; ]];
spreadsheet.handsontable({ spreadsheet.handsontable({
data: data, data: data,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment