Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Julien Jerphanion
Rex Dri
Commits
e106f580
Commit
e106f580
authored
Aug 19, 2018
by
Florent Chehab
Browse files
UniversityScholarhip added
parent
97cab068
Changes
4
Hide whitespace changes
Inline
Side-by-side
rex/models/module/__init__.py
View file @
e106f580
from
.module
import
Module
# noqa: F401
from
.basicModule
import
BasicModule
# noqa: F401
from
.scholarship
import
Scholarship
# noqa: F401
rex/models/module/scholarship.py
View file @
e106f580
...
...
@@ -6,8 +6,8 @@ from django.core.validators import MinValueValidator
class
Scholarship
(
BasicModule
):
type
=
models
.
CharField
(
required
=
True
,
max_length
=
200
)
currency
=
models
.
CharField
(
required
=
True
,
max_length
=
50
)
type
=
models
.
CharField
(
max_length
=
200
)
# TODO add required
currency
=
models
.
CharField
(
max_length
=
50
)
# TODO add required
amount_min
=
models
.
DecimalField
(
max_digits
=
20
,
decimal_places
=
2
,
...
...
rex/models/university/__init__.py
View file @
e106f580
from
.university
import
University
,
UniversityViewSet
# noqa: F401
from
.campus
import
MainCampus
,
MainCampusViewSet
# noqa: F401
from
.universityScholarship
import
UniversityScholarship
# noqa: F401
rex/models/university/universityScholarship.py
0 → 100644
View file @
e106f580
from
rex.models.module
import
Scholarship
class
UniversityScholarship
(
Scholarship
):
module_name
=
"University Scholarship"
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment