issue openedx#2630

Author: JAST-KokiWatanabe

biz/djangoapps/ga_contract_operation/student_member_register.py

@@ -263,7 +263,9 @@ def _validate(student):
             for num in range(17, 27):
                 if len(input_columns[num]) > 100:
                     return _fail(_("Please enter of {0} within {1} characters.").format(_("Item"), 100))
-        if member_code != '':
+        if member_code:
+            if not re.match(r'^[ -~]*$', member_code):
+                return _fail(_("Illegal format on {0}.").format(_("Member Code")))
             email = input_columns[1]
             members = Member.find_active_by_email(org=contract.contractor_organization.id, email=email).values('code')
             code_exist = True if len(Member.find_active_by_code(

biz/djangoapps/ga_contract_operation/tests/test_views_reminder_mail.py

@@ -48,6 +48,7 @@ def setUp(self):
             start=datetime(2016, 1, 1, 0, 0, 0, tzinfo=tzutc()),  # must be the past date
             self_paced=True,
             individual_end_days=10,
+            deadline_start=datetime(2016, 1, 5, 0, 0, 0, tzinfo=tzutc())
         )
 
         self.contract_submission_reminder = self._create_contract(
@@ -296,7 +297,7 @@ def test_mail(self):
             ContractReminderMail.MAIL_PARAM_EMAIL_ADDRESS,
             ContractReminderMail.MAIL_PARAM_COURSE_NAME,
             ContractReminderMail.MAIL_PARAM_FULLNAME,
-            # ContractReminderMail.MAIL_PARAM_EXPIRE_DATE,
+            ContractReminderMail.MAIL_PARAM_EXPIRE_DATE,
         ], search_mail_info['search_mail_params'])
         expect_search_detail_other_list = OrderedDict()
         expect_search_detail_other_list['login_code'] = "Login Code"
@@ -1375,7 +1376,7 @@ def test_reminder_search_mail_send_ajax(self):
             'email_address': user1.email,
             'fullname': user1.profile.name,
             'course_name': self.course_self_paced1.display_name,
-            'expire_date': unicode(self_paced_api.get_course_end_date(enrollment).strftime("%Y-%m-%d")),
+            'expire_date': datetime(2016, 1, 5, 0, 0, 0, tzinfo=tzutc()).strftime("%Y-%m-%d"),
         })
 
     @ddt.data(True, False)

biz/djangoapps/ga_contract_operation/tests/test_views_students.py

