Commit 4f47ea74 by Cole Rogers

Added Credit Pathway model and a test

parent 2c7ebc6a
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-07-06 00:29
from __future__ import unicode_literals
import django_extensions.db.fields
import sortedm2m.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('course_metadata', '0084_auto_20180522_1339'),
]
operations = [
migrations.CreateModel(
name='CreditPathway',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
('name', models.CharField(max_length=255)),
('org_name', models.CharField(max_length=255, verbose_name='Organization name')),
('email', models.EmailField(max_length=255)),
('programs', sortedm2m.fields.SortedManyToManyField(help_text=None, to='course_metadata.Program')),
],
),
migrations.AlterUniqueTogether(
name='creditpathway',
unique_together=set([('name', 'org_name')]),
),
]
...@@ -1274,6 +1274,20 @@ class Program(TimeStampedModel): ...@@ -1274,6 +1274,20 @@ class Program(TimeStampedModel):
super(Program, self).save(*args, **kwargs) super(Program, self).save(*args, **kwargs)
class CreditPathway(TimeStampedModel):
""" Credit Pathway model """
name = models.CharField(max_length=255)
org_name = models.CharField(max_length=255, verbose_name=_("Organization name"))
email = models.EmailField(max_length=255)
programs = SortedManyToManyField(Program)
def __str__(self):
return "{org_name}: {name}".format(org_name=self.org_name, name=self.name)
class Meta(object):
unique_together = ('name', 'org_name')
class PersonSocialNetwork(AbstractSocialNetworkModel): class PersonSocialNetwork(AbstractSocialNetworkModel):
""" Person Social Network model. """ """ Person Social Network model. """
person = models.ForeignKey(Person, related_name='person_networks') person = models.ForeignKey(Person, related_name='person_networks')
......
...@@ -331,6 +331,15 @@ class ProgramFactory(factory.django.DjangoModelFactory): ...@@ -331,6 +331,15 @@ class ProgramFactory(factory.django.DjangoModelFactory):
add_m2m_data(self.instructor_ordering, extracted) add_m2m_data(self.instructor_ordering, extracted)
class CreditPathwayFactory(factory.DjangoModelFactory):
name = FuzzyText()
org_name = FuzzyText()
email = factory.Sequence(lambda n: 'test-email-{}@test.com'.format(n)) # pylint: disable=unnecessary-lambda
class Meta:
model = CreditPathway
class AbstractSocialNetworkModelFactory(factory.DjangoModelFactory): class AbstractSocialNetworkModelFactory(factory.DjangoModelFactory):
type = FuzzyChoice([name for name, __ in AbstractSocialNetworkModel.SOCIAL_NETWORK_CHOICES]) type = FuzzyChoice([name for name, __ in AbstractSocialNetworkModel.SOCIAL_NETWORK_CHOICES])
value = FuzzyText() value = FuzzyText()
......
...@@ -1110,6 +1110,15 @@ class ProgramTests(TestCase): ...@@ -1110,6 +1110,15 @@ class ProgramTests(TestCase):
assert mock_delete_obj.called assert mock_delete_obj.called
class CreditPathwayTests(TestCase):
""" Tests of the CreditPathway model."""
def test_str(self):
credit_pathway = factories.CreditPathwayFactory()
self.assertEqual(str(credit_pathway),
'{org_name}: {name}'.format(org_name=credit_pathway.org_name, name=credit_pathway.name))
class PersonSocialNetworkTests(TestCase): class PersonSocialNetworkTests(TestCase):
"""Tests of the PersonSocialNetwork model.""" """Tests of the PersonSocialNetwork model."""
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-05 12:03+0000\n" "POT-Creation-Date: 2018-07-06 12:57+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...@@ -493,6 +493,10 @@ msgid "" ...@@ -493,6 +493,10 @@ msgid ""
"have a detail page." "have a detail page."
msgstr "" msgstr ""
#: apps/course_metadata/models.py:1280
msgid "Organization name"
msgstr ""
#: apps/course_metadata/templates/admin/course_metadata/course_run.html:24 #: apps/course_metadata/templates/admin/course_metadata/course_run.html:24
#: apps/publisher/templates/publisher/_add_instructor_popup.html:96 #: apps/publisher/templates/publisher/_add_instructor_popup.html:96
#: apps/publisher/templates/publisher/_revert_confirmation.html:13 #: apps/publisher/templates/publisher/_revert_confirmation.html:13
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-05 12:03+0000\n" "POT-Creation-Date: 2018-07-06 12:57+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-05 12:03+0000\n" "POT-Creation-Date: 2018-07-06 12:57+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...@@ -634,6 +634,10 @@ msgstr "" ...@@ -634,6 +634,10 @@ msgstr ""
"Hïdé prögräm ön märkétïng sïté ländïng änd séärçh pägés. Thïs prögräm MÀÝ " "Hïdé prögräm ön märkétïng sïté ländïng änd séärçh pägés. Thïs prögräm MÀÝ "
"hävé ä détäïl pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#" "hävé ä détäïl pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
#: apps/course_metadata/models.py
msgid "Organization name"
msgstr "Örgänïzätïön nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
#: apps/course_metadata/templates/admin/course_metadata/course_run.html #: apps/course_metadata/templates/admin/course_metadata/course_run.html
#: apps/publisher/templates/publisher/_add_instructor_popup.html #: apps/publisher/templates/publisher/_add_instructor_popup.html
#: apps/publisher/templates/publisher/_revert_confirmation.html #: apps/publisher/templates/publisher/_revert_confirmation.html
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: edx-platform\n" "Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-05 12:03+0000\n" "POT-Creation-Date: 2018-07-06 12:57+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n" "PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n" "Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
......
Markdown is supported
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