Skip to content

dream
dream
Commit 666bc534 authored by Romain Courteaud's avatar Romain Courteaud Committed by Jérome Perrin
Browse files
Options

Display spreadsheet with handsontable.

parent 1d3ff25a
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 23 deletions
Gruntfile.js
View file @ 666bc534
...@@ -198,13 +198,13 @@ module.exports = function (grunt) { ...@@ -198,13 +198,13 @@ module.exports = function (grunt) {
}, },
handsontablejs: { handsontablejs: {
src: 'https://raw.githubusercontent.com/warpech/' + src: 'https://raw.githubusercontent.com/warpech/' +
'jquery-handsontable/v0.10.5/dist/jquery.handsontable.js', 'jquery-handsontable/v0.10.5/dist/jquery.handsontable.full.js',
relative_dest: 'lib/handsontable.js', relative_dest: 'lib/handsontable.js',
dest: '<%= global_config.dest %>/<%= curl.handsontablejs.relative_dest %>' dest: '<%= global_config.dest %>/<%= curl.handsontablejs.relative_dest %>'
}, },
handsontablecss: { handsontablecss: {
src: 'https://raw.githubusercontent.com/warpech/' + src: 'https://raw.githubusercontent.com/warpech/' +
'jquery-handsontable/v0.10.5/dist/jquery.handsontable.css', 'jquery-handsontable/v0.10.5/dist/jquery.handsontable.full.css',
relative_dest: 'lib/handsontable.css', relative_dest: 'lib/handsontable.css',
dest: '<%= global_config.dest %>/<%= curl.handsontablecss.relative_dest %>' dest: '<%= global_config.dest %>/<%= curl.handsontablecss.relative_dest %>'
// }, // },
......
dream/platform/src/index.html
View file @ 666bc534
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
<link rel="stylesheet" href="css/skeleton_wide.css"> <link rel="stylesheet" href="css/skeleton_wide.css">
<link rel="stylesheet" href="css/layout.css"> <link rel="stylesheet" href="css/layout.css">
<link rel="stylesheet" href="css/jquery-ui-1.10.3.custom.min.css"> <link rel="stylesheet" href="css/jquery-ui-1.10.3.custom.min.css">
<link rel="stylesheet" type="text/css" href="css/jquery.handsontable.full.css">
<link rel="stylesheet" type="text/css" href="lib/dhtmlxgantt/dhtmlxgantt.css"> <link rel="stylesheet" type="text/css" href="lib/dhtmlxgantt/dhtmlxgantt.css">
<link rel="stylesheet" href="css/demo-new.css"> <link rel="stylesheet" href="css/demo-new.css">
<link rel="stylesheet" href="css/font-awesome.css"> <link rel="stylesheet" href="css/font-awesome.css">
...@@ -132,9 +131,6 @@ ...@@ -132,9 +131,6 @@
<script type="text/javascript" src="lib/jquery.flot.js"></script> <script type="text/javascript" src="lib/jquery.flot.js"></script>
<script type="text/javascript" src="lib/jquery.flot.stack.js"></script> <script type="text/javascript" src="lib/jquery.flot.stack.js"></script>
<!-- spreadsheet -->
<script type="text/javascript" src="lib/jquery.handsontable.full.js"></script>
<!-- gantt chart --> <!-- gantt chart -->
<script type="text/javascript" src="lib/dhtmlxgantt/dhtmlxgantt.js"></script> <script type="text/javascript" src="lib/dhtmlxgantt/dhtmlxgantt.js"></script>
......
dream/platform/src/src/dream_launcher.js
View file @ 666bc534
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
} }
try { try {
// spreadsheets // // spreadsheets
var shift_spreadsheet_data = data.shift_spreadsheet; // var shift_spreadsheet_data = data.shift_spreadsheet;
if (shift_spreadsheet_data !== undefined) { // if (shift_spreadsheet_data !== undefined) {
var spreadsheet = $('#shift_spreadsheet'); // var spreadsheet = $('#shift_spreadsheet');
spreadsheet.handsontable('populateFromArray', 0, 0, shift_spreadsheet_data); // spreadsheet.handsontable('populateFromArray', 0, 0, shift_spreadsheet_data);
} // }
var wip_part_spreadsheet_data = data.wip_part_spreadsheet; var wip_part_spreadsheet_data = data.wip_part_spreadsheet;
if (wip_part_spreadsheet_data !== undefined) { if (wip_part_spreadsheet_data !== undefined) {
var spreadsheet = $('#wip_part_spreadsheet'); var spreadsheet = $('#wip_part_spreadsheet');
......
dream/platform/src2/dream/edit_table.html
View file @ 666bc534
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<script src="edit_table.js" type="text/javascript"></script> <script src="edit_table.js" type="text/javascript"></script>
</head> </head>
<body> <body>
<section class="document_list"></section> <div data-gadget-url="../handsontable/index.html"
data-gadget-scope="tableeditor"></div>
</body> </body>
</html> </html>
dream/platform/src2/dream/edit_table.js
View file @ 666bc534
...@@ -33,12 +33,28 @@ ...@@ -33,12 +33,28 @@
var jio_key = options.id, var jio_key = options.id,
gadget = this; gadget = this;
gadget.props.jio_key = jio_key; gadget.props.jio_key = jio_key;
return gadget.aq_getAttachment({
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.aq_getAttachment({
"_id": jio_key, "_id": jio_key,
"_attachment": "body.json" "_attachment": "body.json"
}),
gadget.getDeclaredGadget("tableeditor")
]);
})
.push(function (result_list) {
return result_list[1].render(
JSON.stringify(JSON.parse(result_list[0]).shift_spreadsheet)
);
});
}) })
.push(function (result) {
gadget.props.element.textContent = result; .declareMethod("startService", function () {
return this.getDeclaredGadget("tableeditor")
.push(function (tableeditor) {
return tableeditor.startService();
}); });
}); });
}(window, rJS, RSVP, initDocumentPageMixin)); }(window, rJS, RSVP, initDocumentPageMixin));
dream/platform/src2/handsontable/handsontable.js
View file @ 666bc534
/*global jQuery, rJS, window, JSON */ /*global jQuery, rJS, window, JSON, RSVP */
(function (window, $, rJS, JSON) { (function (window, $, rJS, JSON, RSVP) {
"use strict"; "use strict";
rJS(window) rJS(window)
...@@ -9,7 +9,14 @@ ...@@ -9,7 +9,14 @@
return this.getElement() return this.getElement()
.push(function (element) { .push(function (element) {
$(element).find('.table-container') $(element).find('.table-container')
.handsontable({data: data}); .handsontable({
data: data,
minSpareRows: 1,
stretchH: 'all'
// afterChange: function () {
// priv.onDataChange();
// }
});
}); });
}) })
...@@ -20,5 +27,22 @@ ...@@ -20,5 +27,22 @@
.handsontable('getData'); .handsontable('getData');
return JSON.stringify(data); return JSON.stringify(data);
}); });
})
.declareMethod("startService", function () {
var gadget_element;
return this.getElement()
.push(function (element) {
gadget_element = element;
$(element).find('.table-container').handsontable("render");
})
.push(function () {
// Infinite wait, until cancelled
return (new RSVP.defer()).promise;
})
.push(undefined, function (error) {
$(gadget_element).find('.table-container').handsontable("destroy");
throw error;
});
}); });
}(window, jQuery, rJS, JSON)); }(window, jQuery, rJS, JSON, RSVP));
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7