Commit 5085ecbb authored by Segolene's avatar Segolene
Browse files

fix before merge

parent 1697ab2d
Pipeline #39258 passed with stages
in 3 minutes and 7 seconds
......@@ -12,3 +12,4 @@ htmlcov
database.db
database.db-journal
.idea
npm-debug.log
# Generated by Django 2.1.7 on 2019-04-13 15:34
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [("backend_app", "0004_auto_20190407_1010")]
operations = [
migrations.RemoveField(model_name="exchange", name="courses"),
migrations.AddField(
model_name="course",
name="exchange",
field=models.ForeignKey(
default=1,
on_delete=django.db.models.deletion.CASCADE,
related_name="exchange_courses",
to="backend_app.Exchange",
),
preserve_default=False,
),
migrations.AlterField(
model_name="course", name="utc_exchange_id", field=models.IntegerField()
),
migrations.AlterField(
model_name="coursefeedback",
name="course",
field=models.OneToOneField(
default=0,
on_delete=django.db.models.deletion.CASCADE,
related_name="course_feedback",
to="backend_app.Course",
),
),
]
# Generated by Django 2.1.7 on 2019-04-13 16:00
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("backend_app", "0005_auto_20190413_1734")]
operations = [
migrations.RemoveField(model_name="coursefeedback", name="is_psf_credit"),
migrations.RemoveField(model_name="coursefeedback", name="university"),
migrations.AlterField(
model_name="course",
name="link",
field=models.URLField(blank=True, max_length=500, null=True),
),
migrations.AlterField(
model_name="course",
name="nb_credit",
field=models.PositiveIntegerField(default=0),
),
]
# Generated by Django 2.1.7 on 2019-05-04 15:52
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('backend_app', '0005_auto_20190423_2027'),
]
operations = [
migrations.RemoveField(
model_name='coursefeedback',
name='is_psf_credit',
),
migrations.RemoveField(
model_name='coursefeedback',
name='university',
),
migrations.RemoveField(
model_name='exchange',
name='courses',
),
migrations.AddField(
model_name='course',
name='exchange',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exchange_courses', to='backend_app.Exchange'),
),
migrations.AlterField(
model_name='course',
name='link',
field=models.URLField(blank=True, max_length=500, null=True),
),
migrations.AlterField(
model_name='course',
name='nb_credit',
field=models.PositiveIntegerField(default=0),
),
migrations.AlterField(
model_name='course',
name='utc_exchange_id',
field=models.IntegerField(),
),
migrations.AlterField(
model_name='coursefeedback',
name='adequation',
field=models.IntegerField(default=0, validators=[django.core.validators.MaxValueValidator(5), django.core.validators.MinValueValidator(-5)]),
),
migrations.AlterField(
model_name='coursefeedback',
name='course',
field=models.OneToOneField(default=0, on_delete=django.db.models.deletion.CASCADE, related_name='course_feedback', to='backend_app.Course'),
),
migrations.AlterField(
model_name='coursefeedback',
name='language_following_ease',
field=models.IntegerField(default=0, validators=[django.core.validators.MaxValueValidator(5), django.core.validators.MinValueValidator(-5)]),
),
migrations.AlterField(
model_name='coursefeedback',
name='working_dose',
field=models.IntegerField(default=0, validators=[django.core.validators.MaxValueValidator(5), django.core.validators.MinValueValidator(-5)]),
),
]
# Generated by Django 2.1.7 on 2019-04-18 19:33
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("backend_app", "0006_auto_20190413_1800")]
operations = [
migrations.AlterField(
model_name="coursefeedback",
name="adequation",
field=models.IntegerField(
default=0,
validators=[
django.core.validators.MaxValueValidator(5),
django.core.validators.MinValueValidator(-5),
],
),
),
migrations.AlterField(
model_name="coursefeedback",
name="language_following_ease",
field=models.IntegerField(
default=0,
validators=[
django.core.validators.MaxValueValidator(5),
django.core.validators.MinValueValidator(-5),
],
),
),
migrations.AlterField(
model_name="coursefeedback",
name="working_dose",
field=models.IntegerField(
default=0,
validators=[
django.core.validators.MaxValueValidator(5),
django.core.validators.MinValueValidator(-5),
],
),
),
]
# Generated by Django 2.1.7 on 2019-05-04 13:59
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("backend_app", "0005_auto_20190423_2027"),
("backend_app", "0007_auto_20190418_2133"),
]
operations = []
......@@ -6,7 +6,7 @@ from backend_app.models.exchange import Exchange
class Course(BaseModel):
exchange = models.ForeignKey(
Exchange, on_delete=models.CASCADE, related_name="exchange_courses"
Exchange, on_delete=models.CASCADE, related_name="exchange_courses", null=True
)
utc_exchange_id = models.IntegerField()
course_id = models.IntegerField()
......
This diff is collapsed.
import React from "react";
import React, {Component} from "react";
import Table from "@material-ui/core/Table";
import TableBody from "@material-ui/core/TableBody";
......@@ -9,7 +9,6 @@ import TableRow from "@material-ui/core/TableRow";
import PropTypes from "prop-types";
import compose from "recompose/compose";
import withStyles from "@material-ui/core/styles/withStyles";
import CustomComponentForAPI from "../../common/CustomComponentForAPI";
const styles = theme => ({
......@@ -20,9 +19,9 @@ const styles = theme => ({
});
class CourseFeedback extends CustomComponentForAPI {
class CourseFeedback extends Component {
customRender() {
render() {
const {classes, exchangeCourses} = this.props;
return (
......@@ -59,24 +58,9 @@ class CourseFeedback extends CustomComponentForAPI {
}
// CourseFeedback.propTypes = {
// };
//
//
// const mapStateToProps = (state) => {
// return {
// };
// };
//
// const mapDispatchToProps = (dispatch) => {
// return {
// api: {
// },
// };
// };
CourseFeedback.propTypes = {
classes: PropTypes.object.isRequired,
exchangeCourses: PropTypes.array.isRequired,
};
export default compose(
......
......@@ -145,20 +145,6 @@ PreviousDeparture.propTypes = {
rawModelData: PropTypes.object.isRequired,
};
// const mapStateToProps = (state) => {
// return {
// courses: state.api.courseFeedbacksAll,
// };
// };
//
// const mapDispatchToProps = (dispatch) => {
// return {
// api: {
// courses: ({params}) => dispatch(getActions("courseFeedbacks").readAll(params)),
// },
// };
// };
export default compose(
withStyles(styles, {withTheme: true}),
)(PreviousDeparture);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment