Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
03591b41
Commit
03591b41
authored
Apr 03, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: improve image review
parent
ac9412f2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
10 deletions
+19
-10
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.css
...m/web_page_module/scanner_gadget_document_scanner_css.css
+3
-0
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.xml
...m/web_page_module/scanner_gadget_document_scanner_css.xml
+2
-2
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.js
...tem/web_page_module/scanner_gadget_document_scanner_js.js
+8
-6
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.xml
...em/web_page_module/scanner_gadget_document_scanner_js.xml
+2
-2
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/documentscannercss.less.txt
...l_skins/erp5_document_scanner/documentscannercss.less.txt
+4
-0
No files found.
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.css
View file @
03591b41
...
...
@@ -94,6 +94,9 @@ div[data-gadget-url$="gadget_document_scanner.html"] .new-btn {
width
:
calc
(
6em
+
1px
);
height
:
calc
(
6em
+
1px
);
}
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.review-img-container
{
height
:
70vh
;
}
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.img-container
,
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.camera-input
{
/* Never limit the container height here */
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.xml
View file @
03591b41
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.6280
5.13685.6178
</string>
</value>
<value>
<string>
982.6280
7.48775.28757
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
15859
17584.58
</float>
<float>
15859
22346.12
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.js
View file @
03591b41
...
...
@@ -191,9 +191,10 @@
guides
:
true
,
center
:
true
,
background
:
false
,
minContainerWidth
:
0
,
minContainerHeight
:
0
,
minContainerWidth
:
1
,
minContainerHeight
:
1
,
responsive
:
true
,
restore
:
true
,
// Avoid any cropper calculation or guessing
scalable
:
false
,
rotatable
:
false
,
...
...
@@ -730,7 +731,9 @@
div
=
domsugar
(
'
div
'
,
{
'
class
'
:
'
camera
'
},
[
buildPageTitle
(
gadget
,
result_list
[
0
][
2
]),
domsugar
(
'
img
'
,
{
src
:
gadget
.
state
[
'
blob_url_
'
+
gadget
.
state
.
display_index
]})
domsugar
(
'
div
'
,
{
'
class
'
:
'
review-img-container
'
},
[
domsugar
(
'
img
'
,
{
src
:
gadget
.
state
[
'
blob_url_
'
+
gadget
.
state
.
display_index
]})
]),
// XXX TODO: why is the button rendering different from the other pages?
domsugar
(
'
div
'
,
{
'
class
'
:
'
edit-picture
'
},
button_list
),
result_list
[
1
]
...
...
@@ -796,8 +799,7 @@
display_step
:
'
display_video
'
,
display_index
:
null
,
page_count
:
0
,
camera_list
:
[],
is_cropper_size_confirmed
:
false
camera_list
:
[]
})
.
declareMethod
(
'
render
'
,
function
(
options
)
{
// This method is called during the ERP5 form rendering
...
...
@@ -1037,4 +1039,4 @@
}(
rJS
,
RSVP
,
window
,
document
,
navigator
,
Cropper
,
Promise
,
JSON
,
jIO
,
promiseEventListener
,
domsugar
,
createImageBitmap
,
FormData
,
Caman
,
FileReader
,
DataView
,
URL
,
fx
));
FileReader
,
DataView
,
URL
,
fx
));
\ No newline at end of file
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.xml
View file @
03591b41
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.6286
5.31516.35805
</string>
</value>
<value>
<string>
982.6286
6.16795.56132
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
158592
1095.31
</float>
<float>
158592
2429.02
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/documentscannercss.less.txt
View file @
03591b41
...
...
@@ -94,6 +94,10 @@ div[data-gadget-url$="gadget_document_scanner.html"] {
height: calc(6em + 1px);
}
.review-img-container {
height: 70vh;
}
.img-container, .camera-input {
/* Never limit the container height here */
position: relative;
...
...
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