Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
oscar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
oscar
Commits
01c852d9
Commit
01c852d9
authored
1 month ago
by
Jean-Baptiste Oellers
Browse files
Options
Downloads
Patches
Plain Diff
Ajout colonne type avec arborescence pour export excel des activités
parent
780ce036
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#39563
passed
1 month ago
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
module/Oscar/src/Oscar/Entity/Activity.php
+3
-1
3 additions, 1 deletion
module/Oscar/src/Oscar/Entity/Activity.php
module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php
+10
-5
10 additions, 5 deletions
module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php
with
13 additions
and
6 deletions
module/Oscar/src/Oscar/Entity/Activity.php
+
3
−
1
View file @
01c852d9
...
...
@@ -2724,7 +2724,7 @@ class Activity implements ResourceInterface
return
$datas
;
}
public
function
csv
(
$dateFormat
=
'Y-m-d'
)
public
function
csv
(
$dateFormat
=
'Y-m-d'
,
$activityTypeChainFormatted
)
{
return
array
(
'ID'
=>
$this
->
getId
(),
...
...
@@ -2742,6 +2742,7 @@ class Activity implements ResourceInterface
'numéro SAIC'
=>
$this
->
getCentaureNumConvention
(),
'numéro oscar'
=>
$this
->
getOscarNum
(),
'Type'
=>
$this
->
getActivityType
()
?
(
string
)
$this
->
getActivityType
()
:
''
,
'Type avec arborescence'
=>
$activityTypeChainFormatted
,
'Statut'
=>
Activity
::
getStatusLabel
(),
'Début'
=>
$this
->
getDateStart
()
?
$this
->
getDateStart
()
->
format
(
$dateFormat
...
...
@@ -2803,6 +2804,7 @@ class Activity implements ResourceInterface
'numéro SAIC'
,
'numéro oscar'
,
'Type'
,
'Type avec arborescence'
,
'Statut'
,
'Début'
,
'Fin'
,
...
...
This diff is collapsed.
Click to expand it.
module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php
+
10
−
5
View file @
01c852d9
...
...
@@ -20,6 +20,8 @@ use Oscar\Service\OscarConfigurationService;
use
Oscar\Service\OscarUserContext
;
use
Oscar\Service\OscarUserContextFactory
;
use
Oscar\Service\ProjectGrantService
;
use
Oscar\Traits\UseActivityTypeService
;
use
Oscar\Traits\UseActivityTypeServiceTrait
;
use
Oscar\Traits\UseEntityManager
;
use
Oscar\Traits\UseEntityManagerTrait
;
use
Oscar\Traits\UseOscarConfigurationService
;
...
...
@@ -29,9 +31,9 @@ use Oscar\Traits\UseOscarUserContextServiceTrait;
use
Oscar\Traits\UseProjectGrantService
;
use
Oscar\Traits\UseProjectGrantServiceTrait
;
class
ExportDatas
implements
UseOscarConfigurationService
,
UseProjectGrantService
,
UseEntityManager
,
UseOscarUserContextService
class
ExportDatas
implements
UseOscarConfigurationService
,
UseProjectGrantService
,
UseEntityManager
,
UseOscarUserContextService
,
UseActivityTypeService
{
use
UseOscarConfigurationServiceTrait
,
UseProjectGrantServiceTrait
,
UseEntityManagerTrait
,
UseOscarUserContextServiceTrait
;
use
UseOscarConfigurationServiceTrait
,
UseProjectGrantServiceTrait
,
UseEntityManagerTrait
,
UseOscarUserContextServiceTrait
,
UseActivityTypeServiceTrait
;
private
?string
$rewriteDateFormat
=
null
;
...
...
@@ -42,6 +44,7 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic
{
$this
->
setProjectGrantService
(
$pgs
);
$this
->
setOscarConfigurationService
(
$pgs
->
getOscarConfigurationService
());
$this
->
setActivityTypeService
(
$pgs
->
getActivityTypeService
());
$this
->
setEntityManager
(
$pgs
->
getEntityManager
());
$this
->
setOscarUserContextService
(
$ouc
);
if
(
$rewriteDateFormat
===
null
){
...
...
@@ -264,8 +267,10 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic
}
}
foreach
(
$entity
->
csv
(
$dateFormat
)
as
$col
=>
$value
){
$activityTypeChainFormatted
=
$entity
->
getActivityType
()
?
$this
->
getActivityTypeService
()
->
getActivityTypeChainFormatted
(
$entity
->
getActivityType
()
)
:
''
;
foreach
(
$entity
->
csv
(
$dateFormat
,
$activityTypeChainFormatted
)
as
$col
=>
$value
){
if
(
$columns
[
$col
]
===
true
)
$datas
[]
=
$value
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment