Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
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
Carlos Ramos Carreño
slapos.core
Commits
22892104
Commit
22892104
authored
Apr 30, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_crm: fix resiliency report
parent
e9895891
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.py
.../slapos_crm_monitoring/Base_getActivePayableUserAmount.py
+2
-2
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/HostingSubscriptionModule_getResilienceUsageReportList.py
...HostingSubscriptionModule_getResilienceUsageReportList.py
+3
-3
No files found.
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Base_getActivePayableUserAmount.py
View file @
22892104
...
@@ -3,7 +3,7 @@ from DateTime import DateTime
...
@@ -3,7 +3,7 @@ from DateTime import DateTime
if
start_date
is
None
:
if
start_date
is
None
:
start_date
=
">=%s"
%
(
DateTime
()
-
45
).
strftime
(
"%Y/%m/%d"
)
start_date
=
">=%s"
%
(
DateTime
()
-
45
).
strftime
(
"%Y/%m/%d"
)
return
len
(
context
.
portal_catalog
(
portal_type
=
"Payment Transaction"
,
return
len
(
context
.
portal_catalog
(
portal_type
=
"Payment Transaction"
,
group_by
=
"delivery.destination_section_uid"
,
group_by
=
[
'delivery.destination_section_uid'
],
simulation_state
=
[
"stopped"
,
"delivered"
],
simulation_state
=
[
"stopped"
,
"delivered"
],
start_date
=
">=2017/05/01"
))
start_date
=
">=2017/05/01"
))
master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/HostingSubscriptionModule_getResilienceUsageReportList.py
View file @
22892104
...
@@ -5,7 +5,7 @@ kw = {}
...
@@ -5,7 +5,7 @@ kw = {}
kw
[
"portal_type"
]
=
"Hosting Subscription"
kw
[
"portal_type"
]
=
"Hosting Subscription"
kw
[
"validation_state"
]
=
"validated"
kw
[
"validation_state"
]
=
"validated"
#kw["url_string"] = ["%%/software/slaprunner/software.cfg", "%%/software/kvm/software.cfg"]
#kw["url_string"] = ["%%/software/slaprunner/software.cfg", "%%/software/kvm/software.cfg"]
kw
[
"select_list"
]
=
"url_string, source_reference"
kw
[
"select_list"
]
=
[
"url_string"
,
"source_reference"
]
def
getIndex
(
hosting_subscription
):
def
getIndex
(
hosting_subscription
):
if
"software/slaprunner/software.cfg"
in
hosting_subscription
.
url_string
:
if
"software/slaprunner/software.cfg"
in
hosting_subscription
.
url_string
:
...
@@ -32,8 +32,8 @@ for hosting_subscription in context.portal_catalog(**kw):
...
@@ -32,8 +32,8 @@ for hosting_subscription in context.portal_catalog(**kw):
"other_type"
:
0
,
"other_type"
:
0
,
"user_total"
:
0
}
"user_total"
:
0
}
index
=
getIndex
(
hosting_subscription
)
index
=
getIndex
(
hosting_subscription
)
l
[
u
][
index
]
=
l
[
u
][
index
]
+
1
l
[
u
][
index
]
=
l
[
u
][
index
]
+
1
l
[
u
][
"user_total"
]
=
l
[
u
][
"user_total"
]
+
1
l
[
u
][
"user_total"
]
=
l
[
u
][
"user_total"
]
+
1
document_list
=
[]
document_list
=
[]
for
person_relative_url
in
l
:
for
person_relative_url
in
l
:
...
...
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