Merge pull request #111 from edx/mushtaq/3play-turnaround-levels

Modify 3PlayMedia turnaround levels 

edxval/migrations/0009_auto_20171127_0406.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.7 on 2017-11-27 09:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('edxval', '0008_remove_subtitles'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transcriptpreference',
+            name='three_play_turnaround',
+            field=models.CharField(blank=True, choices=[(b'extended', b'10-Day/Extended'), (b'standard', b'4-Day/Standard'), (b'expedited', b'2-Day/Expedited'), (b'rush', b'24 hour/Rush'), (b'same_day', b'Same Day'), (b'two_hour', b'2 Hour')], max_length=20, null=True, verbose_name=b'3PlayMedia Turnaround'),
+        ),
+    ]

edxval/models.py

@@ -512,18 +512,20 @@ class ThreePlayTurnaround(object):
     """
     3PlayMedia turnarounds.
     """
-    EXTENDED_SERVICE = 'extended_service'
-    DEFAULT = 'default'
-    EXPEDITED_SERVICE = 'expedited_service'
-    RUSH_SERVICE = 'rush_service'
-    SAME_DAY_SERVICE = 'same_day_service'
+    EXTENDED = 'extended'
+    STANDARD = 'standard'
+    EXPEDITED= 'expedited'
+    RUSH = 'rush'
+    SAME_DAY= 'same_day'
+    TWO_HOUR = 'two_hour'
 
     CHOICES = (
-        (EXTENDED_SERVICE, '10-Day/Extended'),
-        (DEFAULT, '4-Day/Default'),
-        (EXPEDITED_SERVICE, '2-Day/Expedited'),
-        (RUSH_SERVICE, '24 hour/Rush'),
-        (SAME_DAY_SERVICE, 'Same Day'),
+        (EXTENDED, '10-Day/Extended'),
+        (STANDARD, '4-Day/Standard'),
+        (EXPEDITED, '2-Day/Expedited'),
+        (RUSH, '24 hour/Rush'),
+        (SAME_DAY, 'Same Day'),
+        (TWO_HOUR, '2 Hour'),
     )
 
 

edxval/tests/constants.py

@@ -398,7 +398,7 @@ TRANSCRIPT_PREFERENCES_CIELO24 = dict(
 TRANSCRIPT_PREFERENCES_3PLAY = dict(
     course_id='edX/DemoX/Demo_Course',
     provider=TranscriptProviderType.THREE_PLAY_MEDIA,
-    three_play_turnaround=ThreePlayTurnaround.SAME_DAY_SERVICE,
+    three_play_turnaround=ThreePlayTurnaround.SAME_DAY,
     preferred_languages=['ar', 'en'],
     video_source_language='en',
 )

edxval/utils.py

@@ -59,11 +59,12 @@ THIRD_PARTY_TRANSCRIPTION_PLANS = {
     '3PlayMedia': {
         'display_name': '3Play Media',
         'turnaround': {
-            'same_day_service': 'Same day',
-            'rush_service': '24 hours (rush)',
-            'expedited_service': '2 days (expedited)',
-            'default': '4 days (default)',
-            'extended_service':'10 days (extended)'
+            'two_hour': '2 hours',
+            'same_day': 'Same day',
+            'rush': '24 hours (rush)',
+            'expedited': '2 days (expedited)',
+            'standard': '4 days (standard)',
+            'extended':'10 days (extended)'
         },
         'languages': {
             'en': 'English',

setup.py

@@ -41,7 +41,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edxval',
-    version='0.1.5',
+    version='0.1.6',
     author='edX',
     url='http://github.com/edx/edx-val',
     description='edx-val',