Commit a07158d0 authored by Gabriel Monnerat's avatar Gabriel Monnerat

erp5_document_scanner: change the thumbnail list display to show a thumbnail for previous images.

Drop the current displayed text
parent 16e51e39
...@@ -60,4 +60,12 @@ div[data-gadget-url$="gadget_document_scanner.html"] .ui-btn-icon-left:before { ...@@ -60,4 +60,12 @@ div[data-gadget-url$="gadget_document_scanner.html"] .ui-btn-icon-left:before {
div[data-gadget-url$="gadget_document_scanner.html"] button:disabled, div[data-gadget-url$="gadget_document_scanner.html"] button:disabled,
div[data-gadget-url$="gadget_document_scanner.html"] button[disabled] { div[data-gadget-url$="gadget_document_scanner.html"] button[disabled] {
color: #999999; color: #999999;
}
div[data-gadget-url$="gadget_document_scanner.html"] > .camera > .thumbnail-list {
padding-top: .5em;
}
div[data-gadget-url$="gadget_document_scanner.html"] .show-img {
width: 35%;
} }
\ No newline at end of file
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>981.31881.58567.1228</string> </value> <value> <string>981.39650.41596.57241</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1580302701.45</float> <float>1580768900.5</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -185,23 +185,6 @@ ...@@ -185,23 +185,6 @@
return gadget.getTranslationList(["Page", "New Page"]) return gadget.getTranslationList(["Page", "New Page"])
.push(function (result_list) { .push(function (result_list) {
for (i = 0; i < len; i += 1) {
// XXX TODO: show nice looking thumbnail
// from gadget.state.blob_url_i
// XXX right term
// XXX TODO display a loader when sending
if (gadget.state['blob_state_' + i] !== 'deleted') {
thumbnail_dom_list.push(domsugar('button', {type: 'button',
text: result_list[0] + (i + 1) + ' (' + gadget.state['blob_state_' + i] + ')',
// Do not allow to show again the current image
// or do not allow to show sending image (to simplify button management)
disabled: (i === gadget.state.page) || (gadget.state['blob_state_' + i] === 'sending'),
'class': 'show-img',
'data-page': i
}));
}
}
// Always add a button to generate a new image
// XXX TODO right term // XXX TODO right term
thumbnail_dom_list.push(domsugar('button', {type: 'button', thumbnail_dom_list.push(domsugar('button', {type: 'button',
text: result_list[1], text: result_list[1],
...@@ -209,7 +192,22 @@ ...@@ -209,7 +192,22 @@
disabled: (len === gadget.state.page - 1), disabled: (len === gadget.state.page - 1),
'class': 'new-btn' 'class': 'new-btn'
})); }));
return domsugar('ol', thumbnail_dom_list);
for (i = 0; i < len; i += 1) {
// XXX right term
// XXX TODO display a loader when saving
if (gadget.state['blob_state_' + i] !== 'deleted') {
thumbnail_dom_list.push(domsugar('button', {
type: "button",
// Do not allow to show again the current image
// or do not allow to show saving image (to simplify button management)
disabled: (i === gadget.state.page) || (gadget.state['blob_state_' + i] === 'saving')
}, [domsugar("img", {"class": "show-img",
'data-page': i,
src: gadget.state['blob_url_' + i]})]));
}
}
return domsugar('ol', {"class": "thumbnail-list"}, thumbnail_dom_list);
}); });
} }
...@@ -493,7 +491,7 @@ ...@@ -493,7 +491,7 @@
.onEvent("click", function (evt) { .onEvent("click", function (evt) {
// Only handle click on BUTTON element // Only handle click on BUTTON element
if (evt.target.tagName !== 'BUTTON') { if (evt.target.tagName !== 'BUTTON' && evt.target.tagName !== 'IMG') {
return; return;
} }
...@@ -554,7 +552,7 @@ ...@@ -554,7 +552,7 @@
}; };
// Keep image date, as user may need to display it again // Keep image date, as user may need to display it again
state_dict['blob_url_' + gadget.state.page_count] = evt.target.result; state_dict['blob_url_' + gadget.state.page_count] = evt.target.result;
state_dict['blob_state_' + gadget.state.page_count] = 'sending'; state_dict['blob_state_' + gadget.state.page_count] = 'saving';
return gadget.changeState(state_dict); return gadget.changeState(state_dict);
}) })
.push(function () { .push(function () {
...@@ -574,7 +572,7 @@ ...@@ -574,7 +572,7 @@
display_step: 'display_video', display_step: 'display_video',
page: gadget.state.page_count + 1 page: gadget.state.page_count + 1
}; };
state_dict['blob_state_' + gadget.state.page] = 'sending'; state_dict['blob_state_' + gadget.state.page] = 'saving';
return gadget.changeState(state_dict); return gadget.changeState(state_dict);
} }
......
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>981.34908.11780.34713</string> </value> <value> <string>981.39686.3809.47701</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1580484433.54</float> <float>1580771167.45</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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