Commit 7c509208 authored by Florent Chehab's avatar Florent Chehab

Merge branch 'new_file_orga' into 'master'

New repo organization

Closes #38

See merge request rex-dri/rex-dri!42
parents 818af843 f794902c
......@@ -5,7 +5,6 @@ db.sqlite3
/static
.DS_Store
/media/*
node_modules
.coverage
htmlcov
.vscode
......
......@@ -31,7 +31,7 @@ flake8:
image: python:3.6.5-jessie
script:
- pip install flake8
- flake8
- cd backend && flake8
tags:
- docker
......@@ -43,8 +43,8 @@ pages:
script:
- mkdir .public
- mv htmlcov/ .public/coverage
- make docs
- mv docs/ .public/docs
- make documentation
- mv documentation/ .public/documentation
- mv .public public
artifacts:
paths:
......@@ -54,22 +54,3 @@ pages:
- master
tags:
- docker
deliver_for_production:
type: deploy
before_script:
## look here for info : https://docs.gitlab.com/ee/ci/ssh_keys/#ssh-keys-when-using-the-docker-executor
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- ssh $SERVER_USER_USERNAME@$SERVER 'bash -s' < deploy.sh
only:
- production
tags:
- docker
......@@ -2,26 +2,26 @@
.PHONY: docs
install_backend:
pip install -r requirements.txt --quiet
cd backend && pip install -r requirements.txt --quiet
build_frontend:
npm run build
cd frontend && npm run build
test_backend:
pytest general/ frontend/ backend/
cd backend && pytest base_app/ frontend_app/ backend_app/
test_backend_server:
pytest -n 4 general/ frontend/ backend/ --cov-report html
cd backend && pytest -n 4 base_app/ frontend_app/ backend_app/ --cov-report html
check_backend:
./manage.py check
cd backend && ./manage.py check
run_backend:
./manage.py runserver
cd backend && ./manage.py runserver
docs:
cd docs && $(MAKE) all
documentation:
cd documentation && $(MAKE) all
docs_clean:
cd docs && $(MAKE) clean
documentation_clean:
cd documentation && $(MAKE) clean
......@@ -2,4 +2,4 @@
1. Collaborations are welcomed
1. The documentation is not up-to-date for now, don't mind asking questions if you have issues running the project.
**Retrouvez la documentation [ici](https://chehabfl.gitlab.utc.fr/outgoing_rex/docs/).**
**Retrouvez la documentation [ici](https://rex-dri.gitlab.utc.fr/rex-dri/documentation/).**
......@@ -3,7 +3,7 @@ omit =
*migrations*
*/tests/*
manage.py
general/wsgi.py
base_app/wsgi.py
*/urls.py
*/admin.py
......
......@@ -4,7 +4,4 @@ ignore = E501
exclude =
env/*
node_modules/*
backend/urls.py
backend/admin.py
backend/permissions/__list_user_post_permission.py
general/settings/development.py
base_app/settings/development.py
/static
\ No newline at end of file
default_app_config = 'backend.apps.BackendConfig'
from django.apps import AppConfig
class BackendConfig(AppConfig):
name = 'backend'
def ready(self):
import backend.signals.__create_user_modules_post_create # noqa: F401
import backend.signals.__squash_revision_by_user # noqa: F401
import backend.signals.__create_univ_modules_post_save # noqa: F401
default_app_config = 'backend_app.apps.BackendAppConfig'
......@@ -14,7 +14,7 @@ for model in api_config:
if "model" in model and model['model']:
model = DotMap(model)
if (not model.requires_testing) and (not model.ignore_in_admin):
module = importlib.import_module("backend.models.{}".format (model.import_location))
module = importlib.import_module("backend_app.models.{}".format(model.import_location))
if model.versionned:
VERSIONNED_MODELS.append(getattr(module, model.model))
else:
......
from django.apps import AppConfig
class BackendAppConfig(AppConfig):
name = 'backend_app'
def ready(self):
import backend_app.signals.__create_user_modules_post_create # noqa: F401
import backend_app.signals.__squash_revision_by_user # noqa: F401
import backend_app.signals.__create_univ_modules_post_save # noqa: F401
from backend.fields import JSONField
from backend_app.fields import JSONField
from rest_framework import serializers
field_mapping = serializers.ModelSerializer.serializer_field_mapping
......
from backend.models.country import Country
from backend_app.models.country import Country
import os
import pandas as pd
from .loadGeneric import LoadGeneric
......
from backend.models.currency import Currency
from backend_app.models.currency import Currency
import os
import csv
from .loadGeneric import LoadGeneric
......
from backend.models.tag import Tag
from backend_app.models.tag import Tag
import os
import json
......
from backend.models.country import Country
from backend.models.city import City
from backend.models.university import University
from backend.models.campus import Campus
from backend_app.models.country import Country
from backend_app.models.city import City
from backend_app.models.university import University
from backend_app.models.campus import Campus
import os
import pandas as pd
......
from .loadGeneric import LoadGeneric
from backend.models.university import University
from backend.models.university import UniversityDri
from backend.models.university import UniversityInfo
from backend.models.university import UniversitySemestersDates
from backend.models.country import CountryScholarship
from backend.models.country import Country
from backend.models.university import UniversityTaggedItem
from backend_app.models.university import University
from backend_app.models.university import UniversityDri
from backend_app.models.university import UniversityInfo
from backend_app.models.university import UniversitySemestersDates
from backend_app.models.country import CountryScholarship
from backend_app.models.country import Country
from backend_app.models.university import UniversityTaggedItem
from backend.models.currency import Currency
from backend.models.tag import Tag
from backend_app.models.currency import Currency
from backend_app.models.tag import Tag
from datetime import datetime
......
# Generated by Django 2.0.3 on 2018-09-16 13:31
import backend.fields
import backend.models.abstract.my_model.myModel
import backend.models.university.university
import backend_app.fields
import backend_app.models.abstract.my_model.myModel
import backend_app.models.university.university
from django.conf import settings
import django.core.validators
from django.db import migrations, models
......@@ -26,10 +26,10 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('is_main_campus', models.BooleanField()),
('name', models.CharField(default='', max_length=200)),
......@@ -43,13 +43,13 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.JSONField(default=dict)),
('campus', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='campus_tagged_items', to='backend.Campus')),
('custom_content', backend_app.fields.JSONField(default=dict)),
('campus', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='campus_tagged_items', to='backend_app.Campus')),
],
),
migrations.CreateModel(
......@@ -58,7 +58,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('name', models.CharField(max_length=200)),
('local_name', models.CharField(default='', max_length=200)),
('area', models.CharField(default='', max_length=200)),
......@@ -73,13 +73,13 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.JSONField(default=dict)),
('city', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='city_tagged_items', to='backend.City')),
('custom_content', backend_app.fields.JSONField(default=dict)),
('city', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='city_tagged_items', to='backend_app.City')),
],
),
migrations.CreateModel(
......@@ -87,7 +87,7 @@ class Migration(migrations.Migration):
fields=[
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('name', models.CharField(max_length=200)),
('iso_alpha2_code', models.CharField(max_length=2, primary_key=True, serialize=False)),
('iso_alpha3_code', models.CharField(default='', max_length=3, unique=True)),
......@@ -108,12 +108,12 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('countries', models.ManyToManyField(related_name='country_dri', to='backend.Country')),
('countries', models.ManyToManyField(related_name='country_dri', to='backend_app.Country')),
],
options={
'abstract': False,
......@@ -125,17 +125,17 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('type', models.CharField(max_length=200)),
('other_advantages', models.CharField(default='', max_length=5000)),
('frequency', models.CharField(choices=[('w', 'week'), ('m', 'month'), ('s', 'semester'), ('y', 'year'), ('o', 'one_shot')], default='m', max_length=1)),
('amount_min', models.DecimalField(decimal_places=2, max_digits=20, null=True, validators=[django.core.validators.MinValueValidator(0)])),
('amount_max', models.DecimalField(decimal_places=2, max_digits=20, null=True, validators=[django.core.validators.MinValueValidator(0)])),
('countries', models.ManyToManyField(related_name='country_scholarships', to='backend.Country')),
('countries', models.ManyToManyField(related_name='country_scholarships', to='backend_app.Country')),
],
options={
'abstract': False,
......@@ -147,13 +147,13 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('title', models.CharField(default='', max_length=150)),
('comment', models.CharField(default='', max_length=5000)),
('useful_links', backend.fields.JSONField(default=list)),
('useful_links', backend_app.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.JSONField(default=dict)),
('country', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='country_tagged_items', to='backend.Country')),
('custom_content', backend_app.fields.JSONField(default=dict)),
('country', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='country_tagged_items', to='backend_app.Country')),
],
),
migrations.CreateModel(
......@@ -161,7 +161,7 @@ class Migration(migrations.Migration):
fields=[
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('code', models.CharField(max_length=3, primary_key=True, serialize=False)),
('name', models.CharField(max_length=100)),
('symbol', models.CharField(default='', max_length=30)),
......@@ -176,7 +176,7 @@ class Migration(migrations.Migration):
fields=[
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('code', models.CharField(max_length=6, primary_key=True, serialize=False)),
('name', models.CharField(max_length=100)),
('active', models.BooleanField()),
......@@ -191,7 +191,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('aaa', models.CharField(max_length=100)),
],
options={
......@@ -204,7 +204,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('bbb', models.CharField(max_length=100)),
],
options={
......@@ -217,7 +217,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('nb_seats_offered', models.PositiveIntegerField()),
('nb_seats_offered_exchange', models.PositiveIntegerField(null=True)),
('nb_seats_offered_double_degree', models.PositiveIntegerField(null=True)),
......@@ -229,7 +229,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('object_id', models.CharField(max_length=100)),
('updated_on', models.DateTimeField(null=True)),
('new_object', backend.fields.JSONField(default=dict)),
('new_object', backend_app.fields.JSONField(default=dict)),
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
],
),
......@@ -239,10 +239,10 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('Utc_departure_id', models.IntegerField()),
('is_anonymous', models.BooleanField()),
('courses', backend.fields.JSONField(null=True)),
('courses', backend_app.fields.JSONField(null=True)),
],
options={
'abstract': False,
......@@ -254,15 +254,15 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('is_anonymous', models.BooleanField(default=True)),
('is_public', models.BooleanField(default=False)),
('courses_and_courses_feedback', backend.fields.JSONField(default=dict)),
('courses_and_courses_feedback', backend_app.fields.JSONField(default=dict)),
('adequation_comment', models.CharField(default='', max_length=5000)),
('integration_comment', models.CharField(default='', max_length=5000)),
('adequation_grate', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(20)])),
('integration_grade', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(20)])),
('departure', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='backend.PreviousDeparture')),
('departure', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='backend_app.PreviousDeparture')),
],
options={
'abstract': False,
......@@ -274,7 +274,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('is_anonymous', models.BooleanField(default=True)),
('is_public', models.BooleanField(default=False)),
('order_in_list', models.PositiveIntegerField()),
......@@ -288,7 +288,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('is_anonymous', models.BooleanField(default=True)),
('is_public', models.BooleanField(default=False)),
('public', models.BooleanField()),
......@@ -300,7 +300,7 @@ class Migration(migrations.Migration):
fields=[
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('code', models.CharField(max_length=6, primary_key=True, serialize=False)),
],
options={
......@@ -313,11 +313,11 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('code', models.CharField(max_length=6)),
('name', models.CharField(max_length=100)),
('active', models.BooleanField()),
('department', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='backend.Department')),
('department', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='backend_app.Department')),
],
),
migrations.CreateModel(
......@@ -326,9 +326,9 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('name', models.CharField(max_length=100, unique=True)),
('config', backend.fields.JSONField(default=dict)),
('config', backend_app.fields.JSONField(default=dict)),
],
options={
'abstract': False,
......@@ -340,10 +340,10 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend_app.models.abstract.my_model.myModel.validate_obj_model_lv])),
('name', models.CharField(max_length=200)),
('acronym', models.CharField(default='', max_length=20)),
('logo', models.URLField(default='', validators=[backend.models.university.university.validate_extension_django])),
('logo', models.URLField(default='', validators=[backend_app.models.university.university.validate_extension_django])),
('website', models.URLField(default='', max_length=300)),