Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
d278c023
Commit
d278c023
authored
Feb 17, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repair outputs now that we no longer have extraPropertyDict
parent
9b8d9c16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
7 deletions
+18
-7
dream/platform/static/src/dream.js
dream/platform/static/src/dream.js
+18
-7
No files found.
dream/platform/static/src/dream.js
View file @
d278c023
...
...
@@ -303,6 +303,7 @@
"
Priority
"
,
"
Material
"
,
"
Entrance Time
"
,
"
Processing Time
"
,
"
Station ID
"
,
"
Step No.
"
]
...
...
@@ -381,26 +382,36 @@
}
if
(
obj
.
_class
===
'
Dream.Job
'
)
{
var
property_dict
=
obj
.
extraPropertyDict
;
// find the corresponding input
var
data
=
that
.
getData
(),
input_job
;
$
.
each
(
data
.
spreadsheet
,
function
(
i
,
line
){
if
(
line
[
1
]
==
obj
[
'
id
'
])
{
input_job
=
line
;
}
});
var
duration
=
0
;
gantt_data
.
data
.
push
({
id
:
obj
[
'
id
'
],
text
:
property_dict
[
'
name
'
],
text
:
input_job
[
1
],
start_date
:
start_date
,
duration
:
obj
[
'
results
'
].
completionTime
,
project
:
1
,
open
:
false
,
parent
:
"
by_job
"
});
$
.
each
(
obj
[
'
results
'
][
'
schedule
'
],
function
(
i
,
schedule
)
{
spreadsheet_data
.
push
([
property_dict
[
'
name
'
],
input_job
[
0
],
obj
[
'
id
'
],
property_dict
[
'
order_date
'
],
property_dict
[
'
due_date
'
],
property_dict
[
'
priority
'
],
property_dict
[
'
material
'
],
input_job
[
2
],
// orderDate
input_job
[
3
],
// dueDate
input_job
[
4
],
// priority
input_job
[
5
],
// material
schedule
[
'
entranceTime
'
],
input_job
[
7
].
split
(
'
-
'
)[
schedule
[
'
stepNumber
'
]]
||
0
,
// processing time
schedule
[
'
stationId
'
],
schedule
[
'
stepNumber
'
]
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment