Skip to content

erp5
erp5
Commit 5a7282a3 authored by Klaus Wölfel's avatar Klaus Wölfel
2 Browse files
Options

[erp5_officejs]: notebook uses jsmd_viewer and add pdf export

parent e475b4ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 986 additions and 49 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_notebook_view_html.xml
View file @ 5a7282a3
......@@ -91,7 +91,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>gadget_officejs_jio_notebook_view.html</string> </value>
<value> <string>gadget_officejs_jio_notebook_view_html</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......@@ -248,7 +248,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>969.37889.56311.25753</string> </value>
<value> <string>978.51175.28075.44014</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -266,7 +266,7 @@
</tuple>
<state>
<tuple>
<float>1534254952.0</float>
<float>1569848367.78</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_notebook_view_js.js
View file @ 5a7282a3
/*global window, rJS, RSVP */
/*global window, jIO, rJS, RSVP, Blob */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, rJS, RSVP) {
(function (window, jIO, rJS, RSVP, Blob) {
"use strict";
rJS(window)
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
.declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("updateDocument", "updateDocument")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")
......@@ -26,7 +30,7 @@
})
.onEvent('submit', function () {
var gadget = this;
var gadget = this, data;
return gadget.notifySubmitting()
.push(function () {
return gadget.getDeclaredGadget('form_view');
......@@ -35,7 +39,19 @@
return form_gadget.getContent();
})
.push(function (content) {
return gadget.updateDocument(content);
data = content.text_content;
delete content.text_content;
return RSVP.all([
gadget.getSetting("content_type"),
gadget.updateDocument(content)
]);
})
.push(function (result_list) {
return gadget.jio_putAttachment(
gadget.state.jio_key,
"data",
new Blob([data], {type: result_list[0]})
);
})
.push(function () {
return gadget.notifySubmitted({message: 'Data Updated', status: 'success'});
......@@ -47,8 +63,21 @@
})
.onStateChange(function () {
var gadget = this;
return gadget.getDeclaredGadget('form_view')
var gadget = this, data;
return gadget.jio_getAttachment(gadget.state.jio_key, "data")
.push(undefined, function (error) {
if (error instanceof jIO.util.jIOError && error.status_code === 404) {
return new Blob();
}
throw error;
})
.push(function (blob) {
return jIO.util.readBlobAsText(blob);
})
.push(function (evt) {
data = evt.target.result;
return gadget.getDeclaredGadget('form_view');
})
.push(function (form_gadget) {
return form_gadget.render({
erp5_document: {
......@@ -109,7 +138,7 @@
"type": "TextAreaField"
},
"my_content": {
"default": gadget.state.doc.text_content,
"default": data,
"css_class": "",
"required": 0,
"editable": 1,
......@@ -118,7 +147,7 @@
"type": "GadgetField",
"url": "gadget_editor.html",
"sandbox": "public",
"renderjs_extra": '{"editor": "notebook_editor", "maximize": true}'
"renderjs_extra": '{"editor": "jsmd_editor", "maximize": true}'
}
}},
"_links": {
......@@ -152,7 +181,7 @@
gadget.getUrlFor({command: 'selection_next'}),
gadget.getUrlFor({
command: 'change',
options: {'page': "ojs_download"}
options: {'page': 'ojs_notebook_export'}
})
]);
})
......@@ -160,11 +189,11 @@
return gadget.updateHeader({
page_title: gadget.state.doc.title,
save_action: true,
export_url: url_list[3],
selection_url: url_list[0],
previous_url: url_list[1],
next_url: url_list[2],
download_url: url_list[3]
next_url: url_list[2]
});
});
});
}(window, rJS, RSVP));
}(window, jIO, rJS, RSVP, Blob));
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_notebook_view_js.xml
View file @ 5a7282a3
......@@ -87,7 +87,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>gadget_officejs_jio_notebook_view.js</string> </value>
<value> <string>gadget_officejs_jio_notebook_view_js</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>970.42986.60138.7065</string> </value>
<value> <string>978.54387.27074.52445</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1538406432.04</float>
<float>1569943229.61</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_notebook.appcache.xml
View file @ 5a7282a3
......@@ -111,7 +111,7 @@
<item>
<key> <string>text_content</string> </key>
<value> <string>CACHE MANIFEST\n
# generated on Fri, 01 Feb 2019 11:45:33 +0000\n
# generated on Fri, 31 Sep 2019 16:47:33 +0000\n
# XXX + fonts\n
# images/ajax-loader.gif\n
CACHE:\n
......@@ -122,42 +122,43 @@ nexedi_logo_officejs_iodide.svg\n
gadget_officejs_notebook_router.html\n
gadget_officejs_jio_notebook_view.html\n
gadget_officejs_jio_notebook_view.js\n
gadget_officejs_jio_notebook.js\n
gadget_erp5_page_ojs_upload.js\n
gadget_erp5_page_ojs_upload.html\n
gadget_erp5_page_ojs_download.js\n
gadget_erp5_page_ojs_download.html\n
gadget_erp5_page_ojs_notebook_list.js\n
gadget_erp5_page_ojs_notebook_list.html\n
gadget_notebook.html\n
iodide_master.js\n
iodide_master.css\n
pyodide.js\n
pyodide.asm.data.js\n
pyodide.asm.js\n
pyodide.asm.wasm\n
pyodide.asm.data\n
gadget_erp5_page_ojs_notebook_export.html\n
gadget_erp5_page_ojs_notebook_export.js\n
gadget_jsmd_viewer.css\n
gadget_jsmd_viewer.html\n
gadget_jsmd_viewer.js\n
gadget_jsmd_eval.html\n
gadget_jsmd_eval.js\n
gadget_jsmd_eval.css\n
iodide_utils.js\n
marked.js\n
cycler.data\n
cycler.js\n
kiwisolver.data\n
kiwisolver.js\n
matplotlib.data\n
matplotlib.js\n
numpy.data\n
matplotlib.data\n
numpy.js\n
numpy.data\n
packages.json\n
pandas.data\n
pandas.js\n
pyodide.asm.js\n
pyodide.asm.html\n
pyodide.py\n
pyodide.asm.data.js\n
pyodide.asm.data\n
pyodide.asm.wasm\n
pyparsing.data\n
pyparsing.js\n
python-dateutil.data\n
python-dateutil.js\n
python.html\n
pytz.data\n
pytz.js\n
renderedhtml.css\n
xlrd.data\n
xlrd.js\n
\n
......@@ -213,10 +214,18 @@ gadget_erp5_page_ojs_sync.html\n
gadget_erp5_page_ojs_sync.js\n
gadget_erp5_page_ojs_document_list.html\n
gadget_erp5_page_ojs_document_list.js\n
gadget_erp5_page_ojs_download_convert.html\n
gadget_erp5_page_ojs_download_convert.js\n
gadget_ojs_configurator_access.html\n
gadget_ojs_configurator_access.js\n
gadget_cloudooo.html\n
gadget_cloudooo.js\n
gadget_ojs_cloudooo.html\n
gadget_ojs_cloudooo.js\n
gadget_html5_input.html\n
gadget_html5_input.js\n
gadget_html5_select.html\n
gadget_html5_select.js\n
gadget_erp5_field_multicheckbox.html\n
gadget_erp5_field_multicheckbox.js\n
gadget_erp5_searchfield.html\n
......@@ -229,6 +238,8 @@ gadget_erp5_form.html\n
gadget_erp5_form.js\n
gadget_erp5_label_field.html\n
gadget_erp5_label_field.js\n
gadget_erp5_field_list.html\n
gadget_erp5_field_list.js\n
gadget_erp5_field_listbox.html\n
gadget_erp5_field_listbox.js\n
gadget_erp5_field_datetime.html\n
......@@ -408,7 +419,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.33482.4166.8669</string> </value>
<value> <string>978.55949.43799.1706</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -426,7 +437,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1549888313.28</float>
<float>1570036732.12</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_notebook_router.html.html
View file @ 5a7282a3
......@@ -18,7 +18,10 @@
<script data-renderjs-configuration="document_title" type="text/x-renderjs-configuration">Notebook</script>
<script data-renderjs-configuration="document_title_plural" type="text/x-renderjs-configuration">Notebooks</script>
<script data-renderjs-configuration="parent_relative_url" type="text/x-renderjs-configuration">notebook_module</script>
<script data-renderjs-configuration="erp5_attachment_synchro" type="text/x-renderjs-configuration"></script>
<script data-renderjs-configuration="erp5_attachment_synchro" type="text/x-renderjs-configuration">/{+id}/Base_downloadWithCors</script>
<script data-renderjs-configuration="content_type" type="text/x-renderjs-configuration">text/plain</script>
<script data-renderjs-configuration="file_extension" type="text/x-renderjs-configuration">txt</script>
<script data-renderjs-configuration="conversion_dict" type="text/x-renderjs-configuration">{"txt": ["html", "pdf"]}</script>
<script data-renderjs-configuration="upload_dict" type="text/x-renderjs-configuration">{"txt": "txt", "html": "html"}</script>
<script data-renderjs-configuration="dropbox_app_key" type="text/x-renderjs-configuration">82g9eir551nhovs</script>
<div data-gadget-url="gadget_erp5_router.html" data-gadget-scope="erp5_router"></div>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_notebook_router.html.xml
View file @ 5a7282a3
......@@ -278,7 +278,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>970.52955.27100.34065</string> </value>
<value> <string>978.54044.24924.10990</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -296,7 +296,7 @@
</tuple>
<state>
<tuple>
<float>1539094329.81</float>
<float>1569942688.43</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_notebook_export_html.html 0 → 100644
View file @ 5a7282a3
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>OfficeJS Jio Notebook View</title>
<script src="rsvp.js"></script>
<script src="renderjs.js"></script>
<script src="gadget_erp5_page_ojs_notebook_export.js"></script>
</head>
<body>
<form class="save_form ui-body-c" novalidate>
<button type="submit" class="ui-btn ui-btn-b ui-btn-inline
ui-icon-edit ui-btn-icon-right ui-screen-hidden"></button>
<div data-gadget-url="gadget_erp5_form.html"
data-gadget-scope="form_view"
data-gadget-sandbox="public">
</div>
<div data-gadget-url="gadget_ojs_cloudooo.html"
data-gadget-scope="ojs_cloudooo"
data-gadget-sandbox="public">
</div>
</form>
</body>
</html>
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_notebook_export_js.js 0 → 100644
View file @ 5a7282a3
/*global window, document, jIO, rJS, RSVP */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, document, jIO, rJS, RSVP, Blob) {
"use strict";
rJS(window)
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
.declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("jio_get", "jio_get")
.declareAcquiredMethod("jio_getAttachment", "jio_getAttachment")
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", 'notifySubmitted')
.declareAcquiredMethod("redirect", 'redirect')
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.declareMethod("render", function (options) {
var gadget = this;
return gadget.jio_get(options.jio_key)
.push(function (result) {
return gadget.changeState({
jio_key: options.jio_key,
doc: result
});
});
})
.onEvent('submit', function (event) {
var gadget = this, html, content, cloudooo;
return gadget.notifySubmitting()
.push(function () {
return gadget.getDeclaredGadget('form_view');
})
.push(function (form_gadget) {
return RSVP.all([
form_gadget.getContent(),
gadget.getDeclaredGadget("ojs_cloudooo"),
form_gadget.getDeclaredGadget("text_content")
]);
})
.push(function (result_list) {
content = result_list[0];
cloudooo = result_list[1];
html = result_list[2].element
.querySelector('[data-gadget-scope="editor"]').firstChild
.contentDocument.body.firstChild.contentDocument.firstChild;
html.firstChild.innerHTML = "";
return RSVP.all([
cloudooo.putCloudoooConvertOperation({
"status": "converted",
"from": "txt",
"to": "html",
"id": gadget.state.jio_key,
"name": "data"
}),
cloudooo.putCloudoooConvertOperation({
"status": "convert",
"from": "html",
"to": "pdf",
"id": gadget.state.jio_key,
"name": "html",
"to_name": "pdf",
"conversion_kw": {
"encoding": ["utf8", "string"],
"page_size": ["A4", "string"],
"zoom" : [1, "double"],
"dpi" : ["300", "string"],
"header_center" : ["document Title", "string"]
}
})
]);
})
.push(function () {
return gadget.jio_putAttachment(
gadget.state.jio_key,
'html',
new Blob([html.outerHTML], {type: 'text/html'})
);
})
.push(function () {
return gadget.notifySubmitted();
})
.push(function () {
return gadget.redirect({
'command': 'display',
'options': {
'page': 'ojs_download_convert',
'jio_key': gadget.state.jio_key
}
});
});
})
.declareMethod("triggerSubmit", function () {
return this.element.querySelector('button[type="submit"]').click();
})
.onStateChange(function () {
var gadget = this, data;
return gadget.jio_getAttachment(gadget.state.jio_key, "data")
.push(undefined, function (error) {
if (error instanceof jIO.util.jIOError && error.status_code === 404) {
return new Blob();
}
throw error;
})
.push(function (blob) {
return jIO.util.readBlobAsText(blob);
})
.push(function (evt) {
data = evt.target.result;
return gadget.getDeclaredGadget('form_view');
})
.push(function (form_gadget) {
return form_gadget.render({
erp5_document: {
"_embedded": {"_view": {
"my_content": {
"default": data,
"css_class": "",
"required": 0,
"editable": 0,
"key": "text_content",
"hidden": 0,
"type": "GadgetField",
"url": "gadget_editor.html",
"sandbox": "public",
"renderjs_extra": '{"editor": "jsmd_editor", "maximize": true}'
}
}},
"_links": {
"type": {
// form_list display portal_type in header
name: ""
}
}
},
form_definition: {
group_list: [[
"left",
[]
], [
"right",
[]
], [
"center",
[]
], [
"bottom",
[["my_content"]]
]]
}
});
})
.push(function () {
return RSVP.all([
gadget.getUrlFor({
command: 'display',
options: {'jio_key': gadget.state.jio_key}
}),
gadget.getUrlFor({command: 'selection_previous'}),
gadget.getUrlFor({command: 'selection_next'})
]);
})
.push(function (url_list) {
return gadget.updateHeader({
page_title: "Export",
submit_action: true,
selection_url: url_list[0],
previous_url: url_list[1],
next_url: url_list[2]
});
});
});
}(window, document, jIO, rJS, RSVP, Blob));
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_upload_js.js
View file @ 5a7282a3
/*global window, rJS, RSVP, jIO, DOMParser */
/*global window, rJS, RSVP, jIO, DOMParser, Blob */
/*jslint nomen: true, indent: 2, maxerr: 3 */
(function (window, rJS, RSVP, jIO, DOMParser) {
(function (window, rJS, RSVP, jIO, DOMParser, Blob) {
"use strict";
rJS(window)
......@@ -13,6 +13,7 @@
.declareAcquiredMethod("notifySubmitted", "notifySubmitted")
.declareAcquiredMethod("jio_post", "jio_post")
.declareAcquiredMethod("jio_put", "jio_put")
.declareAcquiredMethod("jio_putAttachment", "jio_putAttachment")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("redirect", "redirect")
/////////////////////////////////////////////////////////////////
......@@ -35,7 +36,7 @@
]);
})
.push(function (result) {
var file_name_list, data, filename, queue, filetype;
var file_name_list, data, filename, queue, filetype, jio_key;
if (result[0].file !== undefined) {
file_name_list = result[0].file.file_name.split('.');
filetype = file_name_list.pop();
......@@ -58,16 +59,25 @@
parser = new DOMParser();
htmlDoc = parser.parseFromString(data_content, "text/html");
data_content = htmlDoc.getElementById('jsmd').textContent;
filetype = "txt";
}
return gadget.jio_post({
title: filename,
portal_type: result[1],
content_type: result[2],
parent_relative_url: result[4],
text_content: data_content
filename: "default." + filetype
})
.push(function (result) {
jio_key = result;
return gadget.jio_putAttachment(
jio_key,
"data",
new Blob([data_content], {type: result[2]})
);
});
})
.push(function (jio_key) {
.push(function () {
return gadget.redirect({
'command': 'display',
'options': {
......@@ -164,4 +174,4 @@
});
});
});
}(window, rJS, RSVP, jIO, DOMParser));
\ No newline at end of file
}(window, rJS, RSVP, jIO, DOMParser, Blob));
\ No newline at end of file
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_upload_js.xml
View file @ 5a7282a3
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>970.54532.18415.44100</string> </value>
<value> <string>978.57505.65048.29440</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1539165482.38</float>
<float>1570357013.41</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/bt/dependency_list
View file @ 5a7282a3
erp5_web_renderjs_ui
erp5_code_mirror
erp5_multimedia
erp5_notebook
erp5_smart_assistant
\ No newline at end of file
bt5/erp5_officejs_connector/ActionTemplateItem/portal_types/Notebook/jio_view.xml
View file @ 5a7282a3
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/WebPage_viewAsJio</string> </value>
<value> <string>string:${object_url}/OOoDocument_viewAsJio</string> </value>
</item>
</dictionary>
</pickle>
......
  • Romain Courteaud @romain ·

    @klaus this commit seems to include 3 big steps:

    • move to jsmd viewer
    • migrate local data from the text_content property to the data property
    • activate upload and export

    It is possible to split in 3 commits?

    @roque do you have a proposal to start organizing such data model modification?

  • Klaus Wölfel @klaus ·
    Developer

    @romain it is very hard to split, because I do not have a working version of the code which uses jsmd viewer but does not use data property. It would mean that I would an effort to reprogram to use jsmd viewer but without text content. Likewise, upload and export functionality existed before the change from text_content to data: When I split the commits, then the commit for text_conent -> data would have broken upload and export.

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