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
3047d1a7
Commit
3047d1a7
authored
Feb 24, 2014
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PartJobShop: display in GUI a spreadsheet to define parts of an order
parent
d7ffe32a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
0 deletions
+39
-0
dream/platform/static/index.html
dream/platform/static/index.html
+1
-0
dream/platform/static/src/dream_launcher.js
dream/platform/static/src/dream_launcher.js
+10
-0
dream/platform/static/src/jsonPlumb.js
dream/platform/static/src/jsonPlumb.js
+27
-0
dream/simulation/GUI/Default.py
dream/simulation/GUI/Default.py
+1
-0
No files found.
dream/platform/static/index.html
View file @
3047d1a7
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
<div
class=
"twelve columns"
>
<div
class=
"twelve columns"
>
<div
id=
"main"
></div>
<div
id=
"main"
></div>
<div
id=
"wip_spreadsheet"
style=
"display: none;"
></div>
<div
id=
"wip_spreadsheet"
style=
"display: none;"
></div>
<div
id=
"wip_part_spreadsheet"
style=
"display: none;"
></div>
<div
id=
"shift_spreadsheet"
style=
"display: none;"
></div>
<div
id=
"shift_spreadsheet"
style=
"display: none;"
></div>
</div>
</div>
...
...
dream/platform/static/src/dream_launcher.js
View file @
3047d1a7
...
@@ -70,10 +70,14 @@
...
@@ -70,10 +70,14 @@
$
(
'
#shift_spreadsheet
'
).
hide
();
$
(
'
#shift_spreadsheet
'
).
hide
();
$
(
"
#job_gantt
"
).
hide
();
$
(
"
#job_gantt
"
).
hide
();
$
(
"
#wip_spreadsheet
"
).
hide
();
$
(
"
#wip_spreadsheet
"
).
hide
();
$
(
"
#wip_part_spreadsheet
"
).
hide
();
if
(
configuration
[
'
Dream-Configuration
'
].
gui
.
wip_spreadsheet
){
if
(
configuration
[
'
Dream-Configuration
'
].
gui
.
wip_spreadsheet
){
$
(
"
#wip_spreadsheet
"
).
show
();
$
(
"
#wip_spreadsheet
"
).
show
();
}
}
if
(
configuration
[
'
Dream-Configuration
'
].
gui
.
wip_part_spreadsheet
){
$
(
"
#wip_part_spreadsheet
"
).
show
();
}
if
(
configuration
[
'
Dream-Configuration
'
].
gui
.
shift_spreadsheet
){
if
(
configuration
[
'
Dream-Configuration
'
].
gui
.
shift_spreadsheet
){
$
(
"
#shift_spreadsheet
"
).
show
();
$
(
"
#shift_spreadsheet
"
).
show
();
}
}
...
@@ -95,6 +99,12 @@
...
@@ -95,6 +99,12 @@
spreadsheet
.
handsontable
(
'
populateFromArray
'
,
0
,
0
,
shift_spreadsheet_data
);
spreadsheet
.
handsontable
(
'
populateFromArray
'
,
0
,
0
,
shift_spreadsheet_data
);
spreadsheet
.
find
(
'
.htCore
'
).
width
(
spreadsheet
.
width
());
spreadsheet
.
find
(
'
.htCore
'
).
width
(
spreadsheet
.
width
());
}
}
var
wip_part_spreadsheet_data
=
data
.
wip_part_spreadsheet
;
if
(
wip_part_spreadsheet_data
!==
undefined
)
{
var
spreadsheet
=
$
(
'
#wip_part_spreadsheet
'
);
spreadsheet
.
handsontable
(
'
populateFromArray
'
,
0
,
0
,
wip_part_spreadsheet_data
);
spreadsheet
.
find
(
'
.htCore
'
).
width
(
spreadsheet
.
width
());
}
var
preference
=
data
.
preference
!==
undefined
?
var
preference
=
data
.
preference
!==
undefined
?
data
.
preference
:
{};
data
.
preference
:
{};
...
...
dream/platform/static/src/jsonPlumb.js
View file @
3047d1a7
...
@@ -134,6 +134,29 @@
...
@@ -134,6 +134,29 @@
});
});
wip_spreadsheet
.
find
(
'
.htCore
'
).
width
(
wip_spreadsheet
.
width
());
wip_spreadsheet
.
find
(
'
.htCore
'
).
width
(
wip_spreadsheet
.
width
());
var
wip_part_spreadsheet
=
$
(
'
#wip_part_spreadsheet
'
);
var
data
=
[
[
"
Order ID
"
,
"
Due Date
"
,
"
Priority
"
,
"
Project Manager
"
,
"
Parts
"
,
"
Part Type
"
,
"
Sequence
"
,
"
Processing Times
"
,
"
Electrodes Needed
"
]
];
wip_part_spreadsheet
.
handsontable
({
data
:
data
,
minSpareRows
:
1
,
afterChange
:
function
()
{
priv
.
onDataChange
();
}
});
wip_part_spreadsheet
.
find
(
'
.htCore
'
).
width
(
wip_part_spreadsheet
.
width
());
var
shift_spreadsheet
=
$
(
'
#shift_spreadsheet
'
);
var
shift_spreadsheet
=
$
(
'
#shift_spreadsheet
'
);
var
data
=
[
var
data
=
[
[
[
...
@@ -321,6 +344,10 @@
...
@@ -321,6 +344,10 @@
if
(
wip_spreadsheet
.
length
>
0
)
{
if
(
wip_spreadsheet
.
length
>
0
)
{
data
[
'
wip_spreadsheet
'
]
=
wip_spreadsheet
.
handsontable
(
'
getData
'
);
data
[
'
wip_spreadsheet
'
]
=
wip_spreadsheet
.
handsontable
(
'
getData
'
);
}
}
var
wip_part_spreadsheet
=
$
(
'
#wip_part_spreadsheet
'
);
if
(
wip_part_spreadsheet
.
length
>
0
)
{
data
[
'
wip_part_spreadsheet
'
]
=
wip_part_spreadsheet
.
handsontable
(
'
getData
'
);
}
var
shift_spreadsheet
=
$
(
'
#shift_spreadsheet
'
);
var
shift_spreadsheet
=
$
(
'
#shift_spreadsheet
'
);
if
(
shift_spreadsheet
.
length
>
0
)
{
if
(
shift_spreadsheet
.
length
>
0
)
{
data
[
'
shift_spreadsheet
'
]
=
shift_spreadsheet
.
handsontable
(
'
getData
'
);
data
[
'
shift_spreadsheet
'
]
=
shift_spreadsheet
.
handsontable
(
'
getData
'
);
...
...
dream/simulation/GUI/Default.py
View file @
3047d1a7
...
@@ -245,6 +245,7 @@ class Simulation(object):
...
@@ -245,6 +245,7 @@ class Simulation(object):
"gui"
:
{
"gui"
:
{
'debug_json'
:
0
,
'debug_json'
:
0
,
'wip_spreadsheet'
:
0
,
'wip_spreadsheet'
:
0
,
'wip_part_spreadsheet'
:
0
,
'shift_spreadsheet'
:
0
,
'shift_spreadsheet'
:
0
,
'station_utilisation_graph'
:
1
,
'station_utilisation_graph'
:
1
,
...
...
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