@@ -65,7 +65,7 @@ def _assert_search_ajax_successful(self, data, total, show_list):
 
     def _create_param_search_students_ajax(
             self, contract_id=None, offset=0, limit=1000, status='',
-            is_unregister='contains', member_is_delete='contains', is_masked='contains', group_name='', free_word=''):
+            is_unregister='contains', member_is_delete='exclude', is_masked='contains', group_name='', free_word=''):
         param = {
             'contract_id': contract_id or self.contract.id,
             'offset': str(offset),
@@ -173,6 +173,7 @@ def test_index_manager(self, param_group_code, expect_num):
         self.assertEqual(render_to_response_args[1]['total_count'], expect_num)
         self.assertEqual(len(json.loads(render_to_response_args[1]['show_list'])), expect_num)
 
+
     @ddt.data(0, 1, 10)
     def test_search_students_ajax(self, test_num):
         self.setup_user()
@@ -394,7 +395,7 @@ def test_students_search_students_ajax_free_word_group_name(self, param_free_wor
         data = json.loads(response.content)
         self._assert_search_ajax_successful(data, 1, 1)
 
-    @ddt.data('exclude', 'only', 'contains')
+    @ddt.data('', 'exclude', 'only', 'contains')
     def test_students_search_students_ajax_is_delete(self, param_is_delete):
         self.setup_user()
         director_manager = self._director_manager
@@ -406,12 +407,16 @@ def test_students_search_students_ajax_is_delete(self, param_is_delete):
         register1 = self._create_user_and_contract_register(username='username_only_delete_target')
         self._create_member(org=self.contract_org, group=group, code='code_delete_target_member', user=register1.user,
                             is_active=False, is_delete=True)
+        self._create_member(org=self.contract_org, group=group, code='code_delete_target_member_backup', user=register1.user,
+                            is_active=False, is_delete=False)
 
         # Active member
         register2 = self._create_user_and_contract_register(username='username_active_and_delete_target')
         self._create_member(org=self.contract_org, group=group, code='code_active_member', user=register2.user)
         self._create_member(org=self.contract_org, group=group, code='code_active_member_old', user=register2.user,
                             is_active=False, is_delete=True)
+        self._create_member(org=self.contract_org, group=group, code='code_active_member_backup', user=register2.user,
+                            is_active=False, is_delete=False)
 
         with self.skip_check_course_selection(current_organization=self.contract_org,
                                               current_contract=self.contract, current_manager=director_manager):
@@ -420,7 +425,7 @@ def test_students_search_students_ajax_is_delete(self, param_is_delete):
         self.assertEqual(200, response.status_code)
         data = json.loads(response.content)
         show_list = json.loads(data['show_list'])
-        if param_is_delete == 'exclude':
+        if param_is_delete in ['', 'exclude']:
             self._assert_search_ajax_successful(data, 1, 1)
             self.assertEqual(show_list[0]['user_name'], 'username_active_and_delete_target')
         elif param_is_delete == 'contains':
@@ -433,7 +438,7 @@ def test_students_search_students_ajax_is_delete(self, param_is_delete):
             self.assertEqual(show_list[0]['user_name'], 'username_only_delete_target')
             self.assertEqual(show_list[1]['user_name'], 'username_active_and_delete_target')
 
-    @ddt.data('exclude', 'only', 'contains')
+    @ddt.data('', 'exclude', 'only', 'contains')
     def test_students_search_students_ajax_is_masked(self, param_is_masked):
         self.setup_user()
         director_manager = self._director_manager
@@ -450,7 +455,7 @@ def test_students_search_students_ajax_is_masked(self, param_is_masked):
         self.assertEqual(200, response.status_code)
         data = json.loads(response.content)
         show_list = json.loads(data['show_list'])
-        if param_is_masked == 'exclude':
+        if param_is_masked in ['', 'exclude']:
             self._assert_search_ajax_successful(data, 1, 1)
             self.assertEqual(show_list[0]['user_name'], 'username_is_not_masked')
         elif param_is_masked == 'contains':
@@ -606,12 +611,52 @@ def test_another_organization_member(self):
         with self.skip_check_course_selection(current_organization=orgs[1],
                                               current_contract=contracts[1], current_manager=managers[1]):
             response = self.client.post(self._url_search_students_ajax, param)
+
         self.assertEqual(200, response.status_code)
         data = json.loads(response.content)
         show_list = json.loads(data['show_list'])
         self._assert_search_ajax_successful(data, 1, 1)
         self.assertFalse(hasattr(show_list[0], 'code'))
 
+    def test_students_search_users_belonging_multiple_organizations(self):
+        self.setup_user()
+        # user1 has member data.
+        user1 = UserFactory.create()
+        # user1 has not member data.
+        user2 = UserFactory.create()
+
+        # create two org and contract
+        orgs = [self._create_organization(org_name='org' + str(i)) for i in range(2)]
+        contracts = [self._create_contract(contractor_organization=orgs[i]) for i in range(2)]
+
+        # create contract register for user1 and user2
+        contract_registers = []
+        for _user in [user1, user2]:
+            for _contract in contracts:
+                contract_registers.append(self.create_contract_register(user=_user, contract=_contract))
+
+        # create member for user1
+        user1_members = [self._create_member(org=_org, user=user1, group=None, code='code' + str(i)) for i, _org in enumerate(orgs)]
+
+        managers = [self._create_manager(org=org, user=self.user, created=self.contract_org,
+                                        permissions=[self.director_permission]) for org in orgs]
+
+        for i in range(2):
+            param = self._create_param_search_students_ajax(contract_id=contracts[i].id)
+            with self.skip_check_course_selection(current_organization=orgs[i],
+                                                  current_contract=contracts[i], current_manager=managers[i]):
+                response = self.client.post(self._url_search_students_ajax, param)
+
+            self.assertEqual(200, response.status_code)
+            data = json.loads(response.content)
+            show_list = json.loads(data['show_list'])
+            self._assert_search_ajax_successful(data, 2, 2)
+            for show_item in show_list:
+                if show_item['user_email'] == user1.email:
+                    self.assertEqual(show_item['code'], user1_members[i].code)
+                else:
+                    self.assertFalse(show_item['code'])
+
 
 class ContractOperationViewTestUnregisterStudents(BizContractTestBase):
     @property

biz/djangoapps/ga_contract_operation/utils.py

@@ -30,7 +30,7 @@ def get_additional_info_by_contract(contract):
                 'caption': additional_info.display_name,
                 'sortable': True,
                 'hidden': True,
-                'size': 1,
+                'size': 5,
             })
             display_names.append(additional_info.display_name)
 

biz/djangoapps/ga_contract_operation/views.py

@@ -155,7 +155,12 @@ def _students_initial_search(request):
 
 
 def _contract_register_list_on_page(request, offset=0, limit=CONTRACT_REGISTER_MAX_DISPLAY_NUM):
-    option_sql = [request.current_organization.id, request.current_contract.id]
+    option_sql = [
+        # set default arguments for sql
+        request.current_organization.id,
+        request.current_organization.id,
+        request.current_contract.id
+    ]
     where_sql = ""
 
     radio_operator_exclude = 'exclude'
@@ -185,6 +190,7 @@ def _contract_register_list_on_page(request, offset=0, limit=CONTRACT_REGISTER_M
     # Status and Unregister
     status = request.POST.get('status')
     is_unregister = request.POST.get('is_unregister')
+    # is_unregister is empty when students page initial display.
     if is_unregister in radio_operator:
         if is_unregister == radio_operator_contains:
             if status:
@@ -253,14 +259,17 @@ def _contract_register_list_on_page(request, offset=0, limit=CONTRACT_REGISTER_M
     # Target user of delete member
     member_is_delete = request.POST.get('member_is_delete')
     if member_is_delete == radio_operator_contains:
-        where_sql += "AND (MG.is_active=1 OR MG.is_delete=0 OR MG.is_active=0 OR MG.is_delete=1 OR MG.is_active IS NULL) "
+        where_sql += "AND ((MG.is_active=1 AND MG.is_delete=0) OR (MG.is_active=0 AND MG.is_delete=1) OR MG.is_active IS NULL) "
     elif member_is_delete == radio_operator_only:
         where_sql += "AND MG.is_delete=1 "
-    elif member_is_delete == radio_operator_exclude:
+    else:
+        # member_is_delete in ['', 'exclude']
+        # member_is_delete is empty when students page initial display.
         where_sql += "AND (MG.is_active=1 OR MG.is_active IS NULL) "
 
     # Mask
     is_masked = request.POST.get('is_masked')
+    # is_masked is empty when students page initial display.
     if is_masked == radio_operator_exclude:
         where_sql += "AND email LIKE %s "
         option_sql.append('%@%')
@@ -281,7 +290,7 @@ def _contract_register_list_on_page(request, offset=0, limit=CONTRACT_REGISTER_M
          M.org1, M.org2, M.org3, M.org4, M.org5, M.org6, M.org7, M.org8, M.org9, M.org10, 
          M.item1, M.item2, M.item3, M.item4, M.item5, M.item6, M.item7, M.item8, M.item9, M.item10
   FROM gx_member_member as M LEFT OUTER JOIN gx_org_group_group as G 
-  ON M.group_id = G.id  AND M.org_id = %s) MG ON IC.user_id = MG.user_id 
+  ON M.group_id = G.id  AND M.org_id = %s) MG ON IC.user_id = MG.user_id AND MG.org_id = %s 
 WHERE IC.contract_id = %s ''' + where_sql + '''
 ORDER BY IC.id'''
     count_sql = '''SELECT 1 as id, COUNT(*) as cnt FROM (''' + sql + ''') CNT'''
@@ -797,7 +806,7 @@ def reminder_mail(request):
             ContractReminderMail.MAIL_PARAM_EMAIL_ADDRESS,
             ContractReminderMail.MAIL_PARAM_COURSE_NAME,
             ContractReminderMail.MAIL_PARAM_FULLNAME,
-            # ContractReminderMail.MAIL_PARAM_EXPIRE_DATE,
+            ContractReminderMail.MAIL_PARAM_EXPIRE_DATE,
         ],
     }
 
@@ -1306,10 +1315,7 @@ def reminder_search_mail_send_ajax(request):
             except UserProfile.DoesNotExist:
                 full_name = ''
         else:
-            if course.self_paced:
-                expire_datetime = self_paced_api.get_course_end_date(
-                    CourseEnrollment.get_enrollment(user, detail.course_id)
-                )
+            expire_datetime = course.deadline_start
             full_name = user.profile.name
 
         try:

biz/djangoapps/ga_course_anslist/helpers.py

@@ -42,11 +42,30 @@
 	  and sbm.course_id = '$course_id'
     group by sbm.unit_id
 	order by sbm.created
-'''
+	'''
+
+QUERY_STATEMENT_SURVEY_NAMES_MAX = '''
+	SELECT 
+	    sbm.id
+	  , sbm.unit_id
+	  , sbm.course_id
+	  , sbm.survey_name
+	  , max(sbm.created)
+	FROM
+	  ga_survey_surveysubmission as sbm
+	WHERE 1 = 1
+	  and sbm.course_id = '$course_id'
+    group by sbm.unit_id
+	order by sbm.created
+	'''
 
-def _create_survey_name_list_statement(course_id):
-    templ = Template(QUERY_STATEMENT_SURVEY_NAMES)
-    sql_statement = templ.substitute(course_id=course_id)
+def _create_survey_name_list_statement(course_id, flg_get_updated_survey_name=False):
+    if flg_get_updated_survey_name:
+        templ = Template(QUERY_STATEMENT_SURVEY_NAMES_MAX)
+        sql_statement = templ.substitute(course_id=course_id)
+    else:
+        templ = Template(QUERY_STATEMENT_SURVEY_NAMES)
+        sql_statement = templ.substitute(course_id=course_id)
     return sql_statement
 
 
@@ -161,7 +180,7 @@ def _serialize_post_data_for_detail(post_data):
 
     ret_lst = []
     for k in ret_dct.keys():
-        ret_lst.append({'field' : [k], 'value' : ret_dct[k]})
+        ret_lst.append({'field' : [k], 'value': ret_dct[k]})
 
     return ret_lst
 

biz/djangoapps/ga_course_anslist/tests/test_helpers.py

@@ -59,9 +59,9 @@
 	  and sbm.course_id = '$course_id'
     group by sbm.unit_id
 	order by sbm.created
-'''
+	'''
 
-QUERY_STATEMENT_SURVEY_NAMES_ACTUAL = '''
+QUERY_STATEMENT_SURVEY_NAMES_EXPECTED = '''
 	SELECT 
 	    sbm.id
 	  , sbm.unit_id
@@ -74,7 +74,38 @@
 	  and sbm.course_id = 'course-v1:xxxxxxxxxxx+2018_02'
     group by sbm.unit_id
 	order by sbm.created
-'''
+	'''
+
+QUERY_STATEMENT_SURVEY_NAMES_MAX = '''
+	SELECT 
+	    sbm.id
+	  , sbm.unit_id
+	  , sbm.course_id
+	  , sbm.survey_name
+	  , max(sbm.created)
+	FROM
+	  ga_survey_surveysubmission as sbm
+	WHERE 1 = 1
+	  and sbm.course_id = '$course_id'
+    group by sbm.unit_id
+	order by sbm.created
+	'''
+
+
+QUERY_STATEMENT_SURVEY_NAMES_MAX_EXPECTED = '''
+	SELECT 
+	    sbm.id
+	  , sbm.unit_id
+	  , sbm.course_id
+	  , sbm.survey_name
+	  , max(sbm.created)
+	FROM
+	  ga_survey_surveysubmission as sbm
+	WHERE 1 = 1
+	  and sbm.course_id = 'course-v1:xxxxxxxxxxx+2018_02'
+    group by sbm.unit_id
+	order by sbm.created
+	'''
 
 QUERY_STATEMENT_USER_NOT_MEMBERS = '''
     SELECT
@@ -203,15 +234,29 @@ def test_query_statement_survey_names(self):
         self.assertEqual(expected, actual)
         log.debug('DONE')
 
+    def test_query_statement_survey_names_max(self):
+        expected = json.dumps(QUERY_STATEMENT_SURVEY_NAMES_MAX)
+        actual = json.dumps(helper.QUERY_STATEMENT_SURVEY_NAMES_MAX)
+        self.assertEqual(expected, actual)
+        log.debug('DONE')
+
     def test_create_survey_name_list_statement(self):
-        expected = QUERY_STATEMENT_SURVEY_NAMES_ACTUAL
+        expected = QUERY_STATEMENT_SURVEY_NAMES_EXPECTED
         ## arrange
-        org_id = CONST_ORG_ID
         course_id = CONST_COURSE_ID
         actual = helper._create_survey_name_list_statement(course_id)
         self.assertEqual(expected, actual)
         log.debug('DONE')
 
+    def test_create_survey_name_list_max_statement(self):
+        expected = QUERY_STATEMENT_SURVEY_NAMES_MAX_EXPECTED
+        ## arrange
+        course_id = CONST_COURSE_ID
+        flg_get_updated_survey_name = True
+        actual = helper._create_survey_name_list_statement(course_id, flg_get_updated_survey_name)
+        self.assertEqual(expected, actual)
+        log.debug('DONE')
+
     def test_query_statement_user_nat_members(self):
         expected = json.dumps(QUERY_STATEMENT_USER_NOT_MEMBERS)
         actual = json.dumps(helper.QUERY_STATEMENT_USER_NOT_MEMBERS)