Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Rex Dri
Rex Dri
Commits
1e5f9d9f
Commit
1e5f9d9f
authored
Jul 01, 2019
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(frontend)
parent
407d37e3
Pipeline
#42777
passed with stages
in 3 minutes and 52 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
8 deletions
+10
-8
frontend/src/components/filter/Filter.js
frontend/src/components/filter/Filter.js
+2
-2
frontend/src/components/form/fields/MarkdownField.js
frontend/src/components/form/fields/MarkdownField.js
+1
-1
frontend/src/components/form/fields/TextField.js
frontend/src/components/form/fields/TextField.js
+1
-1
frontend/src/components/pages/PageHome.js
frontend/src/components/pages/PageHome.js
+1
-1
frontend/src/components/university/modules/SharedUnivFeedback.js
...d/src/components/university/modules/SharedUnivFeedback.js
+2
-1
frontend/src/components/university/modules/previousExchangeFeedback/edit/CourseFeedbackEditor.js
...les/previousExchangeFeedback/edit/CourseFeedbackEditor.js
+1
-1
frontend/src/components/university/modules/previousExchangeFeedback/edit/EditModuleCoursesFeedback.js
...reviousExchangeFeedback/edit/EditModuleCoursesFeedback.js
+2
-1
No files found.
frontend/src/components/filter/Filter.js
View file @
1e5f9d9f
...
...
@@ -315,8 +315,8 @@ class Filter extends CustomComponentForAPI {
<
/ExpansionPanelSummary
>
<
ExpansionPanelDetails
style
=
{{
display
:
"
block
"
}}
>
<
Typography
variant
=
'
caption
'
>
Le
contenu
des
filtre
est
composé
avec
un
«
ou
»
logique
.
Les
filtres
sont
composés
avec
«
et
»
logique
.
Le
options
internes
des
filtres
sont
composées
avec
un
«
ou
»
logique
.
Les
filtres
sont
composés
entre
eux
avec
un
«
et
»
logique
.
<
/Typography
>
<
div
className
=
{
classes
.
spacer1
}
/
>
<
div
className
=
{
classes
.
input
}
>
...
...
frontend/src/components/form/fields/MarkdownField.js
View file @
1e5f9d9f
...
...
@@ -33,7 +33,7 @@ class MarkdownField extends Field {
getError
()
{
const
{
value
}
=
this
.
state
;
let
messages
=
Array
();
if
(
this
.
props
.
required
&&
value
==
""
)
{
if
(
this
.
props
.
required
&&
(
value
===
""
||
value
===
null
)
)
{
messages
.
push
(
"
Ce champ est requis mais il est vide.
"
);
}
if
(
value
!==
null
&&
this
.
props
.
maxLength
&&
value
.
length
>
this
.
props
.
maxLength
)
{
...
...
frontend/src/components/form/fields/TextField.js
View file @
1e5f9d9f
...
...
@@ -29,7 +29,7 @@ class TextField extends Field {
getError
()
{
const
{
value
}
=
this
.
state
;
let
messages
=
Array
();
if
(
this
.
props
.
required
&&
value
==
""
)
{
if
(
this
.
props
.
required
&&
(
value
===
""
||
value
===
null
)
)
{
messages
.
push
(
"
Ce champ est requis mais il est vide.
"
);
}
if
(
this
.
props
.
maxLength
&&
value
!==
null
&&
value
.
length
>
this
.
props
.
maxLength
)
{
...
...
frontend/src/components/pages/PageHome.js
View file @
1e5f9d9f
...
...
@@ -34,7 +34,7 @@ const sourceFocusMarkdown = `
De nombreux éléments de saisie supportent la syntaxe [markdown](https://www.markdownguide.org/basic-syntax/)
pour un rendu plus nuancé, faites-en bon usage 😌 (vive le **gras**, l'*italique*, etc.).
**Dès que vous parlez d'💰, nous vous invitons à utiliser la syntaxe dédiée** \`:100.10USD:\`
**Dès que vous parlez d'💰, nous vous invitons à utiliser la syntaxe dédiée** \`:1
1
00.10USD:\`
(deux-points, suivi du montant et du code ISO de la monnaie, puis de nouveau deux-points) dans votre markdown.
Cette dernière sera automatiquement reconnue et la valeur après application du taux de change du jour
sera affichée en euro : :1100.10USD: 🎉
...
...
frontend/src/components/university/modules/SharedUnivFeedback.js
View file @
1e5f9d9f
...
...
@@ -55,6 +55,7 @@ class SharedUnivFeedback extends Module {
editor
=
{
SharedUnivFeedbackEditor
}
renderCore
=
{
renderCore
}
coreClasses
=
{
classes
}
moduleInGroupInfos
=
{{
isInGroup
:
true
,
invalidateGroup
:
()
=>
this
.
props
.
invalidateData
()}}
/
>
);
}
...
...
@@ -78,7 +79,7 @@ const mapDispatchToProps = (dispatch) => {
api
:
{
univSharedFeedback
:
(
params
)
=>
dispatch
(
getActions
(
"
sharedUnivFeedbacks
"
).
readAll
(
params
)),
},
invalidateData
:
()
=>
dispatch
(
getActions
(
"
sharedUnivFeedbacks
"
).
invalidate
One
())
invalidateData
:
()
=>
dispatch
(
getActions
(
"
sharedUnivFeedbacks
"
).
invalidate
All
())
};
};
...
...
frontend/src/components/university/modules/previousExchangeFeedback/edit/CourseFeedbackEditor.js
View file @
1e5f9d9f
...
...
@@ -44,7 +44,7 @@ class CourseFeedbackForm extends Form {
<
NumberField
label
=
{
"
Votre appréciation de la facilité de suivre le cours (prérequis académiques et linguistiques)
"
}
comment
=
"
Très dur (-5) < ça passe (0) <
surchargé
(5)
"
comment
=
"
Très dur (-5) < ça passe (0) <
très simple
(5)
"
{...
this
.
getReferenceAndValue
(
"
following_ease
"
)}
{...
defaultNumberProps
}
/
>
...
...
frontend/src/components/university/modules/previousExchangeFeedback/edit/EditModuleCoursesFeedback.js
View file @
1e5f9d9f
...
...
@@ -24,7 +24,8 @@ function renderCore(rawModelData) {
comment
=
{
p
.
comment
}
languageCode
=
{
p
.
language
}
renderUtcInfo
=
{
false
}
untouched
=
{
p
.
untouched
}
/>
;
untouched
=
{
p
.
untouched
}
wouldRecommend
=
{
p
.
would_recommend
}
/>
;
}
...
...
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