Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
42
Issues
42
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rex Dri
Rex Dri
Commits
0b4867c0
Commit
0b4867c0
authored
Aug 20, 2018
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UniversityInsurance added
parent
4a48c1ce
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
80 additions
and
6 deletions
+80
-6
docs/UML/UniversityModules.pu
docs/UML/UniversityModules.pu
+8
-5
rex/admin.py
rex/admin.py
+2
-0
rex/migrations/0011_universityinsurance.py
rex/migrations/0011_universityinsurance.py
+26
-0
rex/models/module/__init__.py
rex/models/module/__init__.py
+1
-1
rex/models/module/basicModule.py
rex/models/module/basicModule.py
+16
-0
rex/models/university/__init__.py
rex/models/university/__init__.py
+1
-0
rex/models/university/basicModulesUniversity.py
rex/models/university/basicModulesUniversity.py
+24
-0
rex/urls.py
rex/urls.py
+2
-0
No files found.
docs/UML/UniversityModules.pu
View file @
0b4867c0
...
...
@@ -10,10 +10,11 @@ package UniversityModule{
abstract
class
ScholarShipCopyUniversity
as
"Scholarship"
#
red
class
CultureUniversity
as
"Culture"
class
PhotoUniversity
class
PhotoUniversity
class
Courses
class
SpecialOffer
class
OtherStuff
class
Insurances
class
SemestersDates
{
+
autumn_begin
:
date
...
...
@@ -23,19 +24,20 @@ package UniversityModule{
}
class
UniversityInfo
{
+
cost_exchange
:
float
+
cost_double_degree
:
float
+
cost_exchange
:
float
+
cost_double_degree
:
float
}
CultureUniversity
-
up
-|>
BasicModuleCopyUniversity
Courses
-
up
-|>
BasicModuleCopyUniversity
SpecialOffer
-
up
-|>
BasicModuleCopyUniversity
OtherStuff
-
up
-|>
BasicModuleCopyUniversity
Insurances
-
up
-|>
BasicModuleCopyUniversity
SemestersDates
-
up
-|>
BasicModuleCopyUniversity
UniversityInfo
-
up
-|>
BasicModuleCopyUniversity
PhotoUniversity
-
left
-|>
PhotoCopyUniversity
UniversityScholarship
-
right
-|>
ScholarShipCopyUniversity
class
UniversityVirtualCopy
as
"University"
<
copy
for
\
n
cleaner
UML
>
#
lightgrey
...
...
@@ -45,6 +47,7 @@ package UniversityModule{
PhotoUniversity
"1"
-
right
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
Courses
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
OtherStuff
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
Insurances
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
SpecialOffer
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
UniversityInfo
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
SemestersDates
"1"
-
down
[
bold
,#
green
]-
"1"
UniversityVirtualCopy
...
...
rex/admin.py
View file @
0b4867c0
...
...
@@ -4,6 +4,7 @@ from reversion_compare.admin import CompareVersionAdmin
from
rex.models.university
import
University
,
Campus
,
UniversityScholarship
from
rex.models.university
import
UniversityInfo
from
rex.models.university
import
SemestersDates
from
rex.models.university
import
UniversityInsurance
from
rex.models.location
import
Country
,
City
...
...
@@ -15,3 +16,4 @@ admin.site.register(Campus, CompareVersionAdmin)
admin
.
site
.
register
(
UniversityScholarship
,
CompareVersionAdmin
)
admin
.
site
.
register
(
UniversityInfo
,
CompareVersionAdmin
)
admin
.
site
.
register
(
SemestersDates
,
CompareVersionAdmin
)
admin
.
site
.
register
(
UniversityInsurance
,
CompareVersionAdmin
)
rex/migrations/0011_universityinsurance.py
0 → 100644
View file @
0b4867c0
# Generated by Django 2.0.3 on 2018-08-20 17:01
from
django.db
import
migrations
,
models
import
django.db.models.deletion
import
rex.models.tools.usefullLinksField
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'rex'
,
'0010_auto_20180820_1830'
),
]
operations
=
[
migrations
.
CreateModel
(
name
=
'UniversityInsurance'
,
fields
=
[
(
'comment'
,
models
.
TextField
(
blank
=
True
)),
(
'usefull_links'
,
rex
.
models
.
tools
.
usefullLinksField
.
UsefullLinksField
(
blank
=
True
,
default
=
[],
validators
=
[
rex
.
models
.
tools
.
usefullLinksField
.
validate_usefull_links
])),
(
'university'
,
models
.
OneToOneField
(
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
primary_key
=
True
,
related_name
=
'university_insurances'
,
serialize
=
False
,
to
=
'rex.University'
)),
],
options
=
{
'abstract'
:
False
,
},
),
]
rex/models/module/__init__.py
View file @
0b4867c0
from
.module
import
Module
# noqa: F401
from
.basicModule
import
BasicModule
# noqa: F401
from
.basicModule
import
BasicModule
,
BasicModuleSerializer
# noqa: F401
from
.scholarship
import
Scholarship
# noqa: F401
rex/models/module/basicModule.py
View file @
0b4867c0
from
django.db
import
models
from
rex.models.tools
import
UsefullLinksField
from
rex.models.module
import
Module
from
rest_framework
import
serializers
class
BasicModule
(
Module
):
...
...
@@ -10,3 +11,18 @@ class BasicModule(Module):
class
Meta
:
abstract
=
True
class
BasicModuleSerializer
(
serializers
.
ModelSerializer
):
modified_by
=
serializers
.
SerializerMethodField
()
modified_date
=
serializers
.
SerializerMethodField
()
def
get_modified_by
(
self
,
obj
):
return
obj
.
modified_by
()
def
get_modified_date
(
self
,
obj
):
return
obj
.
modified_date
()
class
Meta
:
model
=
BasicModule
fields
=
(
'comment'
,
'usefull_links'
,
'modified_by'
,
'modified_date'
)
rex/models/university/__init__.py
View file @
0b4867c0
...
...
@@ -4,3 +4,4 @@ from .universityAPI import UniversitySerializer, UniversityViewSet # noqa: F401
from
.universityScholarship
import
UniversityScholarship
,
UniversityScholarshipViewSet
# noqa: F401
from
.universityInfo
import
UniversityInfo
,
UniversityInfoViewSet
# noqa: F401
from
.semestersDates
import
SemestersDates
,
SemestersDatesViewSet
# noqa: F401
from
.basicModulesUniversity
import
UniversityInsurance
,
UniversityInsuranceViewSet
# noqa: F401
rex/models/university/basicModulesUniversity.py
0 → 100644
View file @
0b4867c0
from
django.db
import
models
from
rex.models.module
import
BasicModule
from
rex.models.university
import
University
from
rest_framework
import
viewsets
,
permissions
from
rex.models.module
import
BasicModuleSerializer
class
UniversityInsurance
(
BasicModule
):
university
=
models
.
OneToOneField
(
University
,
on_delete
=
models
.
CASCADE
,
related_name
=
'university_insurances'
,
primary_key
=
True
)
class
UniversityInsuranceSerializer
(
BasicModuleSerializer
):
class
Meta
:
model
=
UniversityInsurance
fields
=
'__all__'
class
UniversityInsuranceViewSet
(
viewsets
.
ModelViewSet
):
# TODO switch to dict
permission_classes
=
(
permissions
.
DjangoModelPermissions
,)
queryset
=
UniversityInsurance
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityInsuranceSerializer
#####################
rex/urls.py
View file @
0b4867c0
...
...
@@ -8,6 +8,7 @@ from rex.models.university import CampusViewSet
from
rex.models.university
import
UniversityScholarshipViewSet
from
rex.models.university
import
UniversityInfoViewSet
from
rex.models.university
import
SemestersDatesViewSet
from
rex.models.university
import
UniversityInsuranceViewSet
from
rex.models.tools
import
CurrencyViewSet
from
rest_framework.documentation
import
include_docs_urls
...
...
@@ -25,6 +26,7 @@ router.register(r'campus', CampusViewSet)
router
.
register
(
r'university'
,
UniversityViewSet
)
router
.
register
(
r'university_scholarship'
,
UniversityScholarshipViewSet
)
router
.
register
(
r'university_info'
,
UniversityInfoViewSet
)
router
.
register
(
r'university_insurance'
,
UniversityInsuranceViewSet
)
router
.
register
(
r'semesters_dates'
,
SemestersDatesViewSet
)
router
.
register
(
r'currency'
,
CurrencyViewSet
)
...
...
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