Fix bugs in model
This commit is contained in:
parent
31cba9f4b9
commit
b8eecb0660
25
apps/map/migrations/0039_auto_20180328_0245.py
Normal file
25
apps/map/migrations/0039_auto_20180328_0245.py
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.6 on 2018-03-28 02:45
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('map', '0038_auto_20180328_0146'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='casestudy',
|
||||||
|
name='type_of_extraction',
|
||||||
|
field=models.CharField(blank=True, choices=[('SUR', 'Surface (open pit/open cast/open cut mining'), ('SUB', 'Sub-surface (underground mining)'), ('SEA', 'Seabed mining'), ('URB', 'Urban mining/recycling')], default=None, max_length=3, null=True, verbose_name='Type of extraction'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='casestudy',
|
||||||
|
name='use_in_energy_economy',
|
||||||
|
field=models.CharField(blank=True, choices=[('WTM', 'Wind turbine manufacturing'), ('SPM', 'Solar panel manufacturing'), ('STM', 'Solar thermal system manufacturing'), ('HGM', 'Hydropower generator manufacturing'), ('GGM', 'Geothermal generator manufacturing'), ('ESS', 'Energy storage (inc. battery systems)'), ('OTR', 'Others')], default=None, help_text='Select the potential use of the minerals in the renewable energy economy', max_length=3, null=True, verbose_name='Potential use in renewable energy economy'),
|
||||||
|
),
|
||||||
|
]
|
20
apps/map/migrations/0040_auto_20180328_0309.py
Normal file
20
apps/map/migrations/0040_auto_20180328_0309.py
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.6 on 2018-03-28 03:09
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('map', '0039_auto_20180328_0245'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='casestudy',
|
||||||
|
name='type_of_extraction',
|
||||||
|
field=models.CharField(blank=True, choices=[('SUR', 'Surface (open pit/open cast/open cut mining)'), ('SUB', 'Sub-surface (underground mining)'), ('SEA', 'Seabed mining'), ('URB', 'Urban mining/recycling')], default=None, max_length=3, null=True, verbose_name='Type of extraction'),
|
||||||
|
),
|
||||||
|
]
|
@ -101,7 +101,7 @@ class CaseStudy(models.Model):
|
|||||||
)
|
)
|
||||||
|
|
||||||
TYPE_OF_EXTRACTION_CHOICES = (
|
TYPE_OF_EXTRACTION_CHOICES = (
|
||||||
('SUR', _('Surface (open pit/open cast/open cut mining')),
|
('SUR', _('Surface (open pit/open cast/open cut mining)')),
|
||||||
('SUB', _('Sub-surface (underground mining)')),
|
('SUB', _('Sub-surface (underground mining)')),
|
||||||
('SEA', _('Seabed mining')),
|
('SEA', _('Seabed mining')),
|
||||||
('URB', _('Urban mining/recycling'))
|
('URB', _('Urban mining/recycling'))
|
||||||
@ -664,7 +664,7 @@ class CaseStudy(models.Model):
|
|||||||
|
|
||||||
# 2.3.2
|
# 2.3.2
|
||||||
use_in_energy_economy = models.CharField(
|
use_in_energy_economy = models.CharField(
|
||||||
verbose_name=_("Potential user in renewable energy economy"),
|
verbose_name=_("Potential use in renewable energy economy"),
|
||||||
help_text=_("Select the potential use of the minerals in the renewable energy economy"),
|
help_text=_("Select the potential use of the minerals in the renewable energy economy"),
|
||||||
max_length=3,
|
max_length=3,
|
||||||
choices=USE_IN_ENERGY_ECONOMY_CHOICES,
|
choices=USE_IN_ENERGY_ECONOMY_CHOICES,
|
||||||
@ -717,7 +717,7 @@ class CaseStudy(models.Model):
|
|||||||
# 2.3.4
|
# 2.3.4
|
||||||
type_of_extraction = models.CharField(
|
type_of_extraction = models.CharField(
|
||||||
verbose_name=_("Type of extraction"),
|
verbose_name=_("Type of extraction"),
|
||||||
max_length=2,
|
max_length=3,
|
||||||
choices=TYPE_OF_EXTRACTION_CHOICES,
|
choices=TYPE_OF_EXTRACTION_CHOICES,
|
||||||
default=None,
|
default=None,
|
||||||
null=True,
|
null=True,
|
||||||
@ -815,6 +815,7 @@ class CaseStudy(models.Model):
|
|||||||
|
|
||||||
# 3.2.1
|
# 3.2.1
|
||||||
negative_case_reasons = MultiSelectField(
|
negative_case_reasons = MultiSelectField(
|
||||||
|
verbose_name=("Reasons this is a negative case study"),
|
||||||
choices=NEGATIVE_CASE_REASONS_CHOICES,
|
choices=NEGATIVE_CASE_REASONS_CHOICES,
|
||||||
default=None,
|
default=None,
|
||||||
null=True,
|
null=True,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user