Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Auction
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
prozorro-sale
Auction
Merge requests
!533
Draft: Epic/multitrade
Code
Review changes
Check out branch
Download
Patches
Plain diff
Open
Draft: Epic/multitrade
epic/multitrade
into
master
Overview
0
Commits
32
Pipelines
41
Changes
111
Open
Mike Hoang
requested to merge
epic/multitrade
into
master
1 year ago
Overview
0
Commits
32
Pipelines
41
Changes
2
Expand
issue:
https://gitlab.prozorro.sale/prozorro-sale/auction/-/issues/251
0
0
Merge request reports
Compare
version 11
version 32
fac7afbf
10 months ago
version 31
c43f6b89
11 months ago
version 30
39186d86
11 months ago
version 29
189ecb4d
1 year ago
version 28
f10884da
1 year ago
version 27
293eb6fb
1 year ago
version 26
22e1d6d7
1 year ago
version 25
346e12a5
1 year ago
version 24
54c0b18a
1 year ago
version 23
701abd85
1 year ago
version 22
2ac3ebbb
1 year ago
version 21
7fc91bae
1 year ago
version 20
e2845307
1 year ago
version 19
3bdf7db4
1 year ago
version 18
8983f339
1 year ago
version 17
70f5b0cb
1 year ago
version 16
5e2447e8
1 year ago
version 15
418934c0
1 year ago
version 14
f1c6f507
1 year ago
version 13
6b959238
1 year ago
version 12
94fc3532
1 year ago
version 11
476284f8
1 year ago
version 10
b85c5082
1 year ago
version 9
bd56da0c
1 year ago
version 8
5ec2d8f8
1 year ago
version 7
9486d85f
1 year ago
version 6
479a8e4c
1 year ago
version 5
22c2a00d
1 year ago
version 4
e21cc661
1 year ago
version 3
bac926bc
1 year ago
version 2
29dbf2aa
1 year ago
version 1
db683ee6
1 year ago
master (base)
and
version 12
latest version
f7e8bd39
32 commits,
9 months ago
version 32
fac7afbf
31 commits,
10 months ago
version 31
c43f6b89
30 commits,
11 months ago
version 30
39186d86
29 commits,
11 months ago
version 29
189ecb4d
27 commits,
1 year ago
version 28
f10884da
25 commits,
1 year ago
version 27
293eb6fb
25 commits,
1 year ago
version 26
22e1d6d7
24 commits,
1 year ago
version 25
346e12a5
23 commits,
1 year ago
version 24
54c0b18a
22 commits,
1 year ago
version 23
701abd85
21 commits,
1 year ago
version 22
2ac3ebbb
19 commits,
1 year ago
version 21
7fc91bae
19 commits,
1 year ago
version 20
e2845307
19 commits,
1 year ago
version 19
3bdf7db4
18 commits,
1 year ago
version 18
8983f339
17 commits,
1 year ago
version 17
70f5b0cb
16 commits,
1 year ago
version 16
5e2447e8
16 commits,
1 year ago
version 15
418934c0
15 commits,
1 year ago
version 14
f1c6f507
14 commits,
1 year ago
version 13
6b959238
13 commits,
1 year ago
version 12
94fc3532
12 commits,
1 year ago
version 11
476284f8
11 commits,
1 year ago
version 10
b85c5082
9 commits,
1 year ago
version 9
bd56da0c
8 commits,
1 year ago
version 8
5ec2d8f8
6 commits,
1 year ago
version 7
9486d85f
4 commits,
1 year ago
version 6
479a8e4c
2 commits,
1 year ago
version 5
22c2a00d
1 commit,
1 year ago
version 4
e21cc661
1 commit,
1 year ago
version 3
bac926bc
1 commit,
1 year ago
version 2
29dbf2aa
1 commit,
1 year ago
version 1
db683ee6
2 commits,
1 year ago
Show latest version
2 files
+
68
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
src/prozorro_sale/auction/packages/multitrade/states.py
+
38
−
1
Options
@@ -13,6 +13,9 @@ class Pending(
):
def
onEnter
(
self
,
*
args
,
**
kwargs
):
super
().
onEnter
(
*
args
,
**
kwargs
)
self
.
_auction
.
public_meta
=
{
'
timeline
'
:
self
.
_generate_timeline
(),
}
self
.
end_time
=
self
.
_auction
.
startDate
def
timer_tick
(
self
,
db
,
*
args
,
**
kwargs
):
@@ -20,6 +23,40 @@ class Pending(
if
now
>=
self
.
end_time
:
self
.
_auction
.
set_state
(
self
.
next_state
,
db
=
db
)
def
_generate_timeline
(
self
):
"""
Generate multitrade auction timeline. Count duration of pause, rounds duration.
Returns:
list: Timeline with rounds duration.
"""
return
[
{
'
title
'
:
{
'
uk_UA
'
:
'
Початок аукціону
'
,
'
en_US
'
:
'
Auction start
'
},
'
start
'
:
utils
.
dt_to_str
(
self
.
_auction
.
startDate
),
'
end
'
:
utils
.
dt_to_str
(
self
.
_auction
.
startDate
),
'
anchor
'
:
'
#startauction
'
},
{
'
title
'
:
{
'
uk_UA
'
:
'
Основний час аукціону
'
,
'
en_US
'
:
'
Main auction time
'
},
'
start
'
:
None
,
'
end
'
:
None
,
'
anchor
'
:
'
#mainauction
'
},
{
'
title
'
:
{
'
uk_UA
'
:
'
Додатковий час аукціону
'
,
'
en_US
'
:
'
Additional auction time
'
},
'
start
'
:
None
,
'
end
'
:
None
,
'
anchor
'
:
'
#additionalauction
'
},
{
'
title
'
:
{
'
uk_UA
'
:
'
Оголошення результатів
'
,
'
en_US
'
:
'
Announcement
'
},
'
start
'
:
None
,
'
end
'
:
None
,
'
anchor
'
:
'
#results
'
},
]
class
SimultaneousRound
(
mixins
.
_CancellationMixin
,
@@ -41,7 +78,7 @@ class SimultaneousRound(
def
_generate_timeline
(
self
):
"""
Generate
priority english
auction timeline. Count duration of pause, rounds duration.
Generate
multitrade
auction timeline. Count duration of pause, rounds duration.
Returns:
list: Timeline with rounds duration.
Loading