Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
Import registry records
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
develop
Import registry records
Commits
9dbda33f
Commit
9dbda33f
authored
Jul 22, 2020
by
Alina Habibulina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] работа над прогресс баром
parent
baa12c9e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
31 deletions
+26
-31
src/main/java/kz/arta/ext/sap/State.java
src/main/java/kz/arta/ext/sap/State.java
+2
-2
src/main/java/kz/arta/ext/sap/util/ImportBean.java
src/main/java/kz/arta/ext/sap/util/ImportBean.java
+1
-1
src/main/webapp/index.js
src/main/webapp/index.js
+23
-28
No files found.
src/main/java/kz/arta/ext/sap/State.java
View file @
9dbda33f
...
...
@@ -31,9 +31,9 @@ public class State {
json
+=
"\"errors\": ["
;
for
(
String
str
:
errors
){
json
+=
"\""
+
str
+
"\",
"
;
json
+=
"\""
+
str
+
"\","
;
}
json
+=
"]"
;
json
=
json
.
substring
(
0
,
json
.
length
()
-
1
)
+
"]"
;
json
+=
"}"
;
return
json
;
...
...
src/main/java/kz/arta/ext/sap/util/ImportBean.java
View file @
9dbda33f
...
...
@@ -364,7 +364,7 @@ public class ImportBean {
JsonElement
jsonAnswr
=
answrPars
.
parse
(
answer
);
String
errorCode
=
jsonAnswr
.
getAsJsonObject
().
get
(
"errorCode"
).
getAsString
();
if
(!
errorCode
.
equals
(
"0"
)){
importState
.
errors
.
add
(
"
CREATE DOC RCC error
in line :"
+
(
row
.
getRowNum
()
+
1
));
importState
.
errors
.
add
(
"
Error while saving data with
in line :"
+
(
row
.
getRowNum
()
+
1
));
LOGGER
.
error
(
"CREATE DOC RCC error in line :"
+
(
row
.
getRowNum
()
+
1
)
+
", data: "
+
data
);
return
;
}
else
{
...
...
src/main/webapp/index.js
View file @
9dbda33f
...
...
@@ -3,37 +3,32 @@ var isInProcess = false;
function
showProcess
(
firstmessage
,
iserror
){
UIkit
.
modal
(
$
(
"
#modal-center
"
)).
alert
.
show
();
UIkit
.
modal
(
$
(
"
#modal-center
"
)).
show
();
if
(
firstmessage
)
$
(
"
#errors-area
"
).
val
(
firstmessage
);
var
progressbar
=
$
(
"
#js-progressbar
"
);
var
errorsfield
=
$
(
"
#errors-area
"
);
if
(
!
iserror
){
//отправляем запрос за прогрессом и возникшими ошибками каждые n секунд, пока прогресс обработки записей не достигнет 100%
var
persentage
=
0
;
do
{
$
.
ajax
({
url
:
window
.
location
.
origin
+
"
/import/api/registry/import_file?formcode=
"
+
formCode
+
"
®istrycode=
"
+
regCode
+
"
&activate=
"
+
isActivate
+
"
&action=
"
+
action
+
"
&defaultValue=
"
+
defaultValue
+
"
&searchString=
"
+
searchString
+
"
&shouldPasteMeaningValue=
"
+
shouldPasteMeaningValue
,
data
:
fd
,
beforeSend
:
function
(
xhr
)
{
xhr
.
setRequestHeader
(
"
Authorization
"
,
"
Basic
"
+
btoa
(
log
+
"
:
"
+
pass
));
},
processData
:
false
,
contentType
:
false
,
type
:
'
POST
'
,
success
:
function
(
data
)
{
$
(
"
#spin
"
).
hide
();
showProcess
(
data
.
toString
());
isInProcess
=
true
;
},
error
:
function
(
error
)
{
$
(
"
#spin
"
).
hide
();
showProcess
(
"
Импорт не начался в связи с ощибкой:
"
+
error
.
responseText
);
isInProcess
=
false
;
}
//отправляем запрос за прогрессом и возникшими ошибками каждые 5 секунд, пока прогресс обработки записей не достигнет 100%
var
percentage
=
0
;
$
.
ajax
({
url
:
window
.
location
.
origin
+
"
/import/api/registry/info
"
,
type
:
'
GET
'
,
success
:
function
(
data
)
{
errorsfield
.
val
(
data
.
errors
);
percentage
=
data
.
count
/
(
data
.
total
/
100
);
progressbar
.
val
(
percentage
);
if
(
data
.
count
===
data
.
total
)
return
;
},
error
:
function
(
error
)
{
errorsfield
.
val
(
error
.
responseText
);
isInProcess
=
false
;
}
});
}
while
(
percentage
!==
100
);
});
}
...
...
@@ -120,7 +115,7 @@ $(document).ready(function(){
},
error
:
function
(
error
)
{
$
(
"
#spin
"
).
hide
();
showProcess
(
"
Импорт не начался в связи с ощибкой:
"
+
error
.
responseText
);
showProcess
(
error
.
responseText
);
isInProcess
=
false
;
}
...
...
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