Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dataviz_gitlabr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DREAL Pays de la Loire
Centre de Services de la Donnée
dataviz_gitlabr
Commits
1ff794ec
Commit
1ff794ec
authored
4 months ago
by
LE DURAND Matteo
Browse files
Options
Downloads
Patches
Plain Diff
topics remplacer par etiquette qui est = topics + groupe
parent
ba96092d
Branches
Branches containing commit
No related tags found
2 merge requests
!28
Ajout de l'onglet indicateur et plus
,
!18
MAJ de main de la branche dev
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server.R
+5
-5
5 additions, 5 deletions
server.R
ui.R
+2
-2
2 additions, 2 deletions
ui.R
with
7 additions
and
7 deletions
server.R
+
5
−
5
View file @
1ff794ec
...
...
@@ -2,7 +2,7 @@ server <- function(input, output, session) {
r
<-
reactiveValues
(
filteredData
=
all_data
,
filteredByProject
=
all_data
,
# Étape intermédiaire filtrée par daterange et project_name
filtered
Topics
=
NULL
,
filtered
etiquette
=
NULL
,
filteredProjects
=
NULL
,
filteredAuthors
=
NULL
,
filteredReCodes
=
NULL
,
...
...
@@ -27,7 +27,7 @@ server <- function(input, output, session) {
req
(
input
$
daterange
)
r
$
filteredData
<-
r
$
filteredByDate
%>%
filter
(
(
if
(
length
(
input
$
topics
))
sapply
(
input
$
topics
,
function
(
t
)
grepl
(
t
,
topics
))
%>%
rowSums
()
>
0
else
TRUE
)
&
(
if
(
length
(
input
$
etiquette
))
sapply
(
input
$
etiquette
,
function
(
t
)
grepl
(
t
,
etiquette
))
%>%
rowSums
()
>
0
else
TRUE
)
&
(
if
(
length
(
input
$
auteur
))
auteur
%in%
input
$
auteur
else
TRUE
)
&
(
if
(
length
(
input
$
re_code
))
re_code
%in%
input
$
re_code
else
TRUE
)
&
(
if
(
length
(
input
$
categorie
))
categorie
%in%
input
$
categorie
else
TRUE
)
...
...
@@ -38,13 +38,13 @@ server <- function(input, output, session) {
# Fonction de mise à jour des choix pour les filtres
updateFilters
<-
reactive
({
# Basé sur les données filtrées par date et projet
updateSelectizeInput
(
session
,
"
topics
"
,
choices
=
unique
(
r
$
filteredByDate
$
topics
)
%>%
updateSelectizeInput
(
session
,
"
etiquette
"
,
choices
=
unique
(
r
$
filteredByDate
$
etiquette
)
%>%
strsplit
(
split
=
","
)
%>%
# Divise les chaînes en éléments séparés
unlist
()
%>%
# Aplatit la liste obtenue
na.omit
()
%>%
# Supprime les NA (au cas où)
.
[
.
!=
""
]
%>%
# Supprime les chaînes vides
trimws
()
%>%
# suppremie les espace avnt et apres
unique
()
,
selected
=
input
$
topics
)
unique
()
,
selected
=
input
$
etiquette
)
updateSelectizeInput
(
session
,
"author"
,
choices
=
unique
(
r
$
filteredByDate
$
auteur
),
selected
=
input
$
auteur
)
updateSelectizeInput
(
session
,
"categorie"
,
choices
=
unique
(
r
$
filteredByDate
$
categorie
),
selected
=
input
$
categorie
)
...
...
@@ -58,7 +58,7 @@ server <- function(input, output, session) {
filter
(
updated_at
>=
as.Date
(
input
$
daterange
[[
1
]])
&
updated_at
<=
as.Date
(
input
$
daterange
[[
2
]]))
r
$
filteredData
<-
r
$
filteredByDate
updateSelectizeInput
(
session
,
"
topics
"
,
selected
=
NULL
)
updateSelectizeInput
(
session
,
"
etiquette
"
,
selected
=
NULL
)
updateSelectizeInput
(
session
,
"author"
,
selected
=
NULL
)
updateSelectizeInput
(
session
,
"categorie"
,
selected
=
NULL
)
updateFilters
()
...
...
This diff is collapsed.
Click to expand it.
ui.R
+
2
−
2
View file @
1ff794ec
...
...
@@ -33,9 +33,9 @@ ui <- shinygouv::navbarPage_dsfr(
shinygouv
::
column_dsfr
(
3
,
selectizeInput
(
inputId
=
"
topics
"
,
inputId
=
"
etiquette
"
,
label
=
"Étiquette :"
,
choices
=
all_data
$
topics
%>%
choices
=
all_data
$
etiquette
%>%
strsplit
(
split
=
","
)
%>%
# Divise les chaînes en éléments séparés
unlist
()
%>%
# Aplatit la liste obtenue
na.omit
()
%>%
# Supprime les NA (au cas où)
...
...
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