Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
7a37ef79
Commit
7a37ef79
authored
Sep 13, 2018
by
Florent Chehab
Browse files
Full validation of UniversitySemestersDates
parent
b3022780
Pipeline
#27298
passed with stages
in 2 minutes and 36 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend/src/components/university/modules/editors/Editor.js
View file @
7a37ef79
...
...
@@ -42,9 +42,13 @@ class Editor extends MyComponent {
lastUpdateTime
:
this
.
props
.
lastUpdateTime
,
}
buildError
(
messages
)
{
return
{
status
:
messages
.
length
>
0
,
messages
};
}
formHasError
()
{
// to override if you need to perform some checks at the form level
return
{
status
:
false
,
messages
:
Array
()
};
return
this
.
buildError
(
Array
()
)
}
formFieldsHaveError
()
{
...
...
@@ -53,7 +57,7 @@ class Editor extends MyComponent {
const
field
=
this
.
fields
[
fieldKey
];
messages
=
messages
.
concat
(
field
.
getError
().
messages
);
}
return
{
status
:
messages
.
length
>
0
,
messages
}
;
return
this
.
buildError
(
messages
)
;
}
getDataFromFields
()
{
...
...
@@ -115,7 +119,6 @@ class Editor extends MyComponent {
}
else
{
const
errors
=
formHasError
.
messages
.
concat
(
formFieldsHaveError
.
messages
);
console
.
log
(
errors
);
this
.
setState
({
notification
:
{
open
:
true
,
...
...
@@ -189,7 +192,6 @@ class Editor extends MyComponent {
}
handleCloseEditorRequest
()
{
console
.
log
(
"
close asked !
"
)
const
formData
=
this
.
getDataFromFields
();
const
{
modelData
}
=
this
.
props
;
if
(
this
.
hasChangesToSave
(
formData
,
modelData
))
{
...
...
frontend/src/components/university/modules/editors/UniversitySemestersDatesEditor.js
View file @
7a37ef79
...
...
@@ -23,8 +23,34 @@ const styles = theme => ({
...
editorStyle
(
theme
)
});
function
onlyOneIsNull
(
a
,
b
)
{
return
(
a
==
null
&&
b
!=
null
)
||
(
b
==
null
&&
a
!=
null
)
}
class
UniversitySemestersDatesEditor
extends
Editor
{
formHasError
()
{
let
messages
=
Array
();
const
formData
=
this
.
getDataFromFields
();
const
{
autumn_begin
,
autumn_end
,
spring_begin
,
spring_end
}
=
formData
;
if
(
onlyOneIsNull
(
autumn_begin
,
autumn_end
))
{
messages
.
push
(
"
Si une date est saisie pour le semestre d'automne, l'autre doit l'être aussi.
"
);
}
if
(
onlyOneIsNull
(
spring_begin
,
spring_end
))
{
messages
.
push
(
"
Si une date est saisie pour le semestre de printemps, l'autre doit l'être aussi.
"
);
}
if
(
autumn_begin
&&
autumn_end
&&
autumn_begin
>
autumn_end
)
{
messages
.
push
(
"
Le début du semestre d'automne doit être antérieur à sa fin...
"
);
}
if
(
spring_begin
&&
spring_end
&&
spring_begin
>
spring_end
)
{
messages
.
push
(
"
Le début du semestre de printemps doit être antérieur à sa fin...
"
);
}
return
this
.
buildError
(
messages
);
}
renderEditor
()
{
const
{
modelData
}
=
this
.
props
;
...
...
